updated to spigot version 1.12.2-R0.1-SNAPSHOT and blocktyper version…

… 1.2.4

install.sh

@@ -2,3 +2,4 @@
 mvn clean install
 #rm -rf $MCS/plugins/Yearmarked
 cp target/*dependencies.jar $MCS/plugins/Yearmarked.jar
+echo $

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.blocktyper</groupId>
 	<artifactId>yearmarked</artifactId>
-	<version>2.0.3</version>
+	<version>2.0.4</version>
 	<name>Yearmarked</name>
 
 	<properties>
@@ -28,28 +28,14 @@
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.11.2-R0.1-SNAPSHOT</version>
+			<version>1.12.2-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
-		<!--Bukkit API -->
-		<dependency>
-			<groupId>org.bukkit</groupId>
-			<artifactId>bukkit</artifactId>
-			<version>1.11.2-R0.1-SNAPSHOT</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.blocktyper.localehelper</groupId>
-			<artifactId>localehelper</artifactId>
-			<version>1.0.0</version>
-			<scope>compile</scope>
-		</dependency>
 
 		<dependency>
 			<groupId>com.blocktyper</groupId>
 			<artifactId>blocktyperplugin</artifactId>
-			<version>1.2.1</version>
+			<version>1.2.4</version>
 			<scope>compile</scope>
 		</dependency>
 

src/main/java/com/blocktyper/yearmarked/YearmarkedListenerBase.java

@@ -7,8 +7,8 @@
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-import com.blocktyper.v1_2_1.BlockTyperListener;
-import com.blocktyper.v1_2_1.nbt.NBTItem;
+import com.blocktyper.v1_2_4.BlockTyperListener;
+import com.blocktyper.v1_2_4.nbt.NBTItem;
 import com.blocktyper.yearmarked.items.YMRecipe;
 
 public abstract class YearmarkedListenerBase extends BlockTyperListener {

src/main/java/com/blocktyper/yearmarked/YearmarkedListenerRegistrar.java

@@ -1,6 +1,6 @@
 package com.blocktyper.yearmarked;
 
-import com.blocktyper.v1_2_1.BlockTyperUtility;
+import com.blocktyper.v1_2_4.BlockTyperUtility;
 import com.blocktyper.yearmarked.days.listeners.DataMigrationListener_2_0_0;
 import com.blocktyper.yearmarked.days.listeners.SendDayInfoListener;
 import com.blocktyper.yearmarked.days.listeners.diamonday.DiamondayListener;

src/main/java/com/blocktyper/yearmarked/YearmarkedPlugin.java

@@ -11,8 +11,8 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import com.blocktyper.v1_2_1.BlockTyperBasePlugin;
-import com.blocktyper.v1_2_1.recipes.IRecipe;
+import com.blocktyper.v1_2_4.BlockTyperBasePlugin;
+import com.blocktyper.v1_2_4.recipes.IRecipe;
 import com.blocktyper.yearmarked.commands.YmCommand;
 import com.blocktyper.yearmarked.days.listeners.earthday.EarthdayListener;
 import com.blocktyper.yearmarked.items.YMRecipe;

src/main/java/com/blocktyper/yearmarked/days/listeners/DataMigrationListener_2_0_0.java

@@ -7,7 +7,7 @@
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.inventory.ItemStack;
 
-import com.blocktyper.v1_2_1.nbt.NBTItem;
+import com.blocktyper.v1_2_4.nbt.NBTItem;
 import com.blocktyper.yearmarked.YearmarkedListenerBase;
 import com.blocktyper.yearmarked.YearmarkedPlugin;
 import com.blocktyper.yearmarked.days.listeners.earthday.EarthdayListener;

src/main/java/com/blocktyper/yearmarked/days/listeners/donnerstag/DonnerstagUtils.java

@@ -19,7 +19,7 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import com.blocktyper.v1_2_1.BlockTyperUtility;
+import com.blocktyper.v1_2_4.BlockTyperUtility;
 import com.blocktyper.yearmarked.ConfigKey;
 import com.blocktyper.yearmarked.YearmarkedListenerBase;
 import com.blocktyper.yearmarked.YearmarkedPlugin;

src/main/java/com/blocktyper/yearmarked/days/listeners/earthday/EarthdayListener.java

@@ -40,9 +40,9 @@
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
-import com.blocktyper.v1_2_1.nbt.NBTItem;
-import com.blocktyper.v1_2_1.recipes.AbstractBlockTyperRecipe;
-import com.blocktyper.v1_2_1.recipes.BlockTyperRecipe;
+import com.blocktyper.v1_2_4.nbt.NBTItem;
+import com.blocktyper.v1_2_4.recipes.AbstractBlockTyperRecipe;
+import com.blocktyper.v1_2_4.recipes.BlockTyperRecipe;
 import com.blocktyper.yearmarked.ConfigKey;
 import com.blocktyper.yearmarked.LocalizedMessage;
 import com.blocktyper.yearmarked.YearmarkedListenerBase;

src/main/java/com/blocktyper/yearmarked/days/listeners/special/SpecialDaysListenersRegistrar.java

@@ -1,6 +1,6 @@
 package com.blocktyper.yearmarked.days.listeners.special;
 
-import com.blocktyper.v1_2_1.BlockTyperUtility;
+import com.blocktyper.v1_2_4.BlockTyperUtility;
 import com.blocktyper.yearmarked.YearmarkedPlugin;
 import com.blocktyper.yearmarked.days.listeners.special.marketday.MarketDayListener;
 

src/main/java/com/blocktyper/yearmarked/items/SpecialItemsListenersRegistrar.java

@@ -1,6 +1,6 @@
 package com.blocktyper.yearmarked.items;
 
-import com.blocktyper.v1_2_1.BlockTyperUtility;
+import com.blocktyper.v1_2_4.BlockTyperUtility;
 import com.blocktyper.yearmarked.YearmarkedPlugin;
 import com.blocktyper.yearmarked.items.listeners.LlamaSpitListener;
 

src/main/java/com/blocktyper/yearmarked/items/listeners/LlamaSpitListener.java

@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.blocktyper.v1_2_4.helpers.InvisHelper;
 import org.bukkit.Location;
 import org.bukkit.Sound;
 import org.bukkit.World;
@@ -17,8 +18,8 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
-import com.blocktyper.v1_2_1.IBlockTyperPlugin;
-import com.blocktyper.v1_2_1.helpers.InvisibleLoreHelper;
+import com.blocktyper.v1_2_4.IBlockTyperPlugin;
+import com.blocktyper.v1_2_4.helpers.InvisHelper;
 import com.blocktyper.yearmarked.ConfigKey;
 import com.blocktyper.yearmarked.YearmarkedListenerBase;
 import com.blocktyper.yearmarked.YearmarkedPlugin;
@@ -68,11 +69,11 @@ private void spit(Player player, PlayerDropItemEvent event) {
 		}
 
 		int rounds = 0;
-		List<String> spitRoundLore = InvisibleLoreHelper.getInvisibleLore(wand, ROUNDS_INVIS_LORE_KEY);
+		List<String> spitRoundLore = InvisHelper.getInvisibleLore(wand, ROUNDS_INVIS_LORE_KEY);
 		if (spitRoundLore != null && !spitRoundLore.isEmpty()) {
 			for (String loreLine : spitRoundLore) {
 				loreLine = loreLine == null ? ""
-						: InvisibleLoreHelper.convertToVisibleString(loreLine).replace(ROUNDS_INVIS_LORE_KEY, "");
+						: InvisHelper.convertToVisibleString(loreLine).replace(ROUNDS_INVIS_LORE_KEY, "");
 				if (loreLine.startsWith("[") && loreLine.endsWith("]")) {
 					loreLine = loreLine.replace("[", "");
 					loreLine = loreLine.replace("]", "");
@@ -112,8 +113,8 @@ public static ItemStack initSpitRounds(ItemStack wand, IBlockTyperPlugin plugin)
 
 	public static ItemStack setSpitRounds(ItemStack wand, int rounds) {
 		ItemMeta itemMeta = wand.getItemMeta();
-		List<String> lore = InvisibleLoreHelper.removeLoreWithInvisibleKey(wand, ROUNDS_INVIS_LORE_KEY);
-		lore.add(InvisibleLoreHelper.convertToInvisibleString(ROUNDS_INVIS_LORE_KEY) + "[" + rounds + "]");
+		List<String> lore = InvisHelper.removeLoreWithInvisibleKey(wand, ROUNDS_INVIS_LORE_KEY);
+		lore.add(InvisHelper.convertToInvisibleString(ROUNDS_INVIS_LORE_KEY) + "[" + rounds + "]");
 		itemMeta.setLore(lore);
 		wand.setItemMeta(itemMeta);
 		return wand;