Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pale oak update #116

Merged
merged 8 commits into from
Jan 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resources/config/v13/de/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 10=Kirschholz 11=Bambus
# 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 12=Weißeiche
# 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.
Expand Down
2 changes: 1 addition & 1 deletion resources/config/v13/en/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 10=Cherry 11=Bamboo
# 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 12=Pale Oak
# 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.
Expand Down
2 changes: 1 addition & 1 deletion resources/config/v13/es/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 10=Cherry 11=Bamboo
# 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 12=Roble pálido
# 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.
Expand Down
2 changes: 1 addition & 1 deletion resources/config/v13/fr/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 10=Cerisier 11=Bambou
# 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 12=Chêne Pâle
# 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.
Expand Down
2 changes: 1 addition & 1 deletion resources/config/v13/it/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 10=Ciliegio 11=Bambù
# 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ù 12=Quercia bianca
# 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
Expand Down
2 changes: 1 addition & 1 deletion resources/config/v13/zh/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 10=Cherry 11=Bamboo
# wood: 木桶所需要的木质 0=任意 1=桦木 2=橡木 3=丛林木 4=云杉木 5=金合欢木 6=深色橡木 7=Crimson 8=Warped 9=红树林 10=樱桃木 11=竹子 12=白橡木
# MC的木桶默认为橡木桶.
# age: 饮品需要在木桶中熟成所需要的时间(MC天). 0=无需熟成.
# color: 饮品制成后的颜色.
Expand Down
9 changes: 6 additions & 3 deletions src/com/dre/brewery/utility/LegacyUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ public class LegacyUtil {
!name.startsWith("WARPED") &&
!name.startsWith("MANGROVE") &&
!name.startsWith("CHERRY") &&
!name.startsWith("BAMBOO")) {
!name.startsWith("BAMBOO") &&
!name.startsWith("PALE_OAK")) {

unknownWoodTypes.add(woodName);
}
Expand All @@ -78,7 +79,7 @@ public class LegacyUtil {

if (!unknownWoodTypes.isEmpty()) {
P.p.log("New wood types detected. Assigning recipe numbers:");
int lastKnownNumber = 12;
int lastKnownNumber = 13;
for (int i = 0; i < unknownWoodTypes.size(); i++) {
P.p.log(" " + unknownWoodTypes.get(i) + ": " + (i + lastKnownNumber));
}
Expand Down Expand Up @@ -241,10 +242,12 @@ public static byte getWoodType(Block wood) throws NoSuchFieldError, NoClassDefFo
return 10;
} else if (material.startsWith("BAMBOO")) {
return 11;
} else if (material.startsWith("PALE_OAK")) {
return 12;
} else if (!UNKNOWN_WOOD.isEmpty()) {
for (int i = 0; i < UNKNOWN_WOOD.size(); i++) {
if (material.startsWith(UNKNOWN_WOOD.get(i))) {
return (byte) (i + 12);
return (byte) (i + 13);
}
}
return 0;
Expand Down
Loading