From 97ad66256a3cdb95b5f32556191ea09b0d1533e6 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 7 Aug 2017 23:11:55 +0000
Subject: [PATCH] Moved cron4j to gameserver util package.

---
 .../gameserver/model/eventengine/EventScheduler.java          | 4 ++--
 .../eventengine => util}/cron4j/AlwaysTrueValueMatcher.java   | 2 +-
 .../gameserver/util}/cron4j/DayOfMonthValueMatcher.java       | 2 +-
 .../gameserver/util}/cron4j/IntArrayValueMatcher.java         | 2 +-
 .../gameserver/util}/cron4j/InvalidPatternException.java      | 2 +-
 .../{model/eventengine => util}/cron4j/PastPredictor.java     | 2 +-
 .../java/com/l2jmobius/gameserver/util}/cron4j/Predictor.java | 2 +-
 .../{model/eventengine => util}/cron4j/SchedulingPattern.java | 2 +-
 .../com/l2jmobius/gameserver/util}/cron4j/ValueMatcher.java   | 2 +-
 .../gameserver/model/eventengine/EventScheduler.java          | 4 ++--
 .../gameserver/util}/cron4j/AlwaysTrueValueMatcher.java       | 2 +-
 .../gameserver/util}/cron4j/DayOfMonthValueMatcher.java       | 2 +-
 .../gameserver/util}/cron4j/IntArrayValueMatcher.java         | 2 +-
 .../gameserver/util}/cron4j/InvalidPatternException.java      | 2 +-
 .../{model/eventengine => util}/cron4j/PastPredictor.java     | 2 +-
 .../java/com/l2jmobius/gameserver/util}/cron4j/Predictor.java | 2 +-
 .../{model/eventengine => util}/cron4j/SchedulingPattern.java | 2 +-
 .../com/l2jmobius/gameserver/util}/cron4j/ValueMatcher.java   | 2 +-
 .../gameserver/model/eventengine/EventScheduler.java          | 4 ++--
 .../gameserver/util}/cron4j/AlwaysTrueValueMatcher.java       | 2 +-
 .../eventengine => util}/cron4j/DayOfMonthValueMatcher.java   | 2 +-
 .../gameserver/util}/cron4j/IntArrayValueMatcher.java         | 2 +-
 .../gameserver/util}/cron4j/InvalidPatternException.java      | 2 +-
 .../{model/eventengine => util}/cron4j/PastPredictor.java     | 2 +-
 .../java/com/l2jmobius/gameserver/util}/cron4j/Predictor.java | 2 +-
 .../{model/eventengine => util}/cron4j/SchedulingPattern.java | 2 +-
 .../com/l2jmobius/gameserver/util}/cron4j/ValueMatcher.java   | 2 +-
 27 files changed, 30 insertions(+), 30 deletions(-)
 rename L2J_Mobius_Classic/java/com/l2jmobius/gameserver/{model/eventengine => util}/cron4j/AlwaysTrueValueMatcher.java (91%)
 rename {L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine => L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util}/cron4j/DayOfMonthValueMatcher.java (93%)
 rename {L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine => L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util}/cron4j/IntArrayValueMatcher.java (93%)
 rename {L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine => L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util}/cron4j/InvalidPatternException.java (91%)
 rename L2J_Mobius_Classic/java/com/l2jmobius/gameserver/{model/eventengine => util}/cron4j/PastPredictor.java (95%)
 rename {L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine => L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util}/cron4j/Predictor.java (95%)
 rename L2J_Mobius_Classic/java/com/l2jmobius/gameserver/{model/eventengine => util}/cron4j/SchedulingPattern.java (96%)
 rename {L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine => L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util}/cron4j/ValueMatcher.java (92%)
 rename {L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine => L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util}/cron4j/AlwaysTrueValueMatcher.java (91%)
 rename {L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine => L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util}/cron4j/DayOfMonthValueMatcher.java (93%)
 rename {L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine => L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util}/cron4j/IntArrayValueMatcher.java (93%)
 rename {L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine => L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util}/cron4j/InvalidPatternException.java (91%)
 rename L2J_Mobius_Helios/java/com/l2jmobius/gameserver/{model/eventengine => util}/cron4j/PastPredictor.java (99%)
 rename {L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine => L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util}/cron4j/Predictor.java (95%)
 rename L2J_Mobius_Helios/java/com/l2jmobius/gameserver/{model/eventengine => util}/cron4j/SchedulingPattern.java (96%)
 rename {L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine => L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util}/cron4j/ValueMatcher.java (92%)
 rename {L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine => L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util}/cron4j/AlwaysTrueValueMatcher.java (91%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/{model/eventengine => util}/cron4j/DayOfMonthValueMatcher.java (93%)
 rename {L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine => L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util}/cron4j/IntArrayValueMatcher.java (93%)
 rename {L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine => L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util}/cron4j/InvalidPatternException.java (91%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/{model/eventengine => util}/cron4j/PastPredictor.java (95%)
 rename {L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine => L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util}/cron4j/Predictor.java (95%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/{model/eventengine => util}/cron4j/SchedulingPattern.java (96%)
 rename {L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine => L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util}/cron4j/ValueMatcher.java (92%)

diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java
index 0b5150b65c..fdc58c3301 100644
--- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java
+++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java
@@ -29,8 +29,8 @@ import java.util.logging.Logger;
 import com.l2jmobius.commons.database.DatabaseFactory;
 import com.l2jmobius.gameserver.ThreadPoolManager;
 import com.l2jmobius.gameserver.model.StatsSet;
-import com.l2jmobius.gameserver.model.eventengine.cron4j.PastPredictor;
-import com.l2jmobius.gameserver.model.eventengine.cron4j.Predictor;
+import com.l2jmobius.gameserver.util.cron4j.PastPredictor;
+import com.l2jmobius.gameserver.util.cron4j.Predictor;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/AlwaysTrueValueMatcher.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/AlwaysTrueValueMatcher.java
similarity index 91%
rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/AlwaysTrueValueMatcher.java
rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/AlwaysTrueValueMatcher.java
index 019b26acd8..a2a358fda8 100644
--- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/AlwaysTrueValueMatcher.java
+++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/AlwaysTrueValueMatcher.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 /**
  * This ValueMatcher always returns true!
diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/DayOfMonthValueMatcher.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java
similarity index 93%
rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/DayOfMonthValueMatcher.java
rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java
index 366dc5d999..202fca092c 100644
--- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/DayOfMonthValueMatcher.java
+++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 import java.util.ArrayList;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/IntArrayValueMatcher.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/IntArrayValueMatcher.java
similarity index 93%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/IntArrayValueMatcher.java
rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/IntArrayValueMatcher.java
index 247cd635ba..4c443f7947 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/IntArrayValueMatcher.java
+++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/IntArrayValueMatcher.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 import java.util.ArrayList;
 
diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/InvalidPatternException.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/InvalidPatternException.java
similarity index 91%
rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/InvalidPatternException.java
rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/InvalidPatternException.java
index cc716b1613..a661f16dc6 100644
--- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/InvalidPatternException.java
+++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/InvalidPatternException.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 /**
  * <p>
diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/PastPredictor.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/PastPredictor.java
similarity index 95%
rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/PastPredictor.java
rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/PastPredictor.java
index ab734ae3ad..ba3ee28825 100644
--- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/PastPredictor.java
+++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/PastPredictor.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 import java.util.Calendar;
 import java.util.Date;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/Predictor.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/Predictor.java
similarity index 95%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/Predictor.java
rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/Predictor.java
index 6f9d77fef4..c1495d7d6a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/Predictor.java
+++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/Predictor.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 import java.util.Calendar;
 import java.util.Date;
diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/SchedulingPattern.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java
similarity index 96%
rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/SchedulingPattern.java
rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java
index 63c4a4b687..d4c8eaaa86 100644
--- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/SchedulingPattern.java
+++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 import java.util.ArrayList;
 import java.util.Calendar;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/ValueMatcher.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/ValueMatcher.java
similarity index 92%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/ValueMatcher.java
rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/ValueMatcher.java
index ebbd14f043..8e7b79e0d3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/ValueMatcher.java
+++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/cron4j/ValueMatcher.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 /**
  * <p>
diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java
index 0b5150b65c..fdc58c3301 100644
--- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java
+++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java
@@ -29,8 +29,8 @@ import java.util.logging.Logger;
 import com.l2jmobius.commons.database.DatabaseFactory;
 import com.l2jmobius.gameserver.ThreadPoolManager;
 import com.l2jmobius.gameserver.model.StatsSet;
-import com.l2jmobius.gameserver.model.eventengine.cron4j.PastPredictor;
-import com.l2jmobius.gameserver.model.eventengine.cron4j.Predictor;
+import com.l2jmobius.gameserver.util.cron4j.PastPredictor;
+import com.l2jmobius.gameserver.util.cron4j.Predictor;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/AlwaysTrueValueMatcher.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/AlwaysTrueValueMatcher.java
similarity index 91%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/AlwaysTrueValueMatcher.java
rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/AlwaysTrueValueMatcher.java
index 019b26acd8..a2a358fda8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/AlwaysTrueValueMatcher.java
+++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/AlwaysTrueValueMatcher.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 /**
  * This ValueMatcher always returns true!
diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/DayOfMonthValueMatcher.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java
similarity index 93%
rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/DayOfMonthValueMatcher.java
rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java
index 366dc5d999..202fca092c 100644
--- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/DayOfMonthValueMatcher.java
+++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 import java.util.ArrayList;
 
diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/IntArrayValueMatcher.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/IntArrayValueMatcher.java
similarity index 93%
rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/IntArrayValueMatcher.java
rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/IntArrayValueMatcher.java
index 247cd635ba..4c443f7947 100644
--- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/IntArrayValueMatcher.java
+++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/IntArrayValueMatcher.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 import java.util.ArrayList;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/InvalidPatternException.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/InvalidPatternException.java
similarity index 91%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/InvalidPatternException.java
rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/InvalidPatternException.java
index cc716b1613..a661f16dc6 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/InvalidPatternException.java
+++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/InvalidPatternException.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 /**
  * <p>
diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/PastPredictor.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/PastPredictor.java
similarity index 99%
rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/PastPredictor.java
rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/PastPredictor.java
index 3724126ba4..25e0284081 100644
--- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/PastPredictor.java
+++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/PastPredictor.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 import java.util.Calendar;
 import java.util.Date;
diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/Predictor.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/Predictor.java
similarity index 95%
rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/Predictor.java
rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/Predictor.java
index 6f9d77fef4..c1495d7d6a 100644
--- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/Predictor.java
+++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/Predictor.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 import java.util.Calendar;
 import java.util.Date;
diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/SchedulingPattern.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java
similarity index 96%
rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/SchedulingPattern.java
rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java
index 63c4a4b687..d4c8eaaa86 100644
--- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/SchedulingPattern.java
+++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 import java.util.ArrayList;
 import java.util.Calendar;
diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/ValueMatcher.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/ValueMatcher.java
similarity index 92%
rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/ValueMatcher.java
rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/ValueMatcher.java
index ebbd14f043..8e7b79e0d3 100644
--- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/ValueMatcher.java
+++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/cron4j/ValueMatcher.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 /**
  * <p>
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java
index 0b5150b65c..fdc58c3301 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java
@@ -29,8 +29,8 @@ import java.util.logging.Logger;
 import com.l2jmobius.commons.database.DatabaseFactory;
 import com.l2jmobius.gameserver.ThreadPoolManager;
 import com.l2jmobius.gameserver.model.StatsSet;
-import com.l2jmobius.gameserver.model.eventengine.cron4j.PastPredictor;
-import com.l2jmobius.gameserver.model.eventengine.cron4j.Predictor;
+import com.l2jmobius.gameserver.util.cron4j.PastPredictor;
+import com.l2jmobius.gameserver.util.cron4j.Predictor;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/AlwaysTrueValueMatcher.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/AlwaysTrueValueMatcher.java
similarity index 91%
rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/AlwaysTrueValueMatcher.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/AlwaysTrueValueMatcher.java
index 019b26acd8..a2a358fda8 100644
--- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/AlwaysTrueValueMatcher.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/AlwaysTrueValueMatcher.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 /**
  * This ValueMatcher always returns true!
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/DayOfMonthValueMatcher.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java
similarity index 93%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/DayOfMonthValueMatcher.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java
index 366dc5d999..202fca092c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/DayOfMonthValueMatcher.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 import java.util.ArrayList;
 
diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/IntArrayValueMatcher.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/IntArrayValueMatcher.java
similarity index 93%
rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/IntArrayValueMatcher.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/IntArrayValueMatcher.java
index 247cd635ba..4c443f7947 100644
--- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/IntArrayValueMatcher.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/IntArrayValueMatcher.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 import java.util.ArrayList;
 
diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/InvalidPatternException.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/InvalidPatternException.java
similarity index 91%
rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/InvalidPatternException.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/InvalidPatternException.java
index cc716b1613..a661f16dc6 100644
--- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/eventengine/cron4j/InvalidPatternException.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/InvalidPatternException.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 /**
  * <p>
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/PastPredictor.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/PastPredictor.java
similarity index 95%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/PastPredictor.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/PastPredictor.java
index ab734ae3ad..ba3ee28825 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/PastPredictor.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/PastPredictor.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 import java.util.Calendar;
 import java.util.Date;
diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/Predictor.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/Predictor.java
similarity index 95%
rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/Predictor.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/Predictor.java
index 6f9d77fef4..c1495d7d6a 100644
--- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/Predictor.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/Predictor.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 import java.util.Calendar;
 import java.util.Date;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/SchedulingPattern.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java
similarity index 96%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/SchedulingPattern.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java
index 63c4a4b687..d4c8eaaa86 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/eventengine/cron4j/SchedulingPattern.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 import java.util.ArrayList;
 import java.util.Calendar;
diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/ValueMatcher.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/ValueMatcher.java
similarity index 92%
rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/ValueMatcher.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/ValueMatcher.java
index ebbd14f043..8e7b79e0d3 100644
--- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/eventengine/cron4j/ValueMatcher.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/cron4j/ValueMatcher.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.model.eventengine.cron4j;
+package com.l2jmobius.gameserver.util.cron4j;
 
 /**
  * <p>