cleanup

BreweryTeam · Sep 16, 2024 · d9c3170 · d9c3170
1 parent b5cf769
commit d9c3170
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/dev/jsinco/brewery/guis/impl/PotionRecipeEditorGui.kt b/src/main/java/dev/jsinco/brewery/guis/impl/PotionRecipeEditorGui.kt
@@ -273,7 +273,7 @@ class PotionRecipeEditorGui(recipe: BRecipe, val opener: Player) : AbstractGui()
             }
 
             ItemType.EDITOR_ALCOHOL -> {
-                recipe.alcohol = message.toIntOrNull() ?: return
+                recipe.alcohol = message.replace("%", "").trim().toIntOrNull() ?: return
             }
 
             ItemType.EDITOR_INGREDIENTS -> {
@@ -297,7 +297,7 @@ class PotionRecipeEditorGui(recipe: BRecipe, val opener: Player) : AbstractGui()
             }
 
             ItemType.EDITOR_COLOR -> {
-                recipe.color = PotionColor.fromString(message)
+                recipe.color = PotionColor.fromString(message.uppercase())
             }
 
             ItemType.EDITOR_DRINK_MESSAGE -> {

diff --git a/src/main/java/dev/jsinco/brewery/guis/util/BRecipeUtil.kt b/src/main/java/dev/jsinco/brewery/guis/util/BRecipeUtil.kt
@@ -46,12 +46,12 @@ object BRecipeUtil {
             listOf(
                 //"",  // space
                 "&#E59FE3Difficulty&7: &f${recipe.difficulty}",
-                "&#E59FE3Cook Time&7: &f${recipe.cookingTime}",
+                "&#E59FE3Cook Time&7: &f${recipe.cookingTime}m",
                 "&#E59FE3Distill Runs&7: &f${recipe.distillRuns}",
-                "&#E59FE3Distill Time&7: &f${recipe.distillTime}",
+                "&#E59FE3Distill Time&7: &f${recipe.distillTime}s",
                 "&#E59FE3Barrel Type&7: &f${woodTypeToString(recipe.wood.toInt())}",
                 "&#E59FE3Aging Amount&7: &f${recipe.age.toInt()}",
-                "&#E59FE3Alcohol&7: &f${recipe.alcohol}",
+                "&#E59FE3Alcohol&7: &f${recipe.alcohol}%",
                 "&#E59FE3Glint&7: &f${recipe.hasGlint()}",
             )
         )