mirror of
https://github.com/songoda/EpicEnchants.git
synced 2024-09-28 23:57:33 +02:00
Support 1.17
This commit is contained in:
parent
bba7394942
commit
423ae8977e
11
pom.xml
11
pom.xml
@ -41,7 +41,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-shade-plugin</artifactId>
|
<artifactId>maven-shade-plugin</artifactId>
|
||||||
<version>3.1.0</version>
|
<version>3.3.0-SNAPSHOT</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>shaded</id>
|
<id>shaded</id>
|
||||||
@ -74,7 +74,12 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
<pluginRepositories>
|
||||||
|
<pluginRepository>
|
||||||
|
<id>apache.snapshots</id>
|
||||||
|
<url>https://repository.apache.org/snapshots/</url>
|
||||||
|
</pluginRepository>
|
||||||
|
</pluginRepositories>
|
||||||
<repositories>
|
<repositories>
|
||||||
<repository>
|
<repository>
|
||||||
<id>public</id>
|
<id>public</id>
|
||||||
@ -90,7 +95,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.spigotmc</groupId>
|
<groupId>org.spigotmc</groupId>
|
||||||
<artifactId>spigot</artifactId>
|
<artifactId>spigot</artifactId>
|
||||||
<version>1.16.4</version>
|
<version>1.17</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
package com.songoda.epicenchants.utils.single;
|
package com.songoda.epicenchants.utils.single;
|
||||||
|
|
||||||
|
import com.songoda.core.math.MathUtils;
|
||||||
import com.songoda.epicenchants.enums.EnchantResult;
|
import com.songoda.epicenchants.enums.EnchantResult;
|
||||||
import com.songoda.epicenchants.enums.TriggerType;
|
import com.songoda.epicenchants.enums.TriggerType;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.configuration.ConfigurationSection;
|
import org.bukkit.configuration.ConfigurationSection;
|
||||||
@ -14,9 +14,6 @@ import org.bukkit.event.player.PlayerInteractEvent;
|
|||||||
import org.bukkit.inventory.EquipmentSlot;
|
import org.bukkit.inventory.EquipmentSlot;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
import javax.script.ScriptEngine;
|
|
||||||
import javax.script.ScriptEngineManager;
|
|
||||||
import javax.script.ScriptException;
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -25,7 +22,6 @@ import java.util.concurrent.ThreadLocalRandom;
|
|||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
public class GeneralUtils {
|
public class GeneralUtils {
|
||||||
private static final ScriptEngine SCRIPT_ENGINE = new ScriptEngineManager().getEngineByName("JavaScript");
|
|
||||||
|
|
||||||
public static boolean chance(int chance) {
|
public static boolean chance(int chance) {
|
||||||
return chance((double) chance);
|
return chance((double) chance);
|
||||||
@ -72,10 +68,10 @@ public class GeneralUtils {
|
|||||||
|
|
||||||
public static ItemStack getHeldItem(LivingEntity entity, Event event) {
|
public static ItemStack getHeldItem(LivingEntity entity, Event event) {
|
||||||
if (entity instanceof Player) {
|
if (entity instanceof Player) {
|
||||||
Player player = (Player)entity;
|
Player player = (Player) entity;
|
||||||
int slot = getHeldItemSlot(player, event);
|
int slot = getHeldItemSlot(player, event);
|
||||||
return player.getInventory().getItem(slot);
|
return player.getInventory().getItem(slot);
|
||||||
} else if (entity.getEquipment() != null){
|
} else if (entity.getEquipment() != null) {
|
||||||
ItemStack item = entity.getEquipment().getItemInHand();
|
ItemStack item = entity.getEquipment().getItemInHand();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@ -90,7 +86,7 @@ public class GeneralUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static int getHeldItemSlot(Player entity, Event event) {
|
public static int getHeldItemSlot(Player entity, Event event) {
|
||||||
Player player = (Player)entity;
|
Player player = (Player) entity;
|
||||||
int slot = player.getInventory().getHeldItemSlot();
|
int slot = player.getInventory().getHeldItemSlot();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@ -104,12 +100,7 @@ public class GeneralUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static Object parseJS(String toParse, String type, Object def) {
|
public static Object parseJS(String toParse, String type, Object def) {
|
||||||
try {
|
return MathUtils.eval("[EpicEnchants] One of your " + type + " expressions is not properly formatted.", toParse);
|
||||||
return SCRIPT_ENGINE.eval(toParse);
|
|
||||||
} catch (ScriptException e) {
|
|
||||||
Bukkit.getLogger().warning("[EpicEnchants] One of your " + type + " expressions is not properly formatted.");
|
|
||||||
Bukkit.getLogger().warning(toParse);
|
|
||||||
return def;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user