added cooldown to llama spit wanf

BlockTypers · Feb 11, 2017 · a3351e3 · a3351e3
1 parent a2917c2
commit a3351e3
Show file tree

Hide file tree

Showing 24 changed files with 256 additions and 259 deletions.
diff --git a/pom.xml b/pom.xml
@@ -49,7 +49,7 @@
 		<dependency>
 			<groupId>com.blocktyper</groupId>
 			<artifactId>blocktyperplugin</artifactId>
-			<version>1.2.0</version>
+			<version>1.2.1</version>
 			<scope>compile</scope>
 		</dependency>
 

diff --git a/src/main/java/com/blocktyper/yearmarked/ConfigKey.java b/src/main/java/com/blocktyper/yearmarked/ConfigKey.java
@@ -72,7 +72,12 @@ public enum ConfigKey {
 	HOLOGRAPHIC_DISPLAYS_SHOW_DAY_CHANGE_MESSAGE("yearmarked-show-holograms-on-day-change"),
 
 	//MISC
-	SHOW_JOIN_MESSAGE("yearmarked-show-join-message");
+	SHOW_JOIN_MESSAGE("yearmarked-show-join-message"),
+
+
+	//Llama spit wand
+	LLAMA_SPIT_WAND_COOL_DOWN("yearmarked-llama-spit-wand.cool-down-sec");
+	;
 
 
 	private String key;

diff --git a/src/main/java/com/blocktyper/yearmarked/LocalizedMessage.java b/src/main/java/com/blocktyper/yearmarked/LocalizedMessage.java
@@ -45,6 +45,10 @@ public enum LocalizedMessage {
 	DESCRIPTION_FISHFRYDAY("yearmarked-fishfrytag-description"), 
 	DESCRIPTION_DIAMONDAY("yearmarked-diamonday-description"), 
 	DESCRIPTION_FEATHERSDAY("yearmarked-feathersday-description"),
+
+	MARKET_DAY("yearmarked-market-day"),
+	NOT_MARKET_DAY("yearmarked-not-market-day"),
+	SOLD_OUT("yearmarked-sold-out"),
 
 	MONSOONDAY("yearmarked-monsoonday"), 
 	EARTHDAY("yearmarked-earthday"), 

diff --git a/src/main/java/com/blocktyper/yearmarked/YearmarkedListenerBase.java b/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_0.BlockTyperListener;
-import com.blocktyper.v1_2_0.nbt.NBTItem;
+import com.blocktyper.v1_2_1.BlockTyperListener;
+import com.blocktyper.v1_2_1.nbt.NBTItem;
 import com.blocktyper.yearmarked.items.YMRecipe;
 
 public abstract class YearmarkedListenerBase extends BlockTyperListener {

diff --git a/src/main/java/com/blocktyper/yearmarked/YearmarkedListenerRegistrar.java b/src/main/java/com/blocktyper/yearmarked/YearmarkedListenerRegistrar.java
@@ -1,6 +1,6 @@
 package com.blocktyper.yearmarked;
 
-import com.blocktyper.v1_2_0.BlockTyperUtility;
+import com.blocktyper.v1_2_1.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;

diff --git a/src/main/java/com/blocktyper/yearmarked/YearmarkedPlugin.java b/src/main/java/com/blocktyper/yearmarked/YearmarkedPlugin.java
@@ -9,8 +9,8 @@
 
 import org.bukkit.scheduler.BukkitRunnable;
 
-import com.blocktyper.v1_2_0.BlockTyperBasePlugin;
-import com.blocktyper.v1_2_0.recipes.IRecipe;
+import com.blocktyper.v1_2_1.BlockTyperBasePlugin;
+import com.blocktyper.v1_2_1.recipes.IRecipe;
 import com.blocktyper.yearmarked.commands.YmCommand;
 import com.blocktyper.yearmarked.days.listeners.earthday.EarthdayListener;
 import com.blocktyper.yearmarked.monitors.HolographicDisplayMonitor;

diff --git a/src/main/java/com/blocktyper/yearmarked/days/listeners/DataMigrationListener_2_0_0.java b/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_0.nbt.NBTItem;
+import com.blocktyper.v1_2_1.nbt.NBTItem;
 import com.blocktyper.yearmarked.YearmarkedListenerBase;
 import com.blocktyper.yearmarked.YearmarkedPlugin;
 import com.blocktyper.yearmarked.days.listeners.earthday.EarthdayListener;

diff --git a/src/main/java/com/blocktyper/yearmarked/days/listeners/donnerstag/DonnerstagUtils.java b/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_0.BlockTyperUtility;
+import com.blocktyper.v1_2_1.BlockTyperUtility;
 import com.blocktyper.yearmarked.ConfigKey;
 import com.blocktyper.yearmarked.YearmarkedListenerBase;
 import com.blocktyper.yearmarked.YearmarkedPlugin;

diff --git a/src/main/java/com/blocktyper/yearmarked/days/listeners/earthday/EarthdayListener.java b/src/main/java/com/blocktyper/yearmarked/days/listeners/earthday/EarthdayListener.java
@@ -41,9 +41,9 @@
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
-import com.blocktyper.v1_2_0.nbt.NBTItem;
-import com.blocktyper.v1_2_0.recipes.AbstractBlockTyperRecipe;
-import com.blocktyper.v1_2_0.recipes.BlockTyperRecipe;
+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.yearmarked.ConfigKey;
 import com.blocktyper.yearmarked.LocalizedMessage;
 import com.blocktyper.yearmarked.YearmarkedListenerBase;

diff --git a/.../java/com/blocktyper/yearmarked/days/listeners/special/SpecialDaysListenersRegistrar.java b/.../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_0.BlockTyperUtility;
+import com.blocktyper.v1_2_1.BlockTyperUtility;
 import com.blocktyper.yearmarked.YearmarkedPlugin;
 import com.blocktyper.yearmarked.days.listeners.special.marketday.MarketDayListener;