mirror of
https://github.com/PikaMug/Quests.git
synced 2024-11-26 12:46:18 +01:00
Update for MC 1.13, tested. Bump version number
This commit is contained in:
parent
53cb3c6b10
commit
fc494bad75
9
pom.xml
9
pom.xml
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
<groupId>me.blackvein.quests</groupId>
|
<groupId>me.blackvein.quests</groupId>
|
||||||
<artifactId>quests</artifactId>
|
<artifactId>quests</artifactId>
|
||||||
<version>3.3.5</version>
|
<version>3.3.6</version>
|
||||||
<name>quests</name>
|
<name>quests</name>
|
||||||
<url>https://github.com/FlyingPikachu/Quests/</url>
|
<url>https://github.com/FlyingPikachu/Quests/</url>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
@ -39,6 +39,13 @@
|
|||||||
</repository>
|
</repository>
|
||||||
</repositories>
|
</repositories>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.bukkit</groupId>
|
||||||
|
<artifactId>bukkit113</artifactId>
|
||||||
|
<version>1.13-R0.1-SNAPSHOT</version>
|
||||||
|
<scope>system</scope>
|
||||||
|
<systemPath>${project.basedir}/lib/craftbukkit-1.13.jar</systemPath>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.bukkit</groupId>
|
<groupId>org.bukkit</groupId>
|
||||||
<artifactId>bukkit112</artifactId>
|
<artifactId>bukkit112</artifactId>
|
||||||
|
@ -176,7 +176,7 @@ public class NpcEffectThread implements Runnable {
|
|||||||
try {
|
try {
|
||||||
Eff_1_13_R1.valueOf(effectType.toUpperCase()).sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null);
|
Eff_1_13_R1.valueOf(effectType.toUpperCase()).sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
plugin.getInstance().getLogger().info(effectType + " is not a valid effect name!");
|
plugin.getLogger().info(effectType + " is not a valid effect name!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -268,7 +268,7 @@ public class NpcEffectThread implements Runnable {
|
|||||||
try {
|
try {
|
||||||
Eff_1_12_R1.valueOf(effectType.toUpperCase()).sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null);
|
Eff_1_12_R1.valueOf(effectType.toUpperCase()).sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
plugin.getInstance().getLogger().info(effectType + " is not a valid effect name!");
|
plugin.getLogger().info(effectType + " is not a valid effect name!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -185,6 +185,7 @@ public class PlayerListener implements Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("deprecation") // since 1.13
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onPlayerInteract(PlayerInteractEvent evt) {
|
public void onPlayerInteract(PlayerInteractEvent evt) {
|
||||||
if (plugin.checkQuester(evt.getPlayer().getUniqueId()) == false) {
|
if (plugin.checkQuester(evt.getPlayer().getUniqueId()) == false) {
|
||||||
@ -354,6 +355,7 @@ public class PlayerListener implements Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("deprecation") // since 1.13
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onBlockDamage(BlockDamageEvent evt) {
|
public void onBlockDamage(BlockDamageEvent evt) {
|
||||||
if (plugin.checkQuester(evt.getPlayer().getUniqueId()) == false) {
|
if (plugin.checkQuester(evt.getPlayer().getUniqueId()) == false) {
|
||||||
@ -367,6 +369,7 @@ public class PlayerListener implements Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("deprecation") // since 1.13
|
||||||
@EventHandler(priority = EventPriority.HIGHEST)
|
@EventHandler(priority = EventPriority.HIGHEST)
|
||||||
public void onBlockPlace(BlockPlaceEvent evt) {
|
public void onBlockPlace(BlockPlaceEvent evt) {
|
||||||
if (plugin.checkQuester(evt.getPlayer().getUniqueId()) == false) {
|
if (plugin.checkQuester(evt.getPlayer().getUniqueId()) == false) {
|
||||||
|
@ -1593,6 +1593,7 @@ public class Quester {
|
|||||||
return prettyString;
|
return prettyString;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("deprecation") // since 1.13
|
||||||
public static String enchantmentString(Enchantment e) {
|
public static String enchantmentString(Enchantment e) {
|
||||||
try {
|
try {
|
||||||
return (Lang.get("ENCHANTMENT_" + e.getName()));
|
return (Lang.get("ENCHANTMENT_" + e.getName()));
|
||||||
|
@ -43,6 +43,7 @@ import java.util.logging.Level;
|
|||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
|
import org.bukkit.Color;
|
||||||
import org.bukkit.DyeColor;
|
import org.bukkit.DyeColor;
|
||||||
import org.bukkit.Effect;
|
import org.bukkit.Effect;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
@ -3118,7 +3119,8 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
|
|||||||
} else if (color.equalsIgnoreCase("Red")) {
|
} else if (color.equalsIgnoreCase("Red")) {
|
||||||
oStage.sheepToShear.put(DyeColor.RED, shearAmounts.get(sheep.indexOf(color)));
|
oStage.sheepToShear.put(DyeColor.RED, shearAmounts.get(sheep.indexOf(color)));
|
||||||
} else if (color.equalsIgnoreCase("Silver")) {
|
} else if (color.equalsIgnoreCase("Silver")) {
|
||||||
oStage.sheepToShear.put(DyeColor.SILVER, shearAmounts.get(sheep.indexOf(color)));
|
// 1.13 changed DyeColor.SILVER -> DyeColor.LIGHT_GRAY
|
||||||
|
oStage.sheepToShear.put(DyeColor.getByColor(Color.SILVER), shearAmounts.get(sheep.indexOf(color)));
|
||||||
} else if (color.equalsIgnoreCase("White")) {
|
} else if (color.equalsIgnoreCase("White")) {
|
||||||
oStage.sheepToShear.put(DyeColor.WHITE, shearAmounts.get(sheep.indexOf(color)));
|
oStage.sheepToShear.put(DyeColor.WHITE, shearAmounts.get(sheep.indexOf(color)));
|
||||||
} else if (color.equalsIgnoreCase("Yellow")) {
|
} else if (color.equalsIgnoreCase("Yellow")) {
|
||||||
@ -3874,6 +3876,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
|
|||||||
return count - subtract;
|
return count - subtract;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("deprecation") // since 1.13
|
||||||
public static Enchantment getEnchantment(String enchant) {
|
public static Enchantment getEnchantment(String enchant) {
|
||||||
String ench = Lang.getKey(enchant.replaceAll(" ", ""));
|
String ench = Lang.getKey(enchant.replaceAll(" ", ""));
|
||||||
ench = ench.replace("ENCHANTMENT_", "");
|
ench = ench.replace("ENCHANTMENT_", "");
|
||||||
@ -3981,8 +3984,9 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
|
|||||||
return DyeColor.PURPLE;
|
return DyeColor.PURPLE;
|
||||||
} else if (s.equalsIgnoreCase("Red")) {
|
} else if (s.equalsIgnoreCase("Red")) {
|
||||||
return DyeColor.RED;
|
return DyeColor.RED;
|
||||||
|
// 1.13 changed DyeColor.SILVER -> DyeColor.LIGHT_GRAY
|
||||||
} else if (s.equalsIgnoreCase("Silver")) {
|
} else if (s.equalsIgnoreCase("Silver")) {
|
||||||
return DyeColor.SILVER;
|
return DyeColor.getByColor(Color.SILVER);
|
||||||
} else if (s.equalsIgnoreCase("White")) {
|
} else if (s.equalsIgnoreCase("White")) {
|
||||||
return DyeColor.WHITE;
|
return DyeColor.WHITE;
|
||||||
} else if (s.equalsIgnoreCase("Yellow")) {
|
} else if (s.equalsIgnoreCase("Yellow")) {
|
||||||
|
Loading…
Reference in New Issue
Block a user