Broad packages refactor

Added macro update when using SP reset.
Refactored several packages containing general classes.
Fixed "worker" nomenclature in class methods misleadingly denoting "task".
This commit is contained in:
ronancpl
2019-09-20 22:41:19 -03:00
parent 181573dc74
commit eae6dccbc0
253 changed files with 867 additions and 538 deletions

View File

@@ -66,9 +66,9 @@ import client.inventory.MapleInventoryType;
import client.inventory.MaplePet;
import client.inventory.ModifyInventory;
import client.inventory.manipulator.MapleInventoryManipulator;
import constants.GameConstants;
import constants.ItemConstants;
import constants.ServerConstants;
import constants.game.GameConstants;
import constants.inventory.ItemConstants;
import constants.net.ServerConstants;
import server.MapleMarriage;
import server.expeditions.MapleExpeditionBossLog;
import server.life.MapleNPC;

View File

@@ -29,7 +29,7 @@ import java.io.IOException;
import javax.script.*;
import constants.ServerConstants;
import constants.net.ServerConstants;
import jdk.nashorn.api.scripting.NashornScriptEngine;
import tools.FilePrinter;

View File

@@ -51,8 +51,8 @@ import server.maps.MapleReactor;
import client.MapleCharacter;
import client.SkillFactory;
import client.Skill;
import constants.ItemConstants;
import constants.ServerConstants;
import constants.inventory.ItemConstants;
import constants.net.ServerConstants;
import java.awt.Point;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -60,9 +60,9 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.server.coordinator.MapleEventRecallCoordinator;
import net.server.coordinator.world.MapleEventRecallCoordinator;
import scripting.AbstractPlayerInteraction;
import scripting.event.worker.EventScriptScheduler;
import scripting.event.scheduler.EventScriptScheduler;
import server.MapleItemInformationProvider;
import server.ThreadManager;
import server.life.MapleLifeFactory;

View File

@@ -34,8 +34,8 @@ import java.util.logging.Logger;
import javax.script.ScriptException;
import constants.ServerConstants;
import constants.GameConstants;
import constants.net.ServerConstants;
import constants.game.GameConstants;
import client.MapleCharacter;
import net.server.Server;
import net.server.world.World;
@@ -43,7 +43,7 @@ import net.server.channel.Channel;
import net.server.guild.MapleGuild;
import net.server.world.MapleParty;
import net.server.world.MaplePartyCharacter;
import scripting.event.worker.EventScriptScheduler;
import scripting.event.scheduler.EventScriptScheduler;
import server.MapleMarriage;
import server.expeditions.MapleExpedition;
import server.maps.MapleMap;
@@ -925,7 +925,7 @@ public class EventManager {
}
private void fillEimQueue() {
ThreadManager.getInstance().newTask(new EventManagerWorker()); //call new thread to fill up readied instances queue
ThreadManager.getInstance().newTask(new EventManagerTask()); //call new thread to fill up readied instances queue
}
private EventInstanceManager getReadyInstance() {
@@ -974,7 +974,7 @@ public class EventManager {
instantiateQueuedInstance(); // keep filling the queue until reach threshold.
}
private class EventManagerWorker implements Runnable {
private class EventManagerTask implements Runnable {
@Override
public void run() {

View File

@@ -19,7 +19,7 @@
*/
package scripting.event;
import scripting.event.worker.EventScriptScheduler;
import scripting.event.scheduler.EventScriptScheduler;
/**
*

View File

@@ -17,10 +17,9 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package scripting.event.worker;
package scripting.event.scheduler;
import config.YamlConfig;
import constants.ServerConstants;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;

View File

@@ -25,7 +25,6 @@ import java.io.File;
import java.sql.SQLException;
import config.YamlConfig;
import constants.ServerConstants;
import net.server.Server;
import net.server.guild.MapleAlliance;
import net.server.guild.MapleGuild;
@@ -58,9 +57,9 @@ import client.SkillFactory;
import client.inventory.Item;
import client.inventory.ItemFactory;
import client.inventory.MaplePet;
import constants.GameConstants;
import constants.ItemConstants;
import constants.LanguageConstants;
import constants.game.GameConstants;
import constants.inventory.ItemConstants;
import constants.string.LanguageConstants;
import net.server.PlayerStorage;
import net.server.channel.Channel;
import net.server.coordinator.matchchecker.MatchCheckerListenerFactory.MatchCheckerType;

View File

@@ -29,7 +29,7 @@ import jdk.nashorn.api.scripting.NashornScriptEngine;
import scripting.AbstractScriptManager;
import server.quest.MapleQuest;
import tools.FilePrinter;
import constants.GameConstants;
import constants.game.GameConstants;
import client.MapleClient;
import client.MapleQuestStatus;

View File

@@ -27,8 +27,7 @@ import client.inventory.Equip;
import client.inventory.Item;
import client.inventory.MapleInventoryType;
import config.YamlConfig;
import constants.ItemConstants;
import constants.ServerConstants;
import constants.inventory.ItemConstants;
import java.awt.Point;
import java.util.ArrayList;
import java.util.Collections;