Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2025-02-26 15:21:22 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Using most recent double evaluator

Browse Source
This commit is contained in:
Jules 2023-04-15 14:35:41 +02:00
parent 99e893801d
commit ebe041d8d5
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MMOItems-API/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>MMOItems</artifactId> <artifactId>MMOItems</artifactId>
<groupId>net.Indyuce</groupId> <groupId>net.Indyuce</groupId>
<version>6.9.3-SNAPSHOT</version> <version>6.9.4-SNAPSHOT</version>
</parent> </parent>
<packaging>jar</packaging> <packaging>jar</packaging>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

9
MMOItems-API/src/main/java/net/Indyuce/mmoitems/api/item/build/LoreBuilder.java
View File

@ -1,8 +1,8 @@
package net.Indyuce.mmoitems.api.item.build; package net.Indyuce.mmoitems.api.item.build;
import bsh.EvalError;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import io.lumine.mythic.lib.MythicLib; import io.lumine.mythic.lib.MythicLib;
import io.lumine.mythic.lib.parser.client.eval.DoubleEvaluator;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -154,13 +154,12 @@ public class LoreBuilder {
for (String string : lore) { for (String string : lore) {
index++; index++;
String match = StringUtils.substringBetween(string, "MATH%", "%"); String match = StringUtils.substringBetween(string, "MATH%", "%");
if (match == null) if (match == null) continue;
continue;
String result; String result;
try { try {
result = MythicLib.plugin.getMMOConfig().decimals.format(new DoubleEvaluator().evaluate(match)); result = MythicLib.plugin.getMMOConfig().decimals.format((double) MythicLib.plugin.getInterpreter().eval(match));
} catch (RuntimeException ignored) { } catch (Exception ignored) {
result = "<InvalidFormula>"; result = "<InvalidFormula>";
} }
lore.set(index, string.replaceAll("MATH\\%[^%]*\\%", result)); lore.set(index, string.replaceAll("MATH\\%[^%]*\\%", result));

4
MMOItems-Dist/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>MMOItems</artifactId> <artifactId>MMOItems</artifactId>
<groupId>net.Indyuce</groupId> <groupId>net.Indyuce</groupId>
<version>6.9.3-SNAPSHOT</version> <version>6.9.4-SNAPSHOT</version>
</parent> </parent>
<packaging>jar</packaging> <packaging>jar</packaging>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -30,7 +30,7 @@
<dependency> <dependency>
<groupId>net.Indyuce</groupId> <groupId>net.Indyuce</groupId>
<artifactId>MMOItems-API</artifactId> <artifactId>MMOItems-API</artifactId>
<version>6.9.3-SNAPSHOT</version> <version>6.9.4-SNAPSHOT</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
</dependencies> </dependencies>

4
pom.xml
View File

@ -5,7 +5,7 @@
<groupId>net.Indyuce</groupId> <groupId>net.Indyuce</groupId>
<artifactId>MMOItems</artifactId> <artifactId>MMOItems</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>6.9.3-SNAPSHOT</version> <version>6.9.4-SNAPSHOT</version>
<modules> <modules>
<module>MMOItems-API</module> <module>MMOItems-API</module>
@ -57,7 +57,7 @@
<dependency> <dependency>
<groupId>io.lumine</groupId> <groupId>io.lumine</groupId>
<artifactId>MythicLib-dist</artifactId> <artifactId>MythicLib-dist</artifactId>
<version>1.5.1-SNAPSHOT</version> <version>1.6-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- Jetbrains Annotations --> <!-- Jetbrains Annotations -->