From 9ea064a0f63890e62d1eaac78d2bfa69f94f28ba Mon Sep 17 00:00:00 2001 From: Draww Date: Sat, 10 Feb 2018 09:23:20 +0300 Subject: [PATCH] Version 1.3.5 (update to script system) Mathematical expressions and Else action included to script system --- ...org_bukkit_bukkit_1_12_2_R0_1_SNAPSHOT.xml | 6 +- ...igotmc_spigot_api_1_12_2_R0_1_SNAPSHOT.xml | 6 +- .idea/workspace.xml | 335 +++++++----------- pom.xml | 2 +- .../drawwdev/raffle/utils/ScriptSystem.java | 79 ++++- .../raffle/utils/arithmeticExpression.java | 87 +++++ src/main/resources/custom.yml | 5 +- src/main/resources/plugin.yml | 2 +- target/classes/custom.yml | 5 +- target/classes/plugin.yml | 2 +- target/maven-archiver/pom.properties | 4 +- .../compile/default-compile/createdFiles.lst | 2 + 12 files changed, 300 insertions(+), 235 deletions(-) create mode 100644 src/main/java/com/drawwdev/raffle/utils/arithmeticExpression.java diff --git a/.idea/libraries/Maven__org_bukkit_bukkit_1_12_2_R0_1_SNAPSHOT.xml b/.idea/libraries/Maven__org_bukkit_bukkit_1_12_2_R0_1_SNAPSHOT.xml index f4dac9a..209a168 100644 --- a/.idea/libraries/Maven__org_bukkit_bukkit_1_12_2_R0_1_SNAPSHOT.xml +++ b/.idea/libraries/Maven__org_bukkit_bukkit_1_12_2_R0_1_SNAPSHOT.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_spigotmc_spigot_api_1_12_2_R0_1_SNAPSHOT.xml b/.idea/libraries/Maven__org_spigotmc_spigot_api_1_12_2_R0_1_SNAPSHOT.xml index 7f23a80..38230b5 100644 --- a/.idea/libraries/Maven__org_spigotmc_spigot_api_1_12_2_R0_1_SNAPSHOT.xml +++ b/.idea/libraries/Maven__org_spigotmc_spigot_api_1_12_2_R0_1_SNAPSHOT.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 53899bf..39ac3e4 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,14 +2,16 @@ + + - - - - - + + + + + @@ -28,41 +30,31 @@ - - + + - - + + - - - - - - - - - - - - + + - - + + - - + + - - + + @@ -71,51 +63,31 @@ - - + + - - - - - - - - - - - - - - - - - - - - - + - + - - + + - - + + - - + + @@ -147,9 +119,11 @@ ret setPlace setPlaceholders + action = math(action).toString(); return true; + action = math(action); @@ -161,6 +135,9 @@ + + + @@ -168,9 +145,6 @@ - - - @@ -303,9 +278,8 @@ - - + @@ -346,7 +320,16 @@ - + + + + + + + + + + @@ -359,7 +342,8 @@