From 214bb5293920ca4dd01d24de411125817feb9916 Mon Sep 17 00:00:00 2001 From: Sn0wStorm Date: Fri, 6 Dec 2019 18:57:41 +0100 Subject: [PATCH] Added more default recipes + small fixes BStats shows that >75% of users don't add any recipes themselves. So even if I would have preferred not to, i've added more default recipes to make it easier for everyone +Fixed Brew Create with space in name +Changed look of Quality Stars (now with half-stars) +Fixed Cauldron Recipe with Multiple Ingredients --- resources/config/patches/de18.txt | 6 +- resources/config/patches/en18.txt | 6 +- resources/config/patches/fr18.txt | 4 +- resources/config/v13/de/config.yml | 406 ++++++++++++++++- resources/config/v13/en/config.yml | 395 ++++++++++++++++- resources/config/v13/fr/config.yml | 411 +++++++++++++++++- resources/config/v13/it/config.yml | 402 ++++++++++++++++- resources/config/v13/zh/config.yml | 401 ++++++++++++++++- src/com/dre/brewery/BPlayer.java | 1 + src/com/dre/brewery/P.java | 35 +- .../brewery/listeners/CommandListener.java | 1 + src/com/dre/brewery/lore/BrewLore.java | 21 +- .../dre/brewery/recipe/BCauldronRecipe.java | 22 +- src/com/dre/brewery/recipe/BRecipe.java | 6 + src/com/dre/brewery/recipe/PotionColor.java | 14 +- src/com/dre/brewery/recipe/RecipeItem.java | 6 + 16 files changed, 2018 insertions(+), 119 deletions(-) diff --git a/resources/config/patches/de18.txt b/resources/config/patches/de18.txt index d123be4..6cf5d70 100644 --- a/resources/config/patches/de18.txt +++ b/resources/config/patches/de18.txt @@ -10,6 +10,7 @@ # lore: Was in der Lore des Items stehen muss customItems: +# Drei Beispiel Items bsp-item: # Ein Barriere Item das Mauer heißt und in der Lore die angegebene Zeile hat %%%%MAT1%%%% @@ -39,12 +40,13 @@ customItems: # Halte ein Item in der Hand und benutze /brew ItemName um dessen Material herauszufinden und für ein Rezept zu benutzen # (Item-ids anstatt Material können in Bukkit nicht mehr benutzt werden) # Eine Liste von allen Materialien kann hier gefunden werden: https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Material.html - # color: Farbe des Trankes der aus dem Kessel kommt - # Benutzbare Farben: DARK_RED, RED, BRIGHT_RED, ORANGE, PINK, BLUE, CYAN, WATER, GREEN, BLACK, GREY, BRIGHT_GREY + # color: Farbe des Trankes der aus dem Kessel kommt. (Standard ist CYAN) + # Benutzbare Farben: DARK_RED, RED, BRIGHT_RED, ORANGE, YELLOW, PINK, PURPLE, BLUE, CYAN, WATER, TEAL, OLIVE, GREEN, LIME, BLACK, GREY, BRIGHT_GREY, WHITE # Oder RGB Farben (Hex: also zB '99FF33') (Ohne #) (mit '') (Einfach nach "HTML color" im Internet suchen) # lore: Auflistung von zusätzlichem Text auf dem Trank. (Farbcodes möglich: z.b. &6) cauldron: +# Ein vollständiges Beispiel zuerst: bsp: name: Beispiel ingredients: diff --git a/resources/config/patches/en18.txt b/resources/config/patches/en18.txt index 5e34330..7c97517 100644 --- a/resources/config/patches/en18.txt +++ b/resources/config/patches/en18.txt @@ -10,6 +10,7 @@ # lore: What has to be in the lore of the item customItems: + # Three Example Items ex-item: # A Barrier item called Wall and has the given line in its lore %%%%MAT1%%%% @@ -39,12 +40,13 @@ customItems: # With an item in your hand, use /brew ItemName to get its material for use in a recipe # (Item-ids instead of material are not supported by bukkit anymore and will not work) # A list of materials can be found here: https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Material.html - # color: Color of the potion from a cauldron. - # Usable Colors: DARK_RED, RED, BRIGHT_RED, ORANGE, PINK, BLUE, CYAN, WATER, GREEN, BLACK, GREY, BRIGHT_GREY + # color: Color of the potion from a cauldron. Defaults to CYAN + # Usable Colors: DARK_RED, RED, BRIGHT_RED, ORANGE, YELLOW, PINK, PURPLE, BLUE, CYAN, WATER, TEAL, OLIVE, GREEN, LIME, BLACK, GREY, BRIGHT_GREY, WHITE # Or RGB colors (hex: for example '99FF33') (with '') (search for "HTML color" on the internet) # lore: List of additional text on the base potion. (Formatting codes possible: such as &6) cauldron: + # Example with all possible entries ex: name: Example ingredients: diff --git a/resources/config/patches/fr18.txt b/resources/config/patches/fr18.txt index f2bda51..aae2b2d 100644 --- a/resources/config/patches/fr18.txt +++ b/resources/config/patches/fr18.txt @@ -10,6 +10,7 @@ # lore: Ce qui doit être dans la lore de l'objet customItems: + # Trois exemples ex-item: # Un objet Barrière appelé "Wall" et qui a la ligne donnée dans sa lore %%%%MAT1%%%% @@ -40,12 +41,13 @@ customItems: # (Les id d'objets à la place des matériaux sont obsolètes pour bukkit) # Une liste des matériaux peuvent-être trouvés ici: https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Material.html # color : Couleur de la potion provenant d'un chaudron. - # Couleurs disponibles : DARK_RED, RED, BRIGHT_RED, ORANGE, PINK, BLUE, CYAN, WATER, GREEN, BLACK, GREY, BRIGHT_GREY + # Couleurs disponibles : DARK_RED, RED, BRIGHT_RED, ORANGE, YELLOW, PINK, PURPLE, BLUE, CYAN, WATER, TEAL, OLIVE, GREEN, LIME, BLACK, GREY, BRIGHT_GREY, WHITE # (Dans l'ordre : Rouge foncé, Rouge, Rouge clair, Orange, Rose, Bleu, Cyan, Eau, Vert, Noir, Gris, Gris clair) # Ou couleurs RGB (hex: par exemple '99FF33') (avec '') (recherche de "HTML color" sur internet) # lore: Liste de texte supplémentaire sur la potion de base. (Formatting codes possible: such as &6) cauldron: + # Exemple avec tous les paramètres possibles : ex: name: Exemple ingredients: diff --git a/resources/config/v13/de/config.yml b/resources/config/v13/de/config.yml index 7c9c1bb..c05fa1d 100644 --- a/resources/config/v13/de/config.yml +++ b/resources/config/v13/de/config.yml @@ -93,6 +93,7 @@ version: '2.0' # lore: Was in der Lore des Items stehen muss customItems: +# Drei Beispiel Items bsp-item: # Ein Barriere Item das Mauer heißt und in der Lore die angegebene Zeile hat material: Barrier @@ -116,6 +117,12 @@ customItems: himbeere: name: '&cHimbeere' + blaue-blumen: + matchAny: true + material: + - cornflower + - blue_orchid + # -- Zutaten im Kessel -- # Hier kann angegeben werden welche Zutaten in den Kessel getan werden können und was mit ihnen geschieht. @@ -125,12 +132,13 @@ customItems: # Halte ein Item in der Hand und benutze /brew ItemName um dessen Material herauszufinden und für ein Rezept zu benutzen # (Item-ids anstatt Material können in Bukkit nicht mehr benutzt werden) # Eine Liste von allen Materialien kann hier gefunden werden: https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Material.html - # color: Farbe des Trankes der aus dem Kessel kommt - # Benutzbare Farben: DARK_RED, RED, BRIGHT_RED, ORANGE, PINK, BLUE, CYAN, WATER, GREEN, BLACK, GREY, BRIGHT_GREY + # color: Farbe des Trankes der aus dem Kessel kommt. (Standard ist CYAN) + # Benutzbare Farben: DARK_RED, RED, BRIGHT_RED, ORANGE, YELLOW, PINK, PURPLE, BLUE, CYAN, WATER, TEAL, OLIVE, GREEN, LIME, BLACK, GREY, BRIGHT_GREY, WHITE # Oder RGB Farben (Hex: also zB '99FF33') (Ohne #) (mit '') (Einfach nach "HTML color" im Internet suchen) # lore: Auflistung von zusätzlichem Text auf dem Trank. (Farbcodes möglich: z.b. &6) cauldron: +# Ein vollständiges Beispiel zuerst: bsp: name: Beispiel ingredients: @@ -151,10 +159,19 @@ cauldron: ingredients: Sugar_Cane color: 'f1ffad' # gelbliches grün + sugar: + name: Zuckermelasse + ingredients: Sugar + apple: name: Apfelmost ingredients: Apple + berries: + name: Traubenmost + ingredients: Sweet_Berries + color: RED + potato: name: Kartoffelmaische ingredients: Potato @@ -169,6 +186,11 @@ cauldron: ingredients: Red_Mushroom color: 'ff5c33' # bernsteinrot + bmushroom: + name: Pilzsud + ingredients: Brown_Mushroom + color: 'c68c53' # helleres Braun + cocoa: name: Kakaobrühe ingredients: Cocoa_Beans @@ -179,6 +201,87 @@ cauldron: ingredients: Milk_Bucket color: BRIGHT_GREY + bl_flow: + name: Bläulicher Sud + ingredients: blaue-blumen + color: '0099ff' # Himmelblau + + cactus: + name: Agavensud + ingredients: cactus + color: '00b300' # cactus green + + poi_potato: + name: Giftige Maische + ingredients: Poisonous_Potato + + egg: + name: Eimasse + ingredients: Egg + + + oak_sapling: + name: Holzige Kräuterbrühe + ingredients: Oak_Sapling + + vine: + name: Kräuterbrühe + ingredients: vine + color: '99ff66' # Hellgrün + + rot_flesh: + name: Stinkende Seuche + ingredients: Rotten_Flesh + color: '263300' # Braun-Grün + + melon: + name: Melonengulasch + ingredients: melon_slice + + wheat_seeds: + name: Bittertrübe Flüssigkeit + ingredients: Wheat_Seeds + + melon_seeds: + name: Bittertrübe Flüssigkeit + ingredients: Melon_Seeds + + pumpkin_seeds: + name: Bittertrübe Flüssigkeit + ingredients: Pumpkin_Seeds + + bone_meal: + name: Knochenbrühe + ingredients: bone_meal + color: BRIGHT_GREY + + cookie: + name: Schokoladige Suppe + ingredients: Cookie + color: '804600' # mokka + + fer_spid_eye: + name: Augenferment mit Spinnenhaaren + ingredients: Fermented_Spider_Eye + + ghast_tear: + name: Tränende Suppe + ingredients: ghast_tear + + snowball: + name: Eiswasser + ingredients: Snowball + + Gold_Nugget: + name: Glitzernder Sud + ingredients: Gold_Nugget + color: 'ffd11a' # gold + + glowstone_dust: + name: Leuchtender Sud + ingredients: Glowstone_Dust + color: 'ffff33' # Hellgelb + # -- Mehrere Zutaten: -- apfelmet_basis: name: Apfel-Zuckersud @@ -187,6 +290,38 @@ cauldron: - Apple color: 'e1ff4d' # grünliches gelb + poi_grass: + name: Saurer Kräutersud + ingredients: + - Grass + - Poisonous_Potato + color: '99ff66' # Hellgrün + + juniper: + name: Wacholdergebräu + ingredients: + - blaue-blumen + - wheat + color: '00ccff' # Aqua + + gin_base: + name: Fruchtiges Wacholdergebräu + ingredients: + - blaue-blumen + - wheat + - apple + color: '66e0ff' # Hell Aqua + + eggnog_base: + name: Cremige Eimasse + ingredients: + - egg + - sugar + - milk_bucket + color: 'ffecb3' # Geld-Orange + + + # -- Rezepte für Getränke -- @@ -204,7 +339,7 @@ cauldron: # Das Minecraft Fass besteht aus Eiche # age: Zeit in Minecraft-Tagen, die das Getränk im Fass reifen muss 0= kein reifen # color: Farbe des Getränks nach destillieren/reifen. -# Benutzbare Farben: DARK_RED, RED, BRIGHT_RED, ORANGE, PINK, BLUE, CYAN, WATER, GREEN, BLACK, GREY, BRIGHT_GREY +# Benutzbare Farben: DARK_RED, RED, BRIGHT_RED, ORANGE, YELLOW, PINK, PURPLE, BLUE, CYAN, WATER, TEAL, OLIVE, GREEN, LIME, BLACK, GREY, BRIGHT_GREY, WHITE # Oder RGB Farben (Hex: also zB '99FF33') (Ohne #) (mit '') (Einfach nach "HTML color" im Internet suchen) # difficulty: 1-10 Genauigkeit der Einhaltung der Vorgaben (1 = ungenau/einfach 10 = sehr genau/schwer) # alcohol: Alkoholgehalt 0-100 in absoluter Menge bei perfektem Getränk (wird dem Spieler hinzugefügt, bei 100 = tot) @@ -238,7 +373,7 @@ recipes: age: 11 color: DARK_RED difficulty: 3 - alcohol: 23 + alcohol: 14 lore: - Dies ist ein Beispiel Trank - ++Ganz normales Beispiel @@ -266,9 +401,10 @@ recipes: distillruns: 0 wood: 1 age: 2 - color: BRIGHT_GREY + color: 'ffb84d' # Orange difficulty: 1 alcohol: 5 + lore: +++ &8Erfrischend bier: name: Ranziges Bier/Bier/Feines Bier @@ -278,7 +414,7 @@ recipes: distillruns: 0 wood: 0 age: 3 - color: ORANGE + color: 'ffd333' # Hell Orange difficulty: 1 lore: - +++ &8Das perlt @@ -290,12 +426,32 @@ recipes: - Wheat/6 cookingtime: 8 distillruns: 0 - wood: 4 + wood: 6 age: 8 - color: BLACK + color: '650013' # Dunkel Rotbraun difficulty: 2 + lore: + - +++ &8Malziger geschmack alcohol: 7 + wine: + name: Rotwein + ingredients: + - Sweet_Berries/5 + cookingtime: 5 + distillruns: 0 + wood: 0 + age: 20 + color: RED + difficulty: 4 + alcohol: 8 + lore: + - '+ &8Plump' + - '+ &8Verkorkt' + - '++ &8Rund' + - '+++ &8Lieblich' + - '+++ &8Samtig' + met: name: Scheußlicher Met/Met/&6Goldener Met ingredients: @@ -306,9 +462,9 @@ recipes: age: 4 color: ORANGE difficulty: 2 - alcohol: 9 lore: - +++ Hat einen goldenen Schein + alcohol: 9 apfelmet: name: Apfelmet/Süßer Apfelmet/&6Goldensüßer Apfelmet @@ -321,7 +477,7 @@ recipes: age: 4 color: ORANGE difficulty: 4 - alcohol: 12 + alcohol: 11 lore: - + Ist da wirklich Apfel drin? - ++ Schmeckt nach süßem Apfel @@ -329,11 +485,51 @@ recipes: effects: - WATER_BREATHING/1-2/150 + cidre: + name: Schlechter Cidre/Apfelwein/Guter Apfelwein + ingredients: + - Apple/14 + cookingtime: 7 + distillruns: 0 + wood: 0 + age: 3 + color: 'f86820' # Rot-Orange + difficulty: 4 + alcohol: 7 + + apfelschnaps: + name: Säuerlicher Apfelschnaps/Apfelschnaps/Calvados + ingredients: + - Apple/12 + cookingtime: 16 + distillruns: 3 + wood: 5 + age: 6 + color: BRIGHT_RED + difficulty: 5 + alcohol: 14 + lore: + - + &8Viel zu sauer + + whiskey: + name: Unschöner Whiskey/Whiskey/Scotch Whiskey + ingredients: + - Wheat/10 + cookingtime: 10 + distillruns: 2 + distilltime: 50 + wood: 4 + age: 18 + color: ORANGE + difficulty: 7 + alcohol: 26 + lore: '&7Single Malt' + rum: name: Bitterer Rum/Würziger Rum/&6Goldener Rum ingredients: - - Sugar_Cane/14 - cookingtime: 5 + - Sugar_Cane/18 + cookingtime: 6 distillruns: 2 distilltime: 30 wood: 2 @@ -344,6 +540,10 @@ recipes: effects: - FIRE_RESISTANCE/1/20-100 - POISON/1-0/30-0 + lore: + - +&8Zu bitter zum trinken + - ++&8Fassgewürzt + - +++&eWürziges Gold vodka: name: Abgeranzter Vodka/Vodka/Russischer Vodka @@ -352,17 +552,66 @@ recipes: cookingtime: 15 distillruns: 3 age: 0 - color: BRIGHT_GREY + color: WHITE difficulty: 4 alcohol: 20 - lore: - - + &8Fast nicht trinkbar + lore: + &8Fast nicht trinkbar effects: - WEAKNESS/15 - POISON/10 + pilz_vodka: + name: Pilzvodka/Pilzvodka/Glimmender Pilzvodka + ingredients: + - Potato/10 + - Red_Mushroom/3 + - Brown_Mushroom/3 + cookingtime: 18 + distillruns: 5 + age: 0 + color: 'ff9999' # Pink-Rot + difficulty: 7 + alcohol: 18 + lore: +++&aLeuchtet im dunkeln + effects: + - WEAKNESS/80 + - CONFUSION/27 + - NIGHT_VISION/50-80 + - BLINDNESS/12-2 + - SLOW/10-3 + + gin: + name: Blasser Gin/Gin/Old Tom Gin + ingredients: + - Wheat/9 + - blaue-blumen/6 # Custom-Item: Blue Orchids oder Cornflowers + - Apple/1 + cookingtime: 6 + distillruns: 2 + color: '99ddff' # Sehr helles Blau + difficulty: 6 + alcohol: 20 + lore: + - ++ Mit dem Geschmack + - ++ von Wacholder + - +++ Perfekt abgerundet + - +++ mit Wacholder + + tequila: + name: Mezcal/Tequila/Tequila anejo + ingredients: + - cactus/8 + cookingtime: 15 + distillruns: 2 + color: 'f5f07e' # Grün-Orange + difficulty: 5 + wood: 1 + age: 12 + alcohol: 20 + lore: Wüstencharakter + absinth: - name: minderwertiger Absinth/Absinth/Starker Absinth + name: Minderwertiger Absinth/Absinth/Starker Absinth ingredients: - Grass/15 cookingtime: 3 @@ -370,9 +619,27 @@ recipes: distilltime: 80 color: GREEN difficulty: 8 - alcohol: 45 + alcohol: 42 effects: - - POISON/20-30 + - POISON/15-25 + lore: '+++&8Hochprozentiger Alkohol' + + gr_absinthe: + name: Minderwertiger Absinth/Grüner Absinth/Hellgrüner Absinth + ingredients: + - Grass/17 + - Poisonous_Potato/2 + cookingtime: 5 + distillruns: 6 + distilltime: 85 + color: LIME + difficulty: 9 + alcohol: 46 + effects: + - POISON/25-40 + - HARM/2 + - NIGHT_VISION/40-60 + lore: '&aSieht gifig aus' kartoffelsuppe: name: Kartoffelsuppe @@ -380,7 +647,7 @@ recipes: - Potato/5 - Grass/3 cookingtime: 3 - color: PINK + color: ORANGE difficulty: 1 effects: - HEAL/0-1 @@ -398,10 +665,107 @@ recipes: - REGENERATION/1/2-5 - SPEED/1/30-140 -# Mehr Ideen für Rezepte: Cachaca, Gin, Whiskey, Tequila, Cidre, etc, sowie Rezeptvarianten wie Goldener Vodka etc. -# Ich werde keine weiteren Rezepte zu dieser Standardconfig hinzufügen, da diese öffentlich und für Spieler zum Abschauen einsehbar wären + eierlik: + name: Stinkender Likör/Eierlikör/Starker Eierlikör + ingredients: + - Egg/5 + - Sugar/2 + - Milk_Bucket/1 + cookingtime: 2 + color: 'ffe680' + difficulty: 4 + alcohol: 10 + wood: 0 + age: 3 + lore: + - Gebraut mit rohen Eiern + - '+&e&oDie wohl schon schlecht waren' + + + + + +# Ich möchte nicht unbedingt weitere Rezepte zu dieser Standardconfig hinzufügen, da diese öffentlich und für Spieler zum abschauen einsehbar wären # Der Serveradmin kann neue Rezepte hinzufügen und bestehende ändern, um das Abschauen aus der Standardconfig zu verhindern. +# Ein paar Vorschläge für Rezepte: + + # g_vodka: + # name: 'Abgeranzter Vodka/&6Goldvodka/&6Glänzender Goldvodka' + # ingredients: + # - Potato/10 + # - Gold_Nugget/2 + # cookingtime: 18 + # distillruns: 3 + # age: 0 + # color: ORANGE + # difficulty: 6 + # alcohol: 20 + # effects: + # - WEAKNESS/28 + # - POISON/4 + + # feuer_whiskey: + # name: Sandiger Whiskey/Brennender Whiskey/Feuriger Whiskey + # ingredients: + # - Wheat/10 + # - Blaze_Powder/2 + # cookingtime: 12 + # distillruns: 3 + # distilltime: 55 + # wood: 4 + # age: 18 + # color: ORANGE + # difficulty: 7 + # alcohol: 28 + # drinkmessage: 'Du bekommst ein brennendes Gefühl im Mund' + +# Ohne Alkohol: + + # hot_choc: + # name: Kakau + # ingredients: + # - cookie/3 + # cookingtime: 2 + # color: DARK_RED + # difficulty: 2 + # effects: + # - FAST_DIGGING/40 + + # iced_coffee: + # name: Fader Kaffee/Eiskaffee/Starker Eiskaffee + # ingredients: + # - cookie/8 + # - snowball/4 + # - milk_bucket/1 + # cookingtime: 1 + # color: BLACK + # difficulty: 4 + # effects: + # - REGENERATION/30 + # - SPEED/10 + + +# Mehr Ideen für Rezepte: +# Löwenzahnblüten Likör +# Rote Beete Geist, +# Mohnlikör: Macum, +# Bambusschnaps: Chu Yeh Ching, +# Cachaca, +# Cognac, +# Sake, +# Buorbon, +# Moonshine, +# Verschienden Weine, +# Brandy, +# Amaretto, +# etc. sowie Rezeptvarianten wie +# Pumpkin Spice Bier, +# Melonen Vodka + +# Es gibt noch viele Minecraft Items wie Ranken und items von anderen plugins die sich gut als Zutaten machen würden + + # -- Plugin Kompatiblität -- diff --git a/resources/config/v13/en/config.yml b/resources/config/v13/en/config.yml index 92b636b..c019a0b 100644 --- a/resources/config/v13/en/config.yml +++ b/resources/config/v13/en/config.yml @@ -94,6 +94,7 @@ version: '2.0' # lore: What has to be in the lore of the item customItems: + # Three Example Items ex-item: # A Barrier item called Wall and has the given line in its lore material: Barrier @@ -117,6 +118,12 @@ customItems: rasp: name: '&cRaspberry' + blue-flowers: + matchAny: true + material: + - cornflower + - blue_orchid + # -- Ingredients in the Cauldron -- # Which Ingredients are accepted by the Cauldron and the base potion resulting from them @@ -126,12 +133,13 @@ customItems: # With an item in your hand, use /brew ItemName to get its material for use in a recipe # (Item-ids instead of material are not supported by bukkit anymore and will not work) # A list of materials can be found here: https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Material.html - # color: Color of the potion from a cauldron. - # Usable Colors: DARK_RED, RED, BRIGHT_RED, ORANGE, PINK, BLUE, CYAN, WATER, GREEN, BLACK, GREY, BRIGHT_GREY + # color: Color of the potion from a cauldron. Defaults to CYAN + # Usable Colors: DARK_RED, RED, BRIGHT_RED, ORANGE, YELLOW, PINK, PURPLE, BLUE, CYAN, WATER, TEAL, OLIVE, GREEN, LIME, BLACK, GREY, BRIGHT_GREY, WHITE # Or RGB colors (hex: for example '99FF33') (with '') (search for "HTML color" on the internet) # lore: List of additional text on the base potion. (Formatting codes possible: such as &6) cauldron: + # Example with all possible entries ex: name: Example ingredients: @@ -152,10 +160,19 @@ cauldron: ingredients: Sugar_Cane color: 'f1ffad' # yellowish green + sugar: + name: Sugarwater + ingredients: Sugar + apple: - name: Apple cider + name: Apple must ingredients: Apple + berries: + name: Grape must + ingredients: Sweet_Berries + color: RED + potato: name: Potatomash ingredients: Potato @@ -170,6 +187,11 @@ cauldron: ingredients: Red_Mushroom color: 'ff5c33' # amber red + bmushroom: + name: Mushroom brew + ingredients: Brown_Mushroom + color: 'c68c53' # brighter brown + cocoa: name: Chocolately brew ingredients: Cocoa_Beans @@ -180,14 +202,125 @@ cauldron: ingredients: Milk_Bucket color: BRIGHT_GREY + bl_flow: + name: Blueish brew + ingredients: blue-flowers + color: '0099ff' # sky blue + + cactus: + name: Agave brew + ingredients: cactus + color: '00b300' # cactus green + + poi_potato: + name: Poisonous Broth + ingredients: Poisonous_Potato + + egg: + name: Sticky brew + ingredients: Egg + + + oak_sapling: + name: Stringy hebry broth + ingredients: Oak_Sapling + + vine: + name: Boiled herbs + ingredients: vine + color: '99ff66' # bright green + + rot_flesh: + name: Foul pest + ingredients: Rotten_Flesh + color: '263300' # brown green + + melon: + name: Melon juice + ingredients: melon_slice + + wheat_seeds: + name: Bitter brew + ingredients: Wheat_Seeds + + melon_seeds: + name: Bitter brew + ingredients: Melon_Seeds + + pumpkin_seeds: + name: Bitter brew + ingredients: Pumpkin_Seeds + + bone_meal: + name: Bony Brew + ingredients: bone_meal + color: BRIGHT_GREY + + cookie: + name: Chocolately sap + ingredients: Cookie + color: '804600' # mocca + + fer_spid_eye: + name: Fermented Eye + ingredients: Fermented_Spider_Eye + + ghast_tear: + name: Sad brew + ingredients: ghast_tear + + snowball: + name: Icewater + ingredients: Snowball + + Gold_Nugget: + name: Glistering brew + ingredients: Gold_Nugget + color: 'ffd11a' # gold + + glowstone_dust: + name: Glowing brew + ingredients: Glowstone_Dust + color: 'ffff33' # bright yellow + # -- Multiple Ingredients: -- - apfelmet_base: + applemead_base: name: Apple-Sugar brew ingredients: - Sugar_Cane/3 - Apple color: 'e1ff4d' # greenish yellow + poi_grass: + name: Boiled acidy herbs + ingredients: + - Grass + - Poisonous_Potato + color: '99ff66' # bright green + + juniper: + name: Juniper brew + ingredients: + - blue-flowers + - wheat + color: '00ccff' # aqua + + gin_base: + name: Fruity juniper brew + ingredients: + - blue-flowers + - wheat + - apple + color: '66e0ff' # lighter aqua + + eggnog_base: + name: Smooth egg mixture + ingredients: + - egg + - sugar + - milk_bucket + color: 'ffecb3' # yellow-orange + # -- Recipes for Potions -- @@ -206,7 +339,7 @@ cauldron: # The Minecraft barrel is made of oak # age: Time in Minecraft-days, the potion has to age in a barrel 0=no aging # color: Color of the potion after distilling/aging. -# Usable Colors: DARK_RED, RED, BRIGHT_RED, ORANGE, PINK, BLUE, CYAN, WATER, GREEN, BLACK, GREY, BRIGHT_GREY +# Usable Colors: DARK_RED, RED, BRIGHT_RED, ORANGE, YELLOW, PINK, PURPLE, BLUE, CYAN, WATER, TEAL, OLIVE, GREEN, LIME, BLACK, GREY, BRIGHT_GREY, WHITE # Or RGB colors (hex: for example '99FF33') (with '') (search for "HTML color" on the internet) # difficulty: 1-10 accuracy needed to get good quality (1 = unaccurate/easy, 10 = very precise/hard) # alcohol: Absolute amount of alcohol 0-100 in a perfect potion (will be added directly to the player, where 100 means fainting) @@ -240,7 +373,7 @@ recipes: age: 11 color: DARK_RED difficulty: 3 - alcohol: 23 + alcohol: 14 lore: - This is an examble brew - ++Just a normal Example @@ -268,9 +401,10 @@ recipes: distillruns: 0 wood: 1 age: 2 - color: BRIGHT_GREY + color: 'ffb84d' # Orange difficulty: 1 alcohol: 5 + lore: +++ &8Refreshing beer: name: Skunky Beer/Beer/Fine Beer @@ -280,7 +414,7 @@ recipes: distillruns: 0 wood: 0 age: 3 - color: ORANGE + color: 'ffd333' # Bright Orange difficulty: 1 lore: - +++ &8Crisp taste @@ -292,14 +426,31 @@ recipes: - Wheat/6 cookingtime: 8 distillruns: 0 - wood: 4 + wood: 6 age: 8 - color: BLACK + color: '650013' # Dark Red-Brown difficulty: 2 lore: - +++ &8Roasted taste alcohol: 7 + wine: + name: Red Wine + ingredients: + - Sweet_Berries/5 + cookingtime: 5 + distillruns: 0 + wood: 0 + age: 20 + color: RED + difficulty: 4 + alcohol: 8 + lore: + - '+ &8Harsh' + - '+ &8Corked' + - '++ &8Mellow' + - '+++ &8Full-Bodied' + mead: name: Awkward Mead/Mead/&6Golden Mead ingredients: @@ -325,7 +476,7 @@ recipes: age: 4 color: ORANGE difficulty: 4 - alcohol: 12 + alcohol: 11 lore: - +Is there any Apple in this? - ++Refreshing taste of Apple @@ -333,11 +484,51 @@ recipes: effects: - WATER_BREATHING/1-2/150 + cidre: + name: Poor Cidre/Apple Cider/Great Apple Cider + ingredients: + - Apple/14 + cookingtime: 7 + distillruns: 0 + wood: 0 + age: 3 + color: 'f86820' # Red-Orange + difficulty: 4 + alcohol: 7 + + apple_liquor: + name: Sour Apple Liquor/Apple Liquor/Calvados + ingredients: + - Apple/12 + cookingtime: 16 + distillruns: 3 + wood: 5 + age: 6 + color: BRIGHT_RED + difficulty: 5 + alcohol: 14 + lore: + - +Sour like Acid + + whiskey: + name: Unsightly Whiskey/Whiskey/Scotch Whiskey + ingredients: + - Wheat/10 + cookingtime: 10 + distillruns: 2 + distilltime: 50 + wood: 4 + age: 18 + color: ORANGE + difficulty: 7 + alcohol: 26 + lore: '&7Single Malt' + rum: name: Bitter Rum/Spicy Rum/&6Golden Rum ingredients: - - Sugar_Cane/14 - cookingtime: 5 + - Sugar_Cane/18 + cookingtime: 6 distillruns: 2 distilltime: 30 wood: 2 @@ -348,6 +539,10 @@ recipes: effects: - FIRE_RESISTANCE/1/20-100 - POISON/1-0/30-0 + lore: + - +&8Too bitter to drink + - ++&8Spiced by the barrel + - +++&eSpiced Gold vodka: name: Lousy Vodka/Vodka/Russian Vodka @@ -356,14 +551,64 @@ recipes: cookingtime: 15 distillruns: 3 age: 0 - color: BRIGHT_GREY + color: WHITE difficulty: 4 alcohol: 20 - lore: +&8Almost undrinkable + lore: + &8Almost undrinkable effects: - WEAKNESS/15 - POISON/10 + shroom_vodka: + name: Mushroom Vodka/Mushroom Vodka/Glowing Mushroom Vodka + ingredients: + - Potato/10 + - Red_Mushroom/3 + - Brown_Mushroom/3 + cookingtime: 18 + distillruns: 5 + age: 0 + color: 'ff9999' # Pink-Red + difficulty: 7 + alcohol: 18 + lore: +++&aGlows in the dark + effects: + - WEAKNESS/80 + - CONFUSION/27 + - NIGHT_VISION/50-80 + - BLINDNESS/12-2 + - SLOW/10-3 + + gin: + name: Pale Gin/Gin/Old Tom Gin + ingredients: + - Wheat/9 + - blue-flowers/6 # Custom-Item: Blue Orchids or Cornflowers + - Apple/1 + cookingtime: 6 + distillruns: 2 + color: '99ddff' # Very light blue + difficulty: 6 + alcohol: 20 + lore: + - ++ With the + - ++ taste of juniper + - +++ Perfectly finished off + - +++ with juniper + + tequila: + name: Mezcal/Tequila/Tequila anejo + ingredients: + - cactus/8 + cookingtime: 15 + distillruns: 2 + color: 'f5f07e' # Green-Orange + difficulty: 5 + wood: 1 + age: 12 + alcohol: 20 + lore: Desert spirit + absinthe: name: Poor Absinthe/Absinthe/Strong Absinthe ingredients: @@ -373,9 +618,27 @@ recipes: distilltime: 80 color: GREEN difficulty: 8 - alcohol: 45 + alcohol: 42 effects: - - POISON/20-30 + - POISON/15-25 + lore: '+++&8High proof liquor' + + gr_absinthe: + name: Poor Absinthe/Green Absinthe/Bright Green Absinthe + ingredients: + - Grass/17 + - Poisonous_Potato/2 + cookingtime: 5 + distillruns: 6 + distilltime: 85 + color: LIME + difficulty: 9 + alcohol: 46 + effects: + - POISON/25-40 + - HARM/2 + - NIGHT_VISION/40-60 + lore: '&aLooks poisonous' potato_soup: name: Potato soup @@ -383,7 +646,7 @@ recipes: - Potato/5 - Grass/3 cookingtime: 3 - color: PINK + color: ORANGE difficulty: 1 effects: - HEAL/0-1 @@ -401,9 +664,101 @@ recipes: - REGENERATION/1/2-5 - SPEED/1/30-140 -# More Recipes ideas: Cachaca, Gin, Whiskey, Tequila, Cider, etc. as well as high quality abbreviations like golden vodka etc. -# I will not add more Recipes to the default config, as they would be public and viewable by users to cheat. + eggnog: + name: Egg Liquor/Eggnog/Advocaat + ingredients: + - Egg/5 + - Sugar/2 + - Milk_Bucket/1 + cookingtime: 2 + color: 'ffe680' + difficulty: 4 + alcohol: 10 + wood: 0 + age: 3 + lore: Made with raw egg + + + + +# I don't want to add more Recipes to the default config, as they would be public and viewable by users to cheat. # It is up to the Serveradmin to change and add Recipes, so players cannot cheat from the default config. +# Some suggestions for recipes you could use: + + # g_vodka: + # name: 'Rancid Vodka/&6Golden Vodka/&6Shimmering Golden Vodka' + # ingredients: + # - Potato/10 + # - Gold_Nugget/2 + # cookingtime: 18 + # distillruns: 3 + # age: 0 + # color: ORANGE + # difficulty: 6 + # alcohol: 20 + # effects: + # - WEAKNESS/28 + # - POISON/4 + + # fire_whiskey: + # name: Powdery Whiskey/Burning Whiskey/Blazing Whiskey + # ingredients: + # - Wheat/10 + # - Blaze_Powder/2 + # cookingtime: 12 + # distillruns: 3 + # distilltime: 55 + # wood: 4 + # age: 18 + # color: ORANGE + # difficulty: 7 + # alcohol: 28 + # drinkmessage: 'You get a burning feeling in your mouth' + +# Without Alcohol: + + # hot_choc: + # name: Hot Chocolate + # ingredients: + # - cookie/3 + # cookingtime: 2 + # color: DARK_RED + # difficulty: 2 + # effects: + # - FAST_DIGGING/40 + + # iced_coffee: + # name: Watery Coffee/Iced Coffee/Strong Iced Coffee + # ingredients: + # - cookie/8 + # - snowball/4 + # - milk_bucket/1 + # cookingtime: 1 + # color: BLACK + # difficulty: 4 + # effects: + # - REGENERATION/30 + # - SPEED/10 + + +# More Recipe ideas: +# Dandelion Liquor +# Beetroot Spirit, +# Poppy Liquor: Macum/Grand Poppy, +# Bamboo Liquor: Chu Yeh Ching, +# Cachaca, +# Cognac, +# Sake, +# Buorbon, +# Moonshine, +# Different Wines, +# Brandy, +# Amaretto, +# etc. as well as variations like, +# Pumpkin Spice Beer, +# Melon Vodka + +# There are a lot of items in Minecraft like Vines and items added by plugins that would make great ingredients. # -- Plugin Compatibility -- diff --git a/resources/config/v13/fr/config.yml b/resources/config/v13/fr/config.yml index f622d0b..d170454 100644 --- a/resources/config/v13/fr/config.yml +++ b/resources/config/v13/fr/config.yml @@ -95,6 +95,7 @@ version: '2.0' # lore: Ce qui doit être dans la lore de l'objet customItems: + # Trois exemples ex-item: # Un objet Barrière appelé "Wall" et qui a la ligne donnée dans sa lore material: Barrier @@ -118,6 +119,12 @@ customItems: rasp: name: '&cRaspberry' + blue-flowers: + matchAny: true + material: + - cornflower + - blue_orchid + # -- Ingrédients dans le chaudron -- # Quels sont les ingrédients acceptés par le chaudron et la potion de base qui en résulte @@ -128,12 +135,13 @@ customItems: # (Les id d'objets à la place des matériaux sont obsolètes pour bukkit) # Une liste des matériaux peuvent-être trouvés ici: https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Material.html # color : Couleur de la potion provenant d'un chaudron. - # Couleurs disponibles : DARK_RED, RED, BRIGHT_RED, ORANGE, PINK, BLUE, CYAN, WATER, GREEN, BLACK, GREY, BRIGHT_GREY - # (Dans l'ordre : Rouge foncé, Rouge, Rouge clair, Orange, Rose, Bleu, Cyan, Eau, Vert, Noir, Gris, Gris clair) + # Couleurs disponibles : DARK_RED, RED, BRIGHT_RED, ORANGE, YELLOW, PINK, PURPLE, BLUE, CYAN, WATER, TEAL, OLIVE, GREEN, LIME, BLACK, GREY, BRIGHT_GREY, WHITE + # (Dans l'ordre : Rouge foncé, Rouge, Rouge clair, Orange, Jaune, Rose, Pourpre, Bleu, Cyan, Eau, Sarcelle, Olive, Vert, Vert lime, Noir, Gris, Gris clair, Blanc) # Ou couleurs RGB (hex: par exemple '99FF33') (avec '') (recherche de "HTML color" sur internet) # lore: Liste de texte supplémentaire sur la potion de base. (Formatting codes possible: such as &6) cauldron: + # Exemple avec tous les paramètres possibles : ex: name: Exemple ingredients: @@ -154,10 +162,19 @@ cauldron: ingredients: Sugar_Cane color: 'f1ffad' # yellowish green + sugar: + name: Eau sucrée + ingredients: Sugar + apple: - name: Cidre de pommes + name: Pommes fermentées ingredients: Apple + berries: + name: Raisins fermentés + ingredients: Sweet_Berries + color: RED + potato: name: Purée de Pommes de Terre ingredients: Potato @@ -172,6 +189,11 @@ cauldron: ingredients: Red_Mushroom color: 'ff5c33' # amber red + bmushroom: + name: Champignons fermentés + ingredients: Brown_Mushroom + color: 'c68c53' # brighter brown + cocoa: name: Infusion au chocolat ingredients: Cocoa_Beans @@ -182,14 +204,126 @@ cauldron: ingredients: Milk_Bucket color: BRIGHT_GREY + bl_flow: + name: Infusion bleue + ingredients: blue-flowers + color: '0099ff' # sky blue + + cactus: + name: Agave fermenté + ingredients: cactus + color: '00b300' # cactus green + + poi_potato: + name: Bouillon toxique + ingredients: Poisonous_Potato + + egg: + name: Mélange collant + ingredients: Egg + + + oak_sapling: + name: Stringy hebry broth + ingredients: Oak_Sapling + + vine: + name: Boiled herbs + ingredients: vine + color: '99ff66' # bright green + + rot_flesh: + name: Foul pest + ingredients: Rotten_Flesh + color: '263300' # brown green + + melon: + name: Melon juice + ingredients: melon_slice + + wheat_seeds: + name: Bitter brew + ingredients: Wheat_Seeds + + melon_seeds: + name: Bitter brew + ingredients: Melon_Seeds + + pumpkin_seeds: + name: Bitter brew + ingredients: Pumpkin_Seeds + + bone_meal: + name: Bony Brew + ingredients: bone_meal + color: BRIGHT_GREY + + cookie: + name: Chocolately sap + ingredients: Cookie + color: '804600' # mocca + + fer_spid_eye: + name: Fermented Eye + ingredients: Fermented_Spider_Eye + + ghast_tear: + name: Sad brew + ingredients: ghast_tear + + snowball: + name: Icewater + ingredients: Snowball + + Gold_Nugget: + name: Glistering brew + ingredients: Gold_Nugget + color: 'ffd11a' # gold + + glowstone_dust: + name: Glowing brew + ingredients: Glowstone_Dust + color: 'ffff33' # bright yellow + + # -- Ingrédients multiples: -- - apfelmet_base: + applemead_base: name: Brassée pomme-sucre ingredients: - Sugar_Cane/3 - Apple color: 'e1ff4d' # greenish yellow + poi_grass: + name: Herbes acides bouillies + ingredients: + - Grass + - Poisonous_Potato + color: '99ff66' # bright green + + juniper: + name: Infusion de genièvre + ingredients: + - blue-flowers + - wheat + color: '00ccff' # aqua + + gin_base: + name: Brassée de genièvre fruité + ingredients: + - blue-flowers + - wheat + - apple + color: '66e0ff' # lighter aqua + + eggnog_base: + name: Mélange d'œufs lisse + ingredients: + - egg + - sugar + - milk_bucket + color: 'ffecb3' # yellow-orange + # -- Recette pour les boissons -- @@ -208,8 +342,8 @@ cauldron: # Le tonneau Minecraft est en chêne. # age: Temps en jours de Minecraft, la potion devra être âgée dans un baril. 0=Pas besoin d'âge # color: Couleur de la potion après distillation/avoir laissé vieillir. -# Couleurs disponibles: DARK_RED, RED, BRIGHT_RED, ORANGE, PINK, BLUE, CYAN, WATER, GREEN, BLACK, GREY, BRIGHT_GREY -# (Dans l'ordre : Rouge foncé, Rouge, Rouge clair, Orange, Rose, Bleu, Cyan, Eau, Vert, Noir, Gris, Gris clair) + # Couleurs disponibles : DARK_RED, RED, BRIGHT_RED, ORANGE, YELLOW, PINK, PURPLE, BLUE, CYAN, WATER, TEAL, OLIVE, GREEN, LIME, BLACK, GREY, BRIGHT_GREY, WHITE + # (Dans l'ordre : Rouge foncé, Rouge, Rouge clair, Orange, Jaune, Rose, Pourpre, Bleu, Cyan, Eau, Sarcelle, Olive, Vert, Vert lime, Noir, Gris, Gris clair, Blanc) # Ou couleurs RGB (hex: par exemple '99FF33') (avec '') (recherche de "HTML color" sur internet) # difficulty: 1-10 précision nécessaire pour obtenir une bonne qualité (1 = imprécis/facile, 10 = très précis/difficile) # alcohol: Le montant d'alcool absolu dans une boisson parfaite (cela sera ajouté directement au joueur, où 100% entraînera l'évanouissement), un degré d'alcooléisme en fait @@ -246,7 +380,7 @@ recipes: age: 11 color: DARK_RED difficulty: 3 - alcohol: 23 + alcohol: 14 lore: - C'est un breuvage d'exemple - ++Juste un exemple normal @@ -274,9 +408,10 @@ recipes: distillruns: 0 wood: 1 age: 2 - color: BRIGHT_GREY + color: 'ffb84d' # Orange difficulty: 1 alcohol: 5 + lore: +++ &8Refreshing 2: name: Bière Fade/Bière/Bonne Bière @@ -286,8 +421,10 @@ recipes: distillruns: 0 wood: 0 age: 3 - color: ORANGE + color: 'ffd333' # Bright Orange difficulty: 1 + lore: + - +++ &8Crisp taste alcohol: 6 3: @@ -296,12 +433,31 @@ recipes: - Wheat/6 cookingtime: 8 distillruns: 0 - wood: 4 + wood: 6 age: 8 - color: BLACK + color: '650013' # Dark Red-Brown difficulty: 2 + lore: + - +++ &8Roasted taste alcohol: 7 + wine: + name: Vin rouge + ingredients: + - Sweet_Berries/5 + cookingtime: 5 + distillruns: 0 + wood: 0 + age: 20 + color: RED + difficulty: 4 + alcohol: 8 + lore: + - '+ &8Harsh' + - '+ &8Corked' + - '++ &8Mellow' + - '+++ &8Full-Bodied' + 4: name: Hydromel Bizarre/Hydromel/&6Hydromel Doré ingredients: @@ -312,6 +468,8 @@ recipes: age: 4 color: ORANGE difficulty: 2 + lore: + - +++ Has a golden shine alcohol: 9 5: @@ -325,15 +483,59 @@ recipes: age: 4 color: ORANGE difficulty: 4 - alcohol: 12 + alcohol: 11 + lore: + - +Is there any Apple in this? + - ++Refreshing taste of Apple + - +++Sweetest hint of Apple effects: - WATER_BREATHING/1-2/150 + cidre: + name: Mauvais Cidre/Cidre de Pommes/Grand Cidre de Pomme + ingredients: + - Apple/14 + cookingtime: 7 + distillruns: 0 + wood: 0 + age: 3 + color: 'f86820' # Red-Orange + difficulty: 4 + alcohol: 7 + + apple_liquor: + name: Liqueur aigre aux pommes/Liqueur de pomme/Calvados + ingredients: + - Apple/12 + cookingtime: 16 + distillruns: 3 + wood: 5 + age: 6 + color: BRIGHT_RED + difficulty: 5 + alcohol: 14 + lore: + - +Sour like Acid + + whiskey: + name: Whisky disgracieux/Whiskey/Scotch Whiskey + ingredients: + - Wheat/10 + cookingtime: 10 + distillruns: 2 + distilltime: 50 + wood: 4 + age: 18 + color: ORANGE + difficulty: 7 + alcohol: 26 + lore: '&7Single Malt' + 6: name: Rhum Amer/Rhum Epicé/&6Rhum Doré ingredients: - - Sugar_Cane/14 - cookingtime: 5 + - Sugar_Cane/18 + cookingtime: 6 distillruns: 2 distilltime: 30 wood: 2 @@ -344,6 +546,10 @@ recipes: effects: - FIRE_RESISTANCE/1/20-100 - POISON/1-0/30-0 + lore: + - +&8Too bitter to drink + - ++&8Spiced by the barrel + - +++&eSpiced Gold 7: name: Vodka Sale/Vodka/Vodka Russe @@ -352,13 +558,64 @@ recipes: cookingtime: 15 distillruns: 3 age: 0 - color: BRIGHT_GREY + color: WHITE difficulty: 4 alcohol: 20 + lore: + &8Almost undrinkable effects: - WEAKNESS/15 - POISON/10 + shroom_vodka: + name: Vodka aux champignons/Vodka aux champignons/Vodka aux champignons rougeoyante + ingredients: + - Potato/10 + - Red_Mushroom/3 + - Brown_Mushroom/3 + cookingtime: 18 + distillruns: 5 + age: 0 + color: 'ff9999' # Pink-Red + difficulty: 7 + alcohol: 18 + lore: +++&aGlows in the dark + effects: + - WEAKNESS/80 + - CONFUSION/27 + - NIGHT_VISION/50-80 + - BLINDNESS/12-2 + - SLOW/10-3 + + gin: + name: Pale Gin/Gin/Old Tom Gin + ingredients: + - Wheat/9 + - blue-flowers/6 # Custom-Item: Blue Orchids or Cornflowers + - Apple/1 + cookingtime: 6 + distillruns: 2 + color: '99ddff' # Very light blue + difficulty: 6 + alcohol: 20 + lore: + - ++ With the + - ++ taste of juniper + - +++ Perfectly finished off + - +++ with juniper + + tequila: + name: Mezcal/Tequila/Tequila anejo + ingredients: + - cactus/8 + cookingtime: 15 + distillruns: 2 + color: 'f5f07e' # Green-Orange + difficulty: 5 + wood: 1 + age: 12 + alcohol: 20 + lore: Desert spirit + 8: name: Absinthe pauvre/Absinthe/Absinthe forte ingredients: @@ -368,22 +625,40 @@ recipes: distilltime: 80 color: GREEN difficulty: 8 - alcohol: 45 + alcohol: 42 effects: - - POISON/20-30 + - POISON/15-25 + lore: '+++&8High proof liquor' - 9: + gr_absinthe: + name: Poor Absinthe/Green Absinthe/Bright Green Absinthe + ingredients: + - Grass/17 + - Poisonous_Potato/2 + cookingtime: 5 + distillruns: 6 + distilltime: 85 + color: LIME + difficulty: 9 + alcohol: 46 + effects: + - POISON/25-40 + - HARM/2 + - NIGHT_VISION/40-60 + lore: '&aLooks poisonous' + + potato_soup: name: Potato soup ingredients: - Potato/5 - Grass/3 cookingtime: 3 - color: PINK + color: ORANGE difficulty: 1 effects: - HEAL/0-1 - 10: + coffee: name: Café fétide/Café/Café fort ingredients: - Cocoa_Beans/12 @@ -391,14 +666,106 @@ recipes: cookingtime: 2 color: BLACK difficulty: 3 + lore: + &8Probably a week old effects: - REGENERATION/1/2-5 - SPEED/1/30-140 -# Plus d'idées de recettes: Cachaça, Gin, Whisky, Tequila, Cidre, etc. et abréviations de haute qualité comme la vodka dorée etc. -# Je n'ajouterai pas plus de recettes à la configuration par défaut, car elles seront publiques et visibles par tous les utilisateurs et parce que les joueurs pourraient tricher en les voyant. + eggnog: + name: Liqueur d'oeuf/Liqueur d'oeuf/Advocaat + ingredients: + - Egg/5 + - Sugar/2 + - Milk_Bucket/1 + cookingtime: 2 + color: 'ffe680' + difficulty: 4 + alcohol: 10 + wood: 0 + age: 3 + lore: Made with raw egg + + +# Je ne veux pas ajouter plus de recettes à la configuration par défaut, car elles seront publiques et visibles par tous les utilisateurs et parce que les joueurs pourraient tricher en les voyant. # Ce sera aux Admins des serveurs de changer et d'ajouter les recettes, ainsi les joueurs ne pourront pas tricher avec les configuration de base. +#Voici quelques suggestions de recettes que vous pourriez utiliser: + + # g_vodka: + # name: 'Rancid Vodka/&6Golden Vodka/&6Shimmering Golden Vodka' + # ingredients: + # - Potato/10 + # - Gold_Nugget/2 + # cookingtime: 18 + # distillruns: 3 + # age: 0 + # color: ORANGE + # difficulty: 6 + # alcohol: 20 + # effects: + # - WEAKNESS/28 + # - POISON/4 + + # fire_whiskey: + # name: Powdery Whiskey/Burning Whiskey/Blazing Whiskey + # ingredients: + # - Wheat/10 + # - Blaze_Powder/2 + # cookingtime: 12 + # distillruns: 3 + # distilltime: 55 + # wood: 4 + # age: 18 + # color: ORANGE + # difficulty: 7 + # alcohol: 28 + # drinkmessage: 'You get a burning feeling in your mouth' + +# Without Alcohol: + + # hot_choc: + # name: Hot Chocolate + # ingredients: + # - cookie/3 + # cookingtime: 2 + # color: DARK_RED + # difficulty: 2 + # effects: + # - FAST_DIGGING/40 + + # iced_coffee: + # name: Watery Coffee/Iced Coffee/Strong Iced Coffee + # ingredients: + # - cookie/8 + # - snowball/4 + # - milk_bucket/1 + # cookingtime: 1 + # color: BLACK + # difficulty: 4 + # effects: + # - REGENERATION/30 + # - SPEED/10 + + +# More Recipe ideas: +# Dandelion Liquor +# Beetroot Spirit, +# Poppy Liquor: Macum/Grand Poppy, +# Bamboo Liquor: Chu Yeh Ching, +# Cachaca, +# Cognac, +# Sake, +# Buorbon, +# Moonshine, +# Different Wines, +# Brandy, +# Amaretto, +# etc. as well as variations like, +# Pumpkin Spice Beer, +# Melon Vodka + +# There are a lot of items in Minecraft like Vines and items added by plugins that would make great ingredients. + # -- Compatibilité entre Plugins -- diff --git a/resources/config/v13/it/config.yml b/resources/config/v13/it/config.yml index c94df82..9da7751 100644 --- a/resources/config/v13/it/config.yml +++ b/resources/config/v13/it/config.yml @@ -94,6 +94,7 @@ version: '2.0' # lore: What has to be in the lore of the item customItems: + # Three Example Items ex-item: # A Barrier item called Wall and has the given line in its lore material: Barrier @@ -117,6 +118,12 @@ customItems: rasp: name: '&cRaspberry' + blue-flowers: + matchAny: true + material: + - cornflower + - blue_orchid + # -- Ingredients in the Cauldron -- # Which Ingredients are accepted by the Cauldron and the base potion resulting from them @@ -126,12 +133,13 @@ customItems: # With an item in your hand, use /brew ItemName to get its material for use in a recipe # (Item-ids instead of material are not supported by bukkit anymore and will not work) # A list of materials can be found here: https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Material.html - # color: Color of the potion from a cauldron. - # Usable Colors: DARK_RED, RED, BRIGHT_RED, ORANGE, PINK, BLUE, CYAN, WATER, GREEN, BLACK, GREY, BRIGHT_GREY + # color: Color of the potion from a cauldron. Defaults to CYAN + # Usable Colors: DARK_RED, RED, BRIGHT_RED, ORANGE, YELLOW, PINK, PURPLE, BLUE, CYAN, WATER, TEAL, OLIVE, GREEN, LIME, BLACK, GREY, BRIGHT_GREY, WHITE # Or RGB colors (hex: for example '99FF33') (with '') (search for "HTML color" on the internet) # lore: List of additional text on the base potion. (Formatting codes possible: such as &6) cauldron: + # Example with all possible entries ex: name: Example ingredients: @@ -152,10 +160,19 @@ cauldron: ingredients: Sugar_Cane color: 'f1ffad' # yellowish green + sugar: + name: Sugarwater + ingredients: Sugar + apple: name: Sidro di mele ingredients: Apple + berries: + name: Grape must + ingredients: Sweet_Berries + color: RED + potato: name: Purè di patate ingredients: Potato @@ -170,6 +187,11 @@ cauldron: ingredients: Red_Mushroom color: 'ff5c33' # amber red + bmushroom: + name: Mushroom brew + ingredients: Brown_Mushroom + color: 'c68c53' # brighter brown + cocoa: name: Miscela colorata ingredients: Cocoa_Beans @@ -180,14 +202,127 @@ cauldron: ingredients: Milk_Bucket color: BRIGHT_GREY + bl_flow: + name: Blueish brew + ingredients: blue-flowers + color: '0099ff' # sky blue + + cactus: + name: Agave brew + ingredients: cactus + color: '00b300' # cactus green + + poi_potato: + name: Poisonous Broth + ingredients: Poisonous_Potato + + egg: + name: Sticky brew + ingredients: Egg + + + oak_sapling: + name: Stringy hebry broth + ingredients: Oak_Sapling + + vine: + name: Boiled herbs + ingredients: vine + color: '99ff66' # bright green + + rot_flesh: + name: Foul pest + ingredients: Rotten_Flesh + color: '263300' # brown green + + melon: + name: Melon juice + ingredients: melon_slice + + wheat_seeds: + name: Bitter brew + ingredients: Wheat_Seeds + + melon_seeds: + name: Bitter brew + ingredients: Melon_Seeds + + pumpkin_seeds: + name: Bitter brew + ingredients: Pumpkin_Seeds + + bone_meal: + name: Bony Brew + ingredients: bone_meal + color: BRIGHT_GREY + + cookie: + name: Chocolately sap + ingredients: Cookie + color: '804600' # mocca + + fer_spid_eye: + name: Fermented Eye + ingredients: Fermented_Spider_Eye + + ghast_tear: + name: Sad brew + ingredients: ghast_tear + + snowball: + name: Icewater + ingredients: Snowball + + Gold_Nugget: + name: Glistering brew + ingredients: Gold_Nugget + color: 'ffd11a' # gold + + glowstone_dust: + name: Glowing brew + ingredients: Glowstone_Dust + color: 'ffff33' # bright yellow + # -- Multiple Ingredients: -- - apfelmet_base: + applemead_base: name: Apple-Sugar brew ingredients: - Sugar_Cane/3 - Apple color: 'e1ff4d' # greenish yellow + poi_grass: + name: Boiled acidy herbs + ingredients: + - Grass + - Poisonous_Potato + color: '99ff66' # bright green + + juniper: + name: Juniper brew + ingredients: + - blue-flowers + - wheat + color: '00ccff' # aqua + + gin_base: + name: Fruity juniper brew + ingredients: + - blue-flowers + - wheat + - apple + color: '66e0ff' # lighter aqua + + eggnog_base: + name: Smooth egg mixture + ingredients: + - egg + - sugar + - milk_bucket + color: 'ffecb3' # yellow-orange + + + # -- Ricette per pozioni -- # name: Tre nomi diversi per diverse qualità (cattivo/normale/buono). I codici come &6 possono essere usati. @@ -238,7 +373,7 @@ recipes: age: 11 color: DARK_RED difficulty: 3 - alcohol: 23 + alcohol: 14 lore: - This is an examble brew - ++Just a normal Example @@ -266,9 +401,10 @@ recipes: distillruns: 0 wood: 1 age: 2 - color: BRIGHT_GREY + color: 'ffb84d' # Orange difficulty: 1 alcohol: 5 + lore: +++ &8Refreshing 2: name: Birra puzzolente/Birra/Birra pregiata @@ -278,8 +414,10 @@ recipes: distillruns: 0 wood: 0 age: 3 - color: ORANGE + color: 'ffd333' # Bright Orange difficulty: 1 + lore: + - +++ &8Crisp taste alcohol: 6 3: @@ -288,12 +426,31 @@ recipes: - Wheat/6 cookingtime: 8 distillruns: 0 - wood: 4 + wood: 6 age: 8 - color: BLACK + color: '650013' # Dark Red-Brown difficulty: 2 + lore: + - +++ &8Roasted taste alcohol: 7 + wine: + name: Red Wine + ingredients: + - Sweet_Berries/5 + cookingtime: 5 + distillruns: 0 + wood: 0 + age: 20 + color: RED + difficulty: 4 + alcohol: 8 + lore: + - '+ &8Harsh' + - '+ &8Corked' + - '++ &8Mellow' + - '+++ &8Full-Bodied' + 4: name: Idromele scarso/Idromele/&6Idromele dorato ingredients: @@ -304,6 +461,8 @@ recipes: age: 4 color: ORANGE difficulty: 2 + lore: + - +++ Has a golden shine alcohol: 9 5: @@ -317,15 +476,59 @@ recipes: age: 4 color: ORANGE difficulty: 4 - alcohol: 12 + alcohol: 11 + lore: + - +Is there any Apple in this? + - ++Refreshing taste of Apple + - +++Sweetest hint of Apple effects: - WATER_BREATHING/1-2/150 + cidre: + name: Poor Cidre/Apple Cider/Great Apple Cider + ingredients: + - Apple/14 + cookingtime: 7 + distillruns: 0 + wood: 0 + age: 3 + color: 'f86820' # Red-Orange + difficulty: 4 + alcohol: 7 + + apple_liquor: + name: Sour Apple Liquor/Apple Liquor/Calvados + ingredients: + - Apple/12 + cookingtime: 16 + distillruns: 3 + wood: 5 + age: 6 + color: BRIGHT_RED + difficulty: 5 + alcohol: 14 + lore: + - +Sour like Acid + + whiskey: + name: Unsightly Whiskey/Whiskey/Scotch Whiskey + ingredients: + - Wheat/10 + cookingtime: 10 + distillruns: 2 + distilltime: 50 + wood: 4 + age: 18 + color: ORANGE + difficulty: 7 + alcohol: 26 + lore: '&7Single Malt' + 6: name: Rum amaro/Rum speziato/&6Rum dorato ingredients: - - Sugar_Cane/14 - cookingtime: 5 + - Sugar_Cane/18 + cookingtime: 6 distillruns: 2 distilltime: 30 wood: 2 @@ -336,6 +539,10 @@ recipes: effects: - FIRE_RESISTANCE/1/20-100 - POISON/1-0/30-0 + lore: + - +&8Too bitter to drink + - ++&8Spiced by the barrel + - +++&eSpiced Gold 7: name: Vodka schifosa/Vodka/Vodka russa @@ -344,13 +551,64 @@ recipes: cookingtime: 15 distillruns: 3 age: 0 - color: BRIGHT_GREY + color: WHITE difficulty: 4 alcohol: 20 + lore: + &8Almost undrinkable effects: - WEAKNESS/15 - POISON/10 + shroom_vodka: + name: Mushroom Vodka/Mushroom Vodka/Glowing Mushroom Vodka + ingredients: + - Potato/10 + - Red_Mushroom/3 + - Brown_Mushroom/3 + cookingtime: 18 + distillruns: 5 + age: 0 + color: 'ff9999' # Pink-Red + difficulty: 7 + alcohol: 18 + lore: +++&aGlows in the dark + effects: + - WEAKNESS/80 + - CONFUSION/27 + - NIGHT_VISION/50-80 + - BLINDNESS/12-2 + - SLOW/10-3 + + gin: + name: Pale Gin/Gin/Old Tom Gin + ingredients: + - Wheat/9 + - blue-flowers/6 # Custom-Item: Blue Orchids or Cornflowers + - Apple/1 + cookingtime: 6 + distillruns: 2 + color: '99ddff' # Very light blue + difficulty: 6 + alcohol: 20 + lore: + - ++ With the + - ++ taste of juniper + - +++ Perfectly finished off + - +++ with juniper + + tequila: + name: Mezcal/Tequila/Tequila anejo + ingredients: + - cactus/8 + cookingtime: 15 + distillruns: 2 + color: 'f5f07e' # Green-Orange + difficulty: 5 + wood: 1 + age: 12 + alcohol: 20 + lore: Desert spirit + 8: name: Assenzio scarso/Assenzio/Assenzio forte ingredients: @@ -360,9 +618,27 @@ recipes: distilltime: 80 color: GREEN difficulty: 8 - alcohol: 45 + alcohol: 42 effects: - - POISON/20-30 + - POISON/15-25 + lore: '+++&8High proof liquor' + + gr_absinthe: + name: Poor Absinthe/Green Absinthe/Bright Green Absinthe + ingredients: + - Grass/17 + - Poisonous_Potato/2 + cookingtime: 5 + distillruns: 6 + distilltime: 85 + color: LIME + difficulty: 9 + alcohol: 46 + effects: + - POISON/25-40 + - HARM/2 + - NIGHT_VISION/40-60 + lore: '&aLooks poisonous' 9: name: Zuppa di patate @@ -370,7 +646,7 @@ recipes: - Potato/5 - Grass/3 cookingtime: 3 - color: PINK + color: ORANGE difficulty: 1 effects: - HEAL/0-1 @@ -378,19 +654,111 @@ recipes: 10: name: Caffè stantio/Caffè/Caffè forte ingredients: - - Cocoa_Beans,3/12 + - Cocoa_Beans/12 - Milk_Bucket/2 cookingtime: 2 color: BLACK difficulty: 3 + lore: + &8Probably a week old effects: - REGENERATION/1/2-5 - SPEED/1/30-140 -# Altre idee per ricette: Cachaca, Gin, Whiskey, Tequila, Sidro, ecc. Altri nomi per le altre qualità come Vodka Dorata ecc. +eggnog: + name: Egg Liquor/Eggnog/Advocaat + ingredients: + - Egg/5 + - Sugar/2 + - Milk_Bucket/1 + cookingtime: 2 + color: 'ffe680' + difficulty: 4 + alcohol: 10 + wood: 0 + age: 3 + lore: Made with raw egg + + + + # Io non aggiungerò altre ricette al config di default, perché sarebbero pubbliche e visibiliad altri utenti per barare. # Aggiungere e cambiare ricette è compito del Server Admin, così che i giocatori non possano barare guardando il config di default. +# Altre idee per ricette: + # g_vodka: + # name: 'Rancid Vodka/&6Golden Vodka/&6Shimmering Golden Vodka' + # ingredients: + # - Potato/10 + # - Gold_Nugget/2 + # cookingtime: 18 + # distillruns: 3 + # age: 0 + # color: ORANGE + # difficulty: 6 + # alcohol: 20 + # effects: + # - WEAKNESS/28 + # - POISON/4 + + # fire_whiskey: + # name: Powdery Whiskey/Burning Whiskey/Blazing Whiskey + # ingredients: + # - Wheat/10 + # - Blaze_Powder/2 + # cookingtime: 12 + # distillruns: 3 + # distilltime: 55 + # wood: 4 + # age: 18 + # color: ORANGE + # difficulty: 7 + # alcohol: 28 + # drinkmessage: 'You get a burning feeling in your mouth' + + # Without Alcohol: + + # hot_choc: + # name: Hot Chocolate + # ingredients: + # - cookie/3 + # cookingtime: 2 + # color: DARK_RED + # difficulty: 2 + # effects: + # - FAST_DIGGING/40 + + # iced_coffee: + # name: Watery Coffee/Iced Coffee/Strong Iced Coffee + # ingredients: + # - cookie/8 + # - snowball/4 + # - milk_bucket/1 + # cookingtime: 1 + # color: BLACK + # difficulty: 4 + # effects: + # - REGENERATION/30 + # - SPEED/10 + + +# More Recipe ideas: +# Dandelion Liquor +# Beetroot Spirit, +# Poppy Liquor: Macum/Grand Poppy, +# Bamboo Liquor: Chu Yeh Ching, +# Cachaca, +# Cognac, +# Sake, +# Buorbon, +# Moonshine, +# Different Wines, +# Brandy, +# Amaretto, +# etc. as well as variations like, +# Pumpkin Spice Beer, +# Melon Vodka + +# There are a lot of items in Minecraft like Vines and items added by plugins that would make great ingredients. # -- Compatibilità con altri plugin -- diff --git a/resources/config/v13/zh/config.yml b/resources/config/v13/zh/config.yml index 3703208..11f0ec7 100644 --- a/resources/config/v13/zh/config.yml +++ b/resources/config/v13/zh/config.yml @@ -96,6 +96,7 @@ version: '2.0' # lore: What has to be in the lore of the item customItems: + # Three Example Items ex-item: # A Barrier item called Wall and has the given line in its lore material: Barrier @@ -119,6 +120,12 @@ customItems: rasp: name: '&cRaspberry' + blue-flowers: + matchAny: true + material: + - cornflower + - blue_orchid + # -- Ingredients in the Cauldron -- # Which Ingredients are accepted by the Cauldron and the base potion resulting from them @@ -128,12 +135,13 @@ customItems: # With an item in your hand, use /brew ItemName to get its material for use in a recipe # (Item-ids instead of material are not supported by bukkit anymore and will not work) # A list of materials can be found here: https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Material.html - # color: Color of the potion from a cauldron. - # Usable Colors: DARK_RED, RED, BRIGHT_RED, ORANGE, PINK, BLUE, CYAN, WATER, GREEN, BLACK, GREY, BRIGHT_GREY + # color: Color of the potion from a cauldron. Defaults to CYAN + # Usable Colors: DARK_RED, RED, BRIGHT_RED, ORANGE, YELLOW, PINK, PURPLE, BLUE, CYAN, WATER, TEAL, OLIVE, GREEN, LIME, BLACK, GREY, BRIGHT_GREY, WHITE # Or RGB colors (hex: for example '99FF33') (with '') (search for "HTML color" on the internet) # lore: List of additional text on the base potion. (Formatting codes possible: such as &6) cauldron: + # Example with all possible entries ex: name: Example ingredients: @@ -154,10 +162,19 @@ cauldron: ingredients: Sugar_Cane color: 'f1ffad' # yellowish green + sugar: + name: Sugarwater + ingredients: Sugar + apple: name: 苹果汁 ingredients: Apple + berries: + name: Grape must + ingredients: Sweet_Berries + color: RED + potato: name: 土豆泥 ingredients: Potato @@ -172,6 +189,11 @@ cauldron: ingredients: Red_Mushroom color: 'ff5c33' # amber red + bmushroom: + name: Mushroom brew + ingredients: Brown_Mushroom + color: 'c68c53' # brighter brown + cocoa: name: 上了色的水 ingredients: Cocoa_Beans @@ -182,14 +204,125 @@ cauldron: ingredients: Milk_Bucket color: BRIGHT_GREY + bl_flow: + name: Blueish brew + ingredients: blue-flowers + color: '0099ff' # sky blue + + cactus: + name: Agave brew + ingredients: cactus + color: '00b300' # cactus green + + poi_potato: + name: Poisonous Broth + ingredients: Poisonous_Potato + + egg: + name: Sticky brew + ingredients: Egg + + + oak_sapling: + name: Stringy hebry broth + ingredients: Oak_Sapling + + vine: + name: Boiled herbs + ingredients: vine + color: '99ff66' # bright green + + rot_flesh: + name: Foul pest + ingredients: Rotten_Flesh + color: '263300' # brown green + + melon: + name: Melon juice + ingredients: melon_slice + + wheat_seeds: + name: Bitter brew + ingredients: Wheat_Seeds + + melon_seeds: + name: Bitter brew + ingredients: Melon_Seeds + + pumpkin_seeds: + name: Bitter brew + ingredients: Pumpkin_Seeds + + bone_meal: + name: Bony Brew + ingredients: bone_meal + color: BRIGHT_GREY + + cookie: + name: Chocolately sap + ingredients: Cookie + color: '804600' # mocca + + fer_spid_eye: + name: Fermented Eye + ingredients: Fermented_Spider_Eye + + ghast_tear: + name: Sad brew + ingredients: ghast_tear + + snowball: + name: Icewater + ingredients: Snowball + + Gold_Nugget: + name: Glistering brew + ingredients: Gold_Nugget + color: 'ffd11a' # gold + + glowstone_dust: + name: Glowing brew + ingredients: Glowstone_Dust + color: 'ffff33' # bright yellow + # -- Multiple Ingredients: -- - apfelmet_base: + applemead_base: name: Apple-Sugar brew ingredients: - Sugar_Cane/3 - Apple color: 'e1ff4d' # greenish yellow + poi_grass: + name: Boiled acidy herbs + ingredients: + - Grass + - Poisonous_Potato + color: '99ff66' # bright green + + juniper: + name: Juniper brew + ingredients: + - blue-flowers + - wheat + color: '00ccff' # aqua + + gin_base: + name: Fruity juniper brew + ingredients: + - blue-flowers + - wheat + - apple + color: '66e0ff' # lighter aqua + + eggnog_base: + name: Smooth egg mixture + ingredients: + - egg + - sugar + - milk_bucket + color: 'ffecb3' # yellow-orange + # -- 饮品配方列表 -- @@ -209,7 +342,7 @@ cauldron: # age: 饮品需要在木桶中熟成所需要的时间(MC天). 0=无需熟成. # color: 饮品制成后的颜色. # 可用颜色列表: -# DARK_RED(深红), RED(红), BRIGHT_RED(亮红), ORANGE(橙黄), PINK(粉色), BLUE(蓝色), CYAN(靛青), WATER(水色), GREEN(绿色), BLACK(黑色), GREY(灰色), BRIGHT_GREY(亮灰色) +# DARK_RED(深红), RED(红), BRIGHT_RED(亮红), ORANGE(橙黄), PINK(粉色), BLUE(蓝色), CYAN(靛青), WATER(水色), GREEN(绿色), BLACK(黑色), GREY(灰色), BRIGHT_GREY(亮灰色), YELLOW, PURPLE, TEAL, OLIVE, LIME, WHITE # 也可以使用RGB颜色(十六进制, 如'99FF33', 必须包含两个单引号)(在线搜索"HTML 颜色"或者其他颜色库即刻获得你需要的颜色的十六进制表示) # difficulty: 酿制难度, 1 = 不需要非常精确的操作就可以制出优质饮品, 10 = 需要非常精确的操作才可以制出优质饮品. # alcohol: 完美质量的饮品所含有的酒精度(百分数, 会被直接添加到玩家身上, 100意为直接昏迷) @@ -244,7 +377,7 @@ recipes: age: 11 color: DARK_RED difficulty: 3 - alcohol: 23 + alcohol: 14 lore: - This is an examble brew - ++Just a normal Example @@ -272,9 +405,10 @@ recipes: distillruns: 0 wood: 1 age: 2 - color: BRIGHT_GREY + color: 'ffb84d' # Orange difficulty: 1 alcohol: 5 + lore: +++ &8Refreshing 2: name: 劣质啤酒/啤酒/鲜啤 @@ -284,8 +418,10 @@ recipes: distillruns: 0 wood: 0 age: 3 - color: ORANGE + color: 'ffd333' # Bright Orange difficulty: 1 + lore: + - +++ &8Crisp taste alcohol: 6 3: @@ -294,12 +430,31 @@ recipes: - Wheat/6 cookingtime: 8 distillruns: 0 - wood: 4 + wood: 6 age: 8 - color: BLACK + color: '650013' # Dark Red-Brown difficulty: 2 + lore: + - +++ &8Roasted taste alcohol: 7 + wine: + name: Red Wine + ingredients: + - Sweet_Berries/5 + cookingtime: 5 + distillruns: 0 + wood: 0 + age: 20 + color: RED + difficulty: 4 + alcohol: 8 + lore: + - '+ &8Harsh' + - '+ &8Corked' + - '++ &8Mellow' + - '+++ &8Full-Bodied' + 4: name: 粗制蜜酒/蜜酒/黄金蜜酒 ingredients: @@ -310,6 +465,8 @@ recipes: age: 4 color: ORANGE difficulty: 2 + lore: + - +++ Has a golden shine alcohol: 9 5: @@ -323,15 +480,59 @@ recipes: age: 4 color: ORANGE difficulty: 4 - alcohol: 12 + alcohol: 11 + lore: + - +Is there any Apple in this? + - ++Refreshing taste of Apple + - +++Sweetest hint of Apple effects: - WATER_BREATHING/1-2/150 6: name: 苦涩的朗姆/辛辣的朗姆/金品朗姆 ingredients: - - Sugar_Cane/14 - cookingtime: 5 + - Apple/14 + cookingtime: 7 + distillruns: 0 + wood: 0 + age: 3 + color: 'f86820' # Red-Orange + difficulty: 4 + alcohol: 7 + + apple_liquor: + name: Sour Apple Liquor/Apple Liquor/Calvados + ingredients: + - Apple/12 + cookingtime: 16 + distillruns: 3 + wood: 5 + age: 6 + color: BRIGHT_RED + difficulty: 5 + alcohol: 14 + lore: + - +Sour like Acid + + whiskey: + name: Unsightly Whiskey/Whiskey/Scotch Whiskey + ingredients: + - Wheat/10 + cookingtime: 10 + distillruns: 2 + distilltime: 50 + wood: 4 + age: 18 + color: ORANGE + difficulty: 7 + alcohol: 26 + lore: '&7Single Malt' + + rum: + name: Bitter Rum/Spicy Rum/&6Golden Rum + ingredients: + - Sugar_Cane/18 + cookingtime: 6 distillruns: 2 distilltime: 30 wood: 2 @@ -342,6 +543,10 @@ recipes: effects: - FIRE_RESISTANCE/1/20-100 - POISON/1-0/30-0 + lore: + - +&8Too bitter to drink + - ++&8Spiced by the barrel + - +++&eSpiced Gold 7: name: 劣质伏特加/伏特加/纯正俄式风味伏特加 @@ -350,13 +555,64 @@ recipes: cookingtime: 15 distillruns: 3 age: 0 - color: BRIGHT_GREY + color: WHITE difficulty: 4 alcohol: 20 + lore: + &8Almost undrinkable effects: - WEAKNESS/15 - POISON/10 + shroom_vodka: + name: Mushroom Vodka/Mushroom Vodka/Glowing Mushroom Vodka + ingredients: + - Potato/10 + - Red_Mushroom/3 + - Brown_Mushroom/3 + cookingtime: 18 + distillruns: 5 + age: 0 + color: 'ff9999' # Pink-Red + difficulty: 7 + alcohol: 18 + lore: +++&aGlows in the dark + effects: + - WEAKNESS/80 + - CONFUSION/27 + - NIGHT_VISION/50-80 + - BLINDNESS/12-2 + - SLOW/10-3 + + gin: + name: Pale Gin/Gin/Old Tom Gin + ingredients: + - Wheat/9 + - blue-flowers/6 # Custom-Item: Blue Orchids or Cornflowers + - Apple/1 + cookingtime: 6 + distillruns: 2 + color: '99ddff' # Very light blue + difficulty: 6 + alcohol: 20 + lore: + - ++ With the + - ++ taste of juniper + - +++ Perfectly finished off + - +++ with juniper + + tequila: + name: Mezcal/Tequila/Tequila anejo + ingredients: + - cactus/8 + cookingtime: 15 + distillruns: 2 + color: 'f5f07e' # Green-Orange + difficulty: 5 + wood: 1 + age: 12 + alcohol: 20 + lore: Desert spirit + 8: name: 劣质苦艾酒/苦艾酒/劲猛苦艾酒 ingredients: @@ -366,9 +622,27 @@ recipes: distilltime: 80 color: GREEN difficulty: 8 - alcohol: 45 + alcohol: 42 effects: - - POISON/20-30 + - POISON/15-25 + lore: '+++&8High proof liquor' + + gr_absinthe: + name: Poor Absinthe/Green Absinthe/Bright Green Absinthe + ingredients: + - Grass/17 + - Poisonous_Potato/2 + cookingtime: 5 + distillruns: 6 + distilltime: 85 + color: LIME + difficulty: 9 + alcohol: 46 + effects: + - POISON/25-40 + - HARM/2 + - NIGHT_VISION/40-60 + lore: '&aLooks poisonous' 9: name: 土豆汤 @@ -376,7 +650,7 @@ recipes: - Potato/5 - Grass/3 cookingtime: 3 - color: PINK + color: ORANGE difficulty: 1 effects: - HEAL/0-1 @@ -389,13 +663,106 @@ recipes: cookingtime: 2 color: BLACK difficulty: 3 + lore: + &8Probably a week old effects: - REGENERATION/1/2-5 - SPEED/1/30-140 -# 未来可能加入的酒品配方: 卡沙夏酒, 琴酒, 威士忌, 特基拉酒, 果酒等. 并改进一些物品名称. + eggnog: + name: Egg Liquor/Eggnog/Advocaat + ingredients: + - Egg/5 + - Sugar/2 + - Milk_Bucket/1 + cookingtime: 2 + color: 'ffe680' + difficulty: 4 + alcohol: 10 + wood: 0 + age: 3 + lore: Made with raw egg + + + + # 并不会直接加入到默认配置中, 这会导致游戏玩家偷看配方表进行作弊. # 插件的本意是让玩家自行实验饮品制造配方, 所以未来的新配方由服管决定是否加入. + # Some suggestions for recipes you could use: + + # g_vodka: + # name: 'Rancid Vodka/&6Golden Vodka/&6Shimmering Golden Vodka' + # ingredients: + # - Potato/10 + # - Gold_Nugget/2 + # cookingtime: 18 + # distillruns: 3 + # age: 0 + # color: ORANGE + # difficulty: 6 + # alcohol: 20 + # effects: + # - WEAKNESS/28 + # - POISON/4 + + # fire_whiskey: + # name: Powdery Whiskey/Burning Whiskey/Blazing Whiskey + # ingredients: + # - Wheat/10 + # - Blaze_Powder/2 + # cookingtime: 12 + # distillruns: 3 + # distilltime: 55 + # wood: 4 + # age: 18 + # color: ORANGE + # difficulty: 7 + # alcohol: 28 + # drinkmessage: 'You get a burning feeling in your mouth' + + # Without Alcohol: + + # hot_choc: + # name: Hot Chocolate + # ingredients: + # - cookie/3 + # cookingtime: 2 + # color: DARK_RED + # difficulty: 2 + # effects: + # - FAST_DIGGING/40 + + # iced_coffee: + # name: Watery Coffee/Iced Coffee/Strong Iced Coffee + # ingredients: + # - cookie/8 + # - snowball/4 + # - milk_bucket/1 + # cookingtime: 1 + # color: BLACK + # difficulty: 4 + # effects: + # - REGENERATION/30 + # - SPEED/10 + + +# More Recipe ideas: +# Dandelion Liquor +# Beetroot Spirit, +# Poppy Liquor: Macum/Grand Poppy, +# Bamboo Liquor: Chu Yeh Ching, +# Cachaca, +# Cognac, +# Sake, +# Buorbon, +# Moonshine, +# Different Wines, +# Brandy, +# Amaretto, +# etc. as well as variations like, +# Pumpkin Spice Beer, +# Melon Vodka + +# There are a lot of items in Minecraft like Vines and items added by plugins that would make great ingredients. # -- 插件兼容性 -- diff --git a/src/com/dre/brewery/BPlayer.java b/src/com/dre/brewery/BPlayer.java index 289fd7c..bb23ceb 100644 --- a/src/com/dre/brewery/BPlayer.java +++ b/src/com/dre/brewery/BPlayer.java @@ -183,6 +183,7 @@ public class BPlayer { if (bPlayer.drunkeness > 100) { bPlayer.drinkCap(player); } + //player.sendMessage("Betrunkenheit: §8[§7⭑⭑⭑⭒§0⭑§8] §8[§6|||||||||||||||||§0|||||||||§8]"); return true; } diff --git a/src/com/dre/brewery/P.java b/src/com/dre/brewery/P.java index e3020f5..eef6c95 100644 --- a/src/com/dre/brewery/P.java +++ b/src/com/dre/brewery/P.java @@ -253,19 +253,48 @@ public class P extends JavaPlugin { } else if (recipes < 11) { return "7-10"; } else if (recipes == 11) { - // There are 11 default recipes, so show this as its own slice + // There were 11 default recipes, so show this as its own slice return "11"; - } else if (recipes <= 31) { + } else if (recipes == 20) { + // There are 20 default recipes, so show this as its own slice + return "20"; + } else if (recipes <= 29) { if (recipes % 2 == 0) { return recipes + "-" + (recipes + 1); } else { return (recipes - 1) + "-" + recipes; } + } else if (recipes < 35) { + return "30-34"; + } else if (recipes < 40) { + return "35-39"; + } else if (recipes < 45) { + return "40-44"; + } else if (recipes <= 50) { + return "45-50"; } else { - return "More than 31"; + return "More than 50"; } })); + + metrics.addCustomChart(new Metrics.SimplePie("wakeups", () -> { + if (!BConfig.enableHome) { + return "disabled"; + } + int wakeups = Wakeup.wakeups.size(); + if (wakeups == 0) { + return "0"; + } else if (wakeups <= 5) { + return "1-5"; + } else if (wakeups <= 10) { + return "6-10"; + } else if (wakeups <= 20) { + return "11-20"; + } else { + return "More than 20"; + } + })); metrics.addCustomChart(new Metrics.SimplePie("v2_mc_version", () -> { String mcv = Bukkit.getBukkitVersion(); mcv = mcv.substring(0, mcv.indexOf('.', 2)); diff --git a/src/com/dre/brewery/listeners/CommandListener.java b/src/com/dre/brewery/listeners/CommandListener.java index 9a3c3c7..f5fbfb1 100644 --- a/src/com/dre/brewery/listeners/CommandListener.java +++ b/src/com/dre/brewery/listeners/CommandListener.java @@ -524,6 +524,7 @@ public class CommandListener implements CommandExecutor { if (player == null) { player = ((Player) sender); + pName = null; } int stringLength = args.length - 1; if (pName != null) { diff --git a/src/com/dre/brewery/lore/BrewLore.java b/src/com/dre/brewery/lore/BrewLore.java index c81fa94..7288381 100644 --- a/src/com/dre/brewery/lore/BrewLore.java +++ b/src/com/dre/brewery/lore/BrewLore.java @@ -225,16 +225,23 @@ public class BrewLore { return; } if (!brew.isUnlabeled() && brew.getQuality() > 0 && (qualityColor || BConfig.alwaysShowQuality)) { - int stars = (brew.getQuality() + 1) / 2; - StringBuilder b = new StringBuilder(stars); - for (; stars > 0; stars--) { - b.append("⭑"); - } + int stars = (brew.getQuality()) / 2; + boolean half = (brew.getQuality()) % 2 > 0; + StringBuilder b = new StringBuilder(24); String color; if (qualityColor) { color = getQualityColor(brew.getQuality()); } else { - color = brew.getQuality() >= 10 ? "§6" : "§8"; + color = "§7"; + } + for (; stars > 0; stars--) { + b.append("⭑"); + } + if (half) { + if (!qualityColor) { + b.append("§8"); + } + b.append("⭒"); } addOrReplaceLore(Type.STARS, color, b.toString()); } else { @@ -480,10 +487,10 @@ public class BrewLore { * Type of Lore Line */ public enum Type { - STARS("§s"), CUSTOM("§t"), SPACE("§u"), + STARS("§s"), INGR("§v"), COOK("§w"), DISTILL("§x"), diff --git a/src/com/dre/brewery/recipe/BCauldronRecipe.java b/src/com/dre/brewery/recipe/BCauldronRecipe.java index c3143e6..2c2363d 100644 --- a/src/com/dre/brewery/recipe/BCauldronRecipe.java +++ b/src/com/dre/brewery/recipe/BCauldronRecipe.java @@ -138,8 +138,20 @@ public class BCauldronRecipe { /** * Find how much these ingredients match the given ones from 0-10. *

If any ingredient is missing, returns 0 - *
If all Ingredients and their amounts are equal, returns 10 - *
Returns something between 0 and 10 if all ingredients present, but differing amounts, depending on how much the amount differs. + *
Any included item that is not in the recipe, will drive the number down most heavily. + *
More Amount of any item, will logarithmically raise the number + *
Difference in Amount to what the recipe expects will make a tiny difference on the number + *

So apart from unexpected items, more amount of the correct item will make the number go up, + * with a little dip for difference in expected amount. + * + *

The thought behind this is, that a given list of ingredients matches this recipe most, when: + *
1. It is not missing ingredients, + *
2. It has no unexpected ingredients + *
3. It has a lot of the matching ingredients, so that for two recipes, both having the same + * amount of unexpected ingredients, the one matching the item with the highest amounts wins. + *
For Example | Recipe_1: (Wheat*1), Recipe_2: (Sugar*1) | Ingredients: (Wheat*10, Sugar*5), Recipe_1 should win, + * even though the difference in expected amount (1) is lower for Recipe_2 + *
4. It has the least difference in expected ingredient amount. */ public float getIngredientMatch(List items) { if (items.size() < ingredients.size()) { @@ -162,9 +174,6 @@ public class BCauldronRecipe { P.p.debugLog("Mod for " + recipeIng + ": " + mod); - - - match *= mod; continue search; } @@ -173,8 +182,9 @@ public class BCauldronRecipe { } if (items.size() > ingredients.size()) { // If there are too many items in the List, multiply the match by 0.1 per Item thats too much + // So that even if every other ingredient is perfect, a recipe that expects all these items will fare better float tooMuch = items.size() - ingredients.size(); - float mod = 0.1f / tooMuch; + double mod = Math.pow(0.1, tooMuch); match *= mod; } P.p.debugLog("Match for Cauldron Recipe " + name + ": " + match); diff --git a/src/com/dre/brewery/recipe/BRecipe.java b/src/com/dre/brewery/recipe/BRecipe.java index 753ce66..706101a 100644 --- a/src/com/dre/brewery/recipe/BRecipe.java +++ b/src/com/dre/brewery/recipe/BRecipe.java @@ -196,6 +196,12 @@ public class BRecipe { matParts = ingredParts[0].split("\\."); } + if (!P.use1_14 && matParts[0].equalsIgnoreCase("sweet_berries")) { + // Using this in default recipes, but will error on < 1.14 + ingredients.add(new SimpleItem(Material.BEDROCK)); + continue; + } + // Check if this is a Plugin Item String[] pluginItem = matParts[0].split(":"); if (pluginItem.length > 1) { diff --git a/src/com/dre/brewery/recipe/PotionColor.java b/src/com/dre/brewery/recipe/PotionColor.java index 59aac49..448ec5c 100644 --- a/src/com/dre/brewery/recipe/PotionColor.java +++ b/src/com/dre/brewery/recipe/PotionColor.java @@ -21,6 +21,12 @@ public class PotionColor { public static final PotionColor WATER = new PotionColor(11, P.use1_9 ? PotionType.WATER_BREATHING : null, Color.BLUE); public static final PotionColor DARK_RED = new PotionColor(12, PotionType.INSTANT_DAMAGE, Color.fromRGB(128,0,0)); public static final PotionColor BRIGHT_GREY = new PotionColor(14, PotionType.INVISIBILITY, Color.SILVER); + public static final PotionColor WHITE = new PotionColor(Color.WHITE); + public static final PotionColor LIME = new PotionColor(Color.LIME); + public static final PotionColor OLIVE = new PotionColor(Color.OLIVE); + public static final PotionColor PURPLE = new PotionColor(Color.PURPLE); + public static final PotionColor TEAL = new PotionColor(Color.TEAL); + public static final PotionColor YELLOW = new PotionColor(Color.YELLOW); private final int colorId; private final PotionType type; @@ -33,7 +39,7 @@ public class PotionColor { } public PotionColor(Color color) { - colorId = -1; + colorId = WATER.colorId; type = WATER.getType(); this.color = color; } @@ -86,6 +92,12 @@ public class PotionColor { case "WATER": return WATER; case "DARK_RED": return DARK_RED; case "BRIGHT_GREY": return BRIGHT_GREY; + case "WHITE": return WHITE; + case "LIME": return LIME; + case "OLIVE": return OLIVE; + case "PURPLE": return PURPLE; + case "TEAL": return TEAL; + case "YELLOW": return YELLOW; default: try{ if (string.length() >= 7) { diff --git a/src/com/dre/brewery/recipe/RecipeItem.java b/src/com/dre/brewery/recipe/RecipeItem.java index 48bf510..8497598 100644 --- a/src/com/dre/brewery/recipe/RecipeItem.java +++ b/src/com/dre/brewery/recipe/RecipeItem.java @@ -251,6 +251,12 @@ public abstract class RecipeItem implements Cloneable { } Material mat = Material.matchMaterial(ingredParts[0]); + if (mat == null && !P.use1_14 && ingredParts[0].equalsIgnoreCase("cornflower")) { + // Using this in default custom-items, but will error on < 1.14 + materials.add(Material.BEDROCK); + continue; + } + if (mat == null && BConfig.hasVault) { try { net.milkbowl.vault.item.ItemInfo vaultItem = net.milkbowl.vault.item.Items.itemByString(ingredParts[0]);