lore suffix only with recipe

DieReicheErethons · Oct 30, 2023 · 9ccacd5 · 9ccacd5
1 parent 1665047
commit 9ccacd5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -38,8 +38,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.10.1</version>
 				<configuration>
-					<source>1.17</source>
-					<target>1.17</target>
+					<source>17</source>
+					<target>17</target>
 					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>

diff --git a/src/com/dre/brewery/lore/BrewLore.java b/src/com/dre/brewery/lore/BrewLore.java
@@ -148,10 +148,12 @@ public void updateCookLore(boolean qualityColor) {
 	public void updateDistillLore(boolean qualityColor) {
 		if (brew.getDistillRuns() <= 0) return;
 		String prefix;
+		String suffix = "";
 		byte distillRuns = brew.getDistillRuns();
-		int quality = brew.getIngredients().getDistillQuality(brew.getCurrentRecipe(), distillRuns);
 		if (qualityColor && !brew.isUnlabeled() && brew.hasRecipe()) {
+			int quality = brew.getIngredients().getDistillQuality(brew.getCurrentRecipe(), distillRuns);
 			prefix = getQualityColor(quality);
+			suffix = " " + getQualityIcon(quality);
 		} else {
 			prefix = "§7";
 		}
@@ -161,9 +163,9 @@ public void updateDistillLore(boolean qualityColor) {
 			}
 		}
 		if (brew.isUnlabeled() && brew.hasRecipe() && distillRuns < brew.getCurrentRecipe().getDistillRuns()) {
-			addOrReplaceLore(Type.DISTILL, prefix, P.p.languageReader.get("Brew_LessDistilled"), " " + getQualityIcon(quality));
+			addOrReplaceLore(Type.DISTILL, prefix, P.p.languageReader.get("Brew_LessDistilled"), suffix);
 		} else {
-			addOrReplaceLore(Type.DISTILL, prefix, P.p.languageReader.get("Brew_Distilled"), " " + getQualityIcon(quality));
+			addOrReplaceLore(Type.DISTILL, prefix, P.p.languageReader.get("Brew_Distilled"), suffix);
 		}
 	}
 
@@ -175,10 +177,12 @@ public void updateDistillLore(boolean qualityColor) {
 	public void updateAgeLore(boolean qualityColor) {
 		if (brew.isStripped()) return;
 		String prefix;
+		String suffix = "";
 		float age = brew.getAgeTime();
-		int quality = brew.getIngredients().getAgeQuality(brew.getCurrentRecipe(), age);
 		if (qualityColor && !brew.isUnlabeled() && brew.hasRecipe()) {
+			int quality = brew.getIngredients().getAgeQuality(brew.getCurrentRecipe(), age);
 			prefix = getQualityColor(quality);
+			suffix = " " + getQualityIcon(quality);
 		} else {
 			prefix = "§7";
 		}
@@ -191,7 +195,7 @@ public void updateAgeLore(boolean qualityColor) {
 				prefix = prefix + P.p.languageReader.get("Brew_HundredsOfYears") + " ";
 			}
 		}
-		addOrReplaceLore(Type.AGE, prefix, P.p.languageReader.get("Brew_BarrelRiped"), " " + getQualityIcon(quality));
+		addOrReplaceLore(Type.AGE, prefix, P.p.languageReader.get("Brew_BarrelRiped"), suffix);
 	}
 
 	/**