lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Completed the Daily Mission refactoring.

Browse Source
This commit is contained in:
MobiusDev
2016-06-22 17:59:06 +00:00
parent 2f84c5a864
commit e30ee3af6c
24 changed files with 242 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
trunk/java/com/l2jmobius/gameserver/handler/AbstractOneDayRewardHandler.java → trunk/java/com/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
View File

@@ -26,29 +26,29 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import com.l2jmobius.commons.database.DatabaseFactory;
import com.l2jmobius.gameserver.enums.OneDayRewardStatus;
import com.l2jmobius.gameserver.model.OneDayRewardDataHolder;
import com.l2jmobius.gameserver.model.OneDayRewardPlayerEntry;
import com.l2jmobius.gameserver.enums.DailyMissionStatus;
import com.l2jmobius.gameserver.model.DailyMissionDataHolder;
import com.l2jmobius.gameserver.model.DailyMissionPlayerEntry;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.events.ListenersContainer;
/**
* @author Sdw
*/
public abstract class AbstractOneDayRewardHandler extends ListenersContainer
public abstract class AbstractDailyMissionHandler extends ListenersContainer
{
protected Logger LOGGER = Logger.getLogger(getClass().getName());
private final Map<Integer, OneDayRewardPlayerEntry> _entries = new ConcurrentHashMap<>();
private final OneDayRewardDataHolder _holder;
private final Map<Integer, DailyMissionPlayerEntry> _entries = new ConcurrentHashMap<>();
private final DailyMissionDataHolder _holder;
protected AbstractOneDayRewardHandler(OneDayRewardDataHolder holder)
protected AbstractDailyMissionHandler(DailyMissionDataHolder holder)
{
_holder = holder;
init();
}
public OneDayRewardDataHolder getHolder()
public DailyMissionDataHolder getHolder()
{
return _holder;
}
@@ -59,13 +59,13 @@ public abstract class AbstractOneDayRewardHandler extends ListenersContainer
public int getStatus(L2PcInstance player)
{
final OneDayRewardPlayerEntry entry = getPlayerEntry(player.getObjectId(), false);
return entry != null ? entry.getStatus().getClientId() : OneDayRewardStatus.NOT_AVAILABLE.getClientId();
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), false);
return entry != null ? entry.getStatus().getClientId() : DailyMissionStatus.NOT_AVAILABLE.getClientId();
}
public int getProgress(L2PcInstance player)
{
final OneDayRewardPlayerEntry entry = getPlayerEntry(player.getObjectId(), false);
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), false);
return entry != null ? entry.getProgress() : 0;
}
@@ -75,7 +75,7 @@ public abstract class AbstractOneDayRewardHandler extends ListenersContainer
PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = ?"))
{
ps.setInt(1, _holder.getId());
ps.setInt(2, OneDayRewardStatus.COMPLETED.getClientId());
ps.setInt(2, DailyMissionStatus.COMPLETED.getClientId());
ps.execute();
}
catch (SQLException e)
@@ -94,8 +94,8 @@ public abstract class AbstractOneDayRewardHandler extends ListenersContainer
{
giveRewards(player);
final OneDayRewardPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
entry.setStatus(OneDayRewardStatus.COMPLETED);
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
entry.setStatus(DailyMissionStatus.COMPLETED);
entry.setLastCompleted(System.currentTimeMillis());
storePlayerEntry(entry);
@@ -109,7 +109,7 @@ public abstract class AbstractOneDayRewardHandler extends ListenersContainer
_holder.getRewards().forEach(i -> player.addItem("One Day Reward", i, player, true));
}
protected void storePlayerEntry(OneDayRewardPlayerEntry entry)
protected void storePlayerEntry(DailyMissionPlayerEntry entry)
{
try (Connection con = DatabaseFactory.getInstance().getConnection();
PreparedStatement ps = con.prepareStatement("REPLACE INTO character_daily_rewards (charId, rewardId, status, progress, lastCompleted) VALUES (?, ?, ?, ?, ?)"))
@@ -130,9 +130,9 @@ public abstract class AbstractOneDayRewardHandler extends ListenersContainer
}
}
protected OneDayRewardPlayerEntry getPlayerEntry(int objectId, boolean createIfNone)
protected DailyMissionPlayerEntry getPlayerEntry(int objectId, boolean createIfNone)
{
final OneDayRewardPlayerEntry existingEntry = _entries.get(objectId);
final DailyMissionPlayerEntry existingEntry = _entries.get(objectId);
if (existingEntry != null)
{
return existingEntry;
@@ -147,7 +147,7 @@ public abstract class AbstractOneDayRewardHandler extends ListenersContainer
{
if (rs.next())
{
final OneDayRewardPlayerEntry entry = new OneDayRewardPlayerEntry(rs.getInt("charId"), rs.getInt("rewardId"), rs.getInt("status"), rs.getInt("progress"), rs.getLong("lastCompleted"));
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(rs.getInt("charId"), rs.getInt("rewardId"), rs.getInt("status"), rs.getInt("progress"), rs.getLong("lastCompleted"));
_entries.put(objectId, entry);
}
}
@@ -159,7 +159,7 @@ public abstract class AbstractOneDayRewardHandler extends ListenersContainer
if (createIfNone)
{
final OneDayRewardPlayerEntry entry = new OneDayRewardPlayerEntry(objectId, _holder.getId());
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId());
_entries.put(objectId, entry);
return entry;
}

18
trunk/java/com/l2jmobius/gameserver/handler/OneDayRewardHandler.java → trunk/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
View File

@@ -20,22 +20,22 @@ import java.util.HashMap;
import java.util.Map;
import java.util.function.Function;
import com.l2jmobius.gameserver.model.OneDayRewardDataHolder;
import com.l2jmobius.gameserver.model.DailyMissionDataHolder;
import com.l2jmobius.gameserver.scripting.ScriptEngineManager;
/**
* @author Sdw
*/
public class OneDayRewardHandler
public class DailyMissionHandler
{
private final Map<String, Function<OneDayRewardDataHolder, AbstractOneDayRewardHandler>> _handlerFactories = new HashMap<>();
private final Map<String, Function<DailyMissionDataHolder, AbstractDailyMissionHandler>> _handlerFactories = new HashMap<>();
public void registerHandler(String name, Function<OneDayRewardDataHolder, AbstractOneDayRewardHandler> handlerFactory)
public void registerHandler(String name, Function<DailyMissionDataHolder, AbstractDailyMissionHandler> handlerFactory)
{
_handlerFactories.put(name, handlerFactory);
}
public Function<OneDayRewardDataHolder, AbstractOneDayRewardHandler> getHandler(String name)
public Function<DailyMissionDataHolder, AbstractDailyMissionHandler> getHandler(String name)
{
return _handlerFactories.get(name);
}
@@ -50,21 +50,21 @@ public class OneDayRewardHandler
try
{
ScriptEngineManager.getInstance().executeOneDayRewardMasterHandler();
ScriptEngineManager.getInstance().executeDailyMissionMasterHandler();
}
catch (Exception e)
{
throw new Error("Problems while running OneDayRewardMasterHandler", e);
throw new Error("Problems while running DailyMissionMasterHandler", e);
}
}
public static OneDayRewardHandler getInstance()
public static DailyMissionHandler getInstance()
{
return SingletonHolder._instance;
}
private static class SingletonHolder
{
protected static final OneDayRewardHandler _instance = new OneDayRewardHandler();
protected static final DailyMissionHandler _instance = new DailyMissionHandler();
}
}