diff --git a/resources/config/v13/de/config.yml b/resources/config/v13/de/config.yml index a2a6242..4849d72 100644 --- a/resources/config/v13/de/config.yml +++ b/resources/config/v13/de/config.yml @@ -411,7 +411,7 @@ cauldron: # cookingtime: Zeit in Echtminuten die die Zutaten kochen müssen # distillruns: Wie oft destilliert werden muss für vollen Alkoholgehalt (0=ohne Destillieren) # distilltime: Wie lange (in sekunden) ein Destillations-Durchlauf braucht (0=Standard Zeit von 40 sek) MC Standard wäre 20 sek -# wood: Holz des Fasses 0=alle Holzsorten 1=Birke 2=Eiche 3=Jungel 4=Fichte 5=Akazie 6=Schwarzeiche 7=Karmesin 8=Wirr 9=Mangrove +# wood: Holz des Fasses 0=alle Holzsorten 1=Birke 2=Eiche 3=Jungel 4=Fichte 5=Akazie 6=Schwarzeiche 7=Karmesin 8=Wirr 9=Mangrove 10=Kirschholz 11=Bambus # 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. diff --git a/resources/config/v13/en/config.yml b/resources/config/v13/en/config.yml index 1da2ef9..c393e45 100644 --- a/resources/config/v13/en/config.yml +++ b/resources/config/v13/en/config.yml @@ -411,7 +411,7 @@ cauldron: # cookingtime: Time in real minutes ingredients have to boil # distillruns: How often it has to be distilled for full alcohol (0=without distilling) # distilltime: How long (in seconds) one distill-run takes (0=Default time of 40 sec) MC Default would be 20 sec -# wood: Wood of the barrel 0=any 1=Birch 2=Oak 3=Jungle 4=Spruce 5=Acacia 6=Dark Oak 7=Crimson 8=Warped 9=Mangrove +# wood: Wood of the barrel 0=any 1=Birch 2=Oak 3=Jungle 4=Spruce 5=Acacia 6=Dark Oak 7=Crimson 8=Warped 9=Mangrove 10=Cherry 11=Bamboo # 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. diff --git a/resources/config/v13/es/config.yml b/resources/config/v13/es/config.yml index 99bc6e2..eeb7780 100644 --- a/resources/config/v13/es/config.yml +++ b/resources/config/v13/es/config.yml @@ -411,7 +411,7 @@ cauldron: # cookingtime: Time in real minutes ingredients have to boil # distillruns: How often it has to be distilled for full alcohol (0=without distilling) # distilltime: How long (in seconds) one distill-run takes (0=Default time of 40 sec) MC Default would be 20 sec -# wood: Wood of the barrel 0=any 1=Birch 2=Oak 3=Jungle 4=Spruce 5=Acacia 6=Dark Oak 7=Crimson 8=Warped 9=Mangrove +# wood: Wood of the barrel 0=any 1=Birch 2=Oak 3=Jungle 4=Spruce 5=Acacia 6=Dark Oak 7=Crimson 8=Warped 9=Mangrove 10=Cherry 11=Bamboo # 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. diff --git a/resources/config/v13/fr/config.yml b/resources/config/v13/fr/config.yml index 627450c..02d8c94 100644 --- a/resources/config/v13/fr/config.yml +++ b/resources/config/v13/fr/config.yml @@ -414,7 +414,7 @@ cauldron: # cookingtime: Temps en minutes réelles durant lesquelles les ingrédients devront bouillir # distillruns: Combien de fois le breuvage devra être distillé pour un alcool de qualité (0=Ne pas distiller) # distilltime: Combien de temps (en secondes) dure une distillation (0=Temps par défaut de 40 secondes) MC Par défaut serait de 20 secondes -# wood: Type de bois du baril 0=aucun 1=Bouleau 2=Chêne 3=Jungle 4=Pin 5=Acacia 6=Chêne Noir 7=Crimson 8=Warped 9=Mangrove +# wood: Type de bois du baril 0=aucun 1=Bouleau 2=Chêne 3=Jungle 4=Pin 5=Acacia 6=Chêne Noir 7=Crimson 8=Warped 9=Mangrove 10=Cerisier 11=Bambou # 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. diff --git a/resources/config/v13/it/config.yml b/resources/config/v13/it/config.yml index c2779d4..fa83c98 100644 --- a/resources/config/v13/it/config.yml +++ b/resources/config/v13/it/config.yml @@ -411,7 +411,7 @@ cauldron: # cookingtime: Tempo in minuti richiesto dagli ingredienti per bollire # distillruns: Quanto spesso deve essere distillato per ottenere la versione perfetta con il volume alcolico impostato (0=non serve distillare). # distilltime: How long (in seconds) one distill-run takes (0=Default time of 40 sec) MC Default would be 20 sec -# wood: Legno del barile 0=qualiasi 1=Betulla 2=Quercia 3=Mogano 4=Abete 5=Acacia 6=Quercia nera 7=Crimson 8=Warped 9=Mangrove +# wood: Legno del barile 0=qualiasi 1=Betulla 2=Quercia 3=Mogano 4=Abete 5=Acacia 6=Quercia nera 7=Crimson 8=Warped 9=Mangrove 10=Ciliegio 11=Bambù # The Minecraft barrel is made of oak # age: Tempo in giorni di Minecraft per cui la pozione deve essere invecchiata in un barile (0=nessun invecchiamento). # color: Colore della pozione dopo essere stata distillata/invecchiata diff --git a/resources/config/v13/zh/config.yml b/resources/config/v13/zh/config.yml index 52dcca4..5a003e4 100644 --- a/resources/config/v13/zh/config.yml +++ b/resources/config/v13/zh/config.yml @@ -413,7 +413,7 @@ cauldron: # cookingtime: 原料需要在炼药锅内烹制发酵的时间, 单位为现实分钟. # distillruns: 饮品需要在酿造台上蒸馏的次数(0=无需蒸馏). # distilltime: 每次蒸馏所需要耗费的时间(0=默认值, 即40秒), MC默认则为20秒/ -# wood: 木桶所需要的木质 0=任意 1=桦木 2=橡木 3=丛林木 4=云杉木 5=金合欢木 6=深色橡木 7=Crimson 8=Warped 9=Mangrove +# wood: 木桶所需要的木质 0=任意 1=桦木 2=橡木 3=丛林木 4=云杉木 5=金合欢木 6=深色橡木 7=Crimson 8=Warped 9=Mangrove 10=Cherry 11=Bamboo # MC的木桶默认为橡木桶. # age: 饮品需要在木桶中熟成所需要的时间(MC天). 0=无需熟成. # color: 饮品制成后的颜色. diff --git a/src/com/dre/brewery/recipe/BRecipe.java b/src/com/dre/brewery/recipe/BRecipe.java index b7d2bd3..85cd480 100644 --- a/src/com/dre/brewery/recipe/BRecipe.java +++ b/src/com/dre/brewery/recipe/BRecipe.java @@ -325,7 +325,7 @@ public class BRecipe { P.p.errorLog("Invalid distilltime '" + distillTime + "' in Recipe: " + getRecipeName()); return false; } - if (wood < 0 || wood > 9) { + if (wood < 0 || wood > 11) { P.p.errorLog("Invalid wood type '" + wood + "' in Recipe: " + getRecipeName()); return false; } diff --git a/src/com/dre/brewery/utility/LegacyUtil.java b/src/com/dre/brewery/utility/LegacyUtil.java index d5cdecf..d15c952 100644 --- a/src/com/dre/brewery/utility/LegacyUtil.java +++ b/src/com/dre/brewery/utility/LegacyUtil.java @@ -63,6 +63,8 @@ public class LegacyUtil { get("CRIMSON_STAIRS"), get("WARPED_STAIRS"), get("MANGROVE_STAIRS"), + get("CHERRY_STAIRS"), + get("BAMBOO_STAIRS"), }; for (Material stair : gotStairs) { if (stair != null) { @@ -191,6 +193,10 @@ public class LegacyUtil { return 8; } else if (material.startsWith("MANGROVE")) { return 9; + } else if (material.startsWith("CHERRY")) { + return 10; + } else if (material.startsWith("BAMBOO")) { + return 11; } else { return 0; }