From f7e55354668fe22ebd03eb49ef2bb5a8fbe8e04e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9D=8F=E9=BB=91?= Date: Wed, 2 Oct 2019 15:15:49 +0800 Subject: [PATCH] + fix materials --- build.gradle | 2 +- src/main/scala/io/izzel/taboolib/TabooLib.java | 4 ++++ src/main/scala/io/izzel/taboolib/util/lite/Materials.java | 2 -- src/main/scala/io/izzel/taboolib/util/lite/Numbers.java | 4 ++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 30f9d81..06b4b69 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { } group = 'me.skymc' -version = '5.06' +version = '5.07' sourceCompatibility = 1.8 targetCompatibility = 1.8 diff --git a/src/main/scala/io/izzel/taboolib/TabooLib.java b/src/main/scala/io/izzel/taboolib/TabooLib.java index 1b0522b..1357223 100644 --- a/src/main/scala/io/izzel/taboolib/TabooLib.java +++ b/src/main/scala/io/izzel/taboolib/TabooLib.java @@ -30,6 +30,10 @@ import java.util.concurrent.Executors; @Dependency(maven = "com.zaxxer:HikariCP:3.1.0", url = "https://skymc.oss-cn-shanghai.aliyuncs.com/libs/com.zaxxer-HikariCP-3.1.0.jar") @Dependency(maven = "org.scala-lang:scala-library:2.12.8", url = "https://skymc.oss-cn-shanghai.aliyuncs.com/libs/scala-library-2.12.8.jar") @Dependency(maven = "org:kotlinlang:kotlin-stdlib:1.3.50", url = "https://skymc.oss-cn-shanghai.aliyuncs.com/libs/kotlin-stdlib-1.3.50.jar") +@Dependency(maven = "org:kotlinlang:kotlin-stdlib-jdk7:1.3.50", url = "https://skymc.oss-cn-shanghai.aliyuncs.com/libs/kotlin-stdlib-jdk7.jar") +@Dependency(maven = "org:kotlinlang:kotlin-stdlib-jdk8:1.3.50", url = "https://skymc.oss-cn-shanghai.aliyuncs.com/libs/kotlin-stdlib-jdk8.jar") +@Dependency(maven = "org:kotlinlang:kotlin-reflect:1.3.50", url = "https://skymc.oss-cn-shanghai.aliyuncs.com/libs/kotlin-reflect.jar") +@Dependency(maven = "org:kotlinlang:kotlin-test:1.3.50", url = "https://skymc.oss-cn-shanghai.aliyuncs.com/libs/kotlin-test.jar") @Dependency(maven = "com.google.inject:guice:4.2.2", url = "https://skymc.oss-cn-shanghai.aliyuncs.com/libs/guice-4.2.2.jar") public class TabooLib { diff --git a/src/main/scala/io/izzel/taboolib/util/lite/Materials.java b/src/main/scala/io/izzel/taboolib/util/lite/Materials.java index d776edb..f5bd98e 100644 --- a/src/main/scala/io/izzel/taboolib/util/lite/Materials.java +++ b/src/main/scala/io/izzel/taboolib/util/lite/Materials.java @@ -25,7 +25,6 @@ package io.izzel.taboolib.util.lite; -import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; @@ -1150,7 +1149,6 @@ public enum Materials { * @return a Materials from the enum (with the same legacy name and data if in older versions.) */ public static Materials matchMaterials(String name, byte data) { - Validate.notEmpty(name, "Material name cannot be null or empty"); name = format(name); if ((contains(name) && data <= 0) && (isNewVersion() || !isDuplicated(name))) { diff --git a/src/main/scala/io/izzel/taboolib/util/lite/Numbers.java b/src/main/scala/io/izzel/taboolib/util/lite/Numbers.java index caec533..72e28ad 100644 --- a/src/main/scala/io/izzel/taboolib/util/lite/Numbers.java +++ b/src/main/scala/io/izzel/taboolib/util/lite/Numbers.java @@ -12,6 +12,10 @@ public class Numbers { private static Random random = new Random(); private static DecimalFormat doubleFormat = new DecimalFormat("#.##"); + public static boolean random(double v) { + return random.nextDouble() <= v; + } + public static Random getRandom() { return random; }