Upstream
/
boosCooldowns
mirror of https://github.com/LordBoos/boosCooldowns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update for 1.14.4

This commit is contained in:
boosik 2019-07-22 08:54:55 +02:00
parent 3d1cfe7a79
commit db7ac245bf
8 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -4,3 +4,6 @@
/.classpath
/.project
/.settings/
/plugin/target/
/.idea/
/jar/target/

2
jar/pom.xml
View File

@ -25,7 +25,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.6</version>
<version>3.0.0</version>
<executions>
<execution>
<id>package-all</id>

9
plugin/pom.xml
View File

@ -23,25 +23,26 @@
<dependency> <!-- Spigot (this includes Spigot API, Bukkit API, Craftbukkit and NMS) -->
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>1.12-R0.1-SNAPSHOT</version>
<version>${minecraft.version}-${bukkit.version}-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<version>1.12-R0.1-SNAPSHOT</version>
<version>${minecraft.version}-${bukkit.version}-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.milkbowl.vault</groupId>
<artifactId>Vault</artifactId>
<version>1.6.6</version>
<version>LATEST</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.black_ixx</groupId>
<artifactId>PlayerPoints</artifactId>
<version>2.1.3</version>
<version>LATEST</version>
</dependency>
</dependencies>
<build>

4
plugin/src/main/java/com/coloredcarrot/mcapi/json/JSONHoverAction.java
View File

@ -255,9 +255,9 @@ public interface JSONHoverAction<T> {
int size = value.getItemMeta().getEnchants().keySet().size();
for (Enchantment ench : value.getItemMeta().getEnchants().keySet()) {
if (i + 1 == size) {
value2 += "{lvl:" + value.getItemMeta().getEnchants().get(ench) + "s,id:" + ench.getId() + "s}";
value2 += "{lvl:" + value.getItemMeta().getEnchants().get(ench) + "s,id:" + ench.getKey() + "s}";
} else {
value2 += "{lvl:" + value.getItemMeta().getEnchants().get(ench) + "s,id:" + ench.getId() + "s},";
value2 += "{lvl:" + value.getItemMeta().getEnchants().get(ench) + "s,id:" + ench.getKey() + "s},";
}
i++;
}

2
plugin/src/main/java/cz/boosik/boosCooldown/BoosCoolDownListener.java
View File

@ -187,7 +187,7 @@ public class BoosCoolDownListener implements Listener {
}
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
@EventHandler(priority = EventPriority.HIGHEST)
private void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
Player player = event.getPlayer();
UUID uuid = player.getUniqueId();

23
plugin/src/main/java/cz/boosik/boosCooldown/Listeners/BoosSignInteractListener.java
View File

@ -28,8 +28,27 @@ public class BoosSignInteractListener implements Listener {
}
if (event.hasBlock() && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
if (event.getClickedBlock().getType() == Material.SIGN_POST
|| event.getClickedBlock().getType() == Material.WALL_SIGN) {
if (event.getClickedBlock().getType() == Material.LEGACY_SIGN
|| event.getClickedBlock().getType() == Material.LEGACY_SIGN_POST
|| event.getClickedBlock().getType() == Material.LEGACY_WALL_SIGN
|| event.getClickedBlock().getType() == Material.ACACIA_SIGN
|| event.getClickedBlock().getType() == Material.ACACIA_WALL_SIGN
|| event.getClickedBlock().getType() == Material.DARK_OAK_SIGN
|| event.getClickedBlock().getType() == Material.DARK_OAK_WALL_SIGN
|| event.getClickedBlock().getType() == Material.JUNGLE_SIGN
|| event.getClickedBlock().getType() == Material.JUNGLE_WALL_SIGN
|| event.getClickedBlock().getType() == Material.OAK_SIGN
|| event.getClickedBlock().getType() == Material.OAK_WALL_SIGN
|| event.getClickedBlock().getType() == Material.SPRUCE_SIGN
|| event.getClickedBlock().getType() == Material.SPRUCE_WALL_SIGN
|| event.getClickedBlock().getType() == Material.BIRCH_SIGN
|| event.getClickedBlock().getType() == Material.BIRCH_WALL_SIGN) {
Sign s = (Sign) event.getClickedBlock().getState();
String line1 = s.getLine(0);
String line2 = s.getLine(1);

2
plugin/src/main/resources/plugin.yml
View File

@ -1,6 +1,6 @@
name: boosCooldowns
main: cz.boosik.boosCooldown.BoosCoolDown
version: 3.14.3
version: 3.14.5
authors: [LordBoos (boosik)]
softdepend: [Vault, PlayerPoints]
description: >

6
pom.xml
View File

@ -11,12 +11,12 @@
<packaging>pom</packaging>
<url>http://maven.apache.org</url>
<properties>
<boosCooldowns.version>3.14.3</boosCooldowns.version>
<boosCooldowns.version>3.14.5</boosCooldowns.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<minecraft.version>1.12</minecraft.version>
<minecraft.version>1.14.2</minecraft.version>
<bukkit.version>R0.1</bukkit.version>
<bukkit.packet>v1_12_R1</bukkit.packet>
<bukkit.packet>v1_14_R1</bukkit.packet>
</properties>
<pluginRepositories>
<pluginRepository>