Fix Lore order when converting & 1.8 Regeneration

DieReicheErethons · Dec 13, 2019 · 9afeae7 · 9afeae7
1 parent 214bb52
commit 9afeae7
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 35 deletions.
diff --git a/pom.xml b/pom.xml
@@ -97,11 +97,6 @@
 			<id>brewery-repo</id>
 			<url>https://zebradrive.de/maven/</url>
 		</repository>
-		<repository>
-			<!-- Citadel -->
-			<id>devoted-repo</id>
-			<url>https://build.devotedmc.com/plugin/repository/everything/</url>
-		</repository>
 		<repository>
 			<!-- bStats -->
 			<id>CodeMC</id>
@@ -113,7 +108,7 @@
 		<dependency>
 			<groupId>org.bukkit</groupId>
 			<artifactId>bukkit</artifactId>
-			<version>1.14.4-R0.1-SNAPSHOT</version>
+			<version>1.15-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 			<exclusions>
 				<exclusion>
@@ -132,30 +127,6 @@
 			<version>1.6</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>vg.civcraft.mc.citadel</groupId>
-			<artifactId>Citadel</artifactId>
-			<version>3.9.1</version>
-			<scope>provided</scope>
-			<exclusions>
-				<exclusion>
-					<artifactId>*</artifactId>
-					<groupId>*</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>vg.civcraft.mc.civmodcore</groupId>
-			<artifactId>CivModCore</artifactId>
-			<version>1.6.0</version>
-			<scope>provided</scope>
-			<exclusions>
-				<exclusion>
-					<artifactId>*</artifactId>
-					<groupId>*</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 		<dependency>
 			<groupId>com.sk89q</groupId>
 			<artifactId>worldguard</artifactId>

diff --git a/resources/config/v13/de/config.yml b/resources/config/v13/de/config.yml
@@ -510,6 +510,7 @@ recipes:
     alcohol: 14
     lore:
       - + &8Viel zu sauer
+      - +++ Guter Apfelschnaps
 
   whiskey:
     name: Unschöner Whiskey/Whiskey/Scotch Whiskey

diff --git a/resources/config/v13/en/config.yml b/resources/config/v13/en/config.yml
@@ -509,6 +509,7 @@ recipes:
     alcohol: 14
     lore:
       - +Sour like Acid
+      - +++ Good Apple Liquor
 
   whiskey:
     name: Unsightly Whiskey/Whiskey/Scotch Whiskey

diff --git a/resources/config/v13/fr/config.yml b/resources/config/v13/fr/config.yml
@@ -516,6 +516,7 @@ recipes:
     alcohol: 14
     lore:
       - +Sour like Acid
+      - +++ Good Apple Liquor
 
   whiskey:
     name: Whisky disgracieux/Whiskey/Scotch Whiskey

diff --git a/resources/config/v13/it/config.yml b/resources/config/v13/it/config.yml
@@ -509,6 +509,7 @@ recipes:
     alcohol: 14
     lore:
       - +Sour like Acid
+      - +++ Good Apple Liquor
 
   whiskey:
     name: Unsightly Whiskey/Whiskey/Scotch Whiskey

diff --git a/resources/config/v13/zh/config.yml b/resources/config/v13/zh/config.yml
@@ -513,6 +513,7 @@ recipes:
     alcohol: 14
     lore:
       - +Sour like Acid
+      - +++ Good Apple Liquor
 
   whiskey:
     name: Unsightly Whiskey/Whiskey/Scotch Whiskey

diff --git a/src/com/dre/brewery/lore/BrewLore.java b/src/com/dre/brewery/lore/BrewLore.java
@@ -304,15 +304,17 @@ public void convertLore(boolean toQuality) {
  	 */
 	public int addOrReplaceLore(Type type, String prefix, String line) {
 		int index = type.findInLore(lore);
-		if (index == -1) {
-			index = BUtil.indexOfSubstring(lore, line);
-		}
 		if (index > -1) {
 			lore.set(index, type.id + prefix + line);
 			return index;
-		} else {
-			return addLore(type, prefix, line);
 		}
+
+		// Could not find Lore by type, find and replace by substring
+		index = BUtil.indexOfSubstring(lore, line);
+		if (index > -1) {
+			lore.remove(index);
+		}
+		return addLore(type, prefix, line);
 	}
 
 	/**

diff --git a/src/com/dre/brewery/recipe/PotionColor.java b/src/com/dre/brewery/recipe/PotionColor.java
@@ -6,6 +6,7 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.PotionMeta;
 import org.bukkit.potion.PotionData;
+import org.bukkit.potion.PotionEffectType;
 import org.bukkit.potion.PotionType;
 
 public class PotionColor {
@@ -75,6 +76,8 @@ public void colorBrew(PotionMeta meta, ItemStack potion, boolean destillable) {
 			}
 		} else {
 			potion.setDurability(getColorId(destillable));
+			// To stop 1.8 from showing the potioneffect for the color id, add a dummy Effect
+			meta.addCustomEffect(PotionEffectType.REGENERATION.createEffect(0, 0), true);
 		}
 	}