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

RecipeController class is an instance manager.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-05-01 23:41:15 +00:00
parent 6de03faace
commit e1a85ab007
114 changed files with 296 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java vendored
View File

@@ -16,8 +16,8 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.gameserver.RecipeController;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -57,6 +57,6 @@ public class OpenCommonRecipeBook extends AbstractEffect
return;
}
RecipeController.getInstance().requestBookOpen(player, false);
RecipeManager.getInstance().requestBookOpen(player, false);
}
}

4
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java vendored
View File

@@ -16,8 +16,8 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.gameserver.RecipeController;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -57,6 +57,6 @@ public class OpenDwarfRecipeBook extends AbstractEffect
return;
}
RecipeController.getInstance().requestBookOpen(player, true);
RecipeManager.getInstance().requestBookOpen(player, true);
}
}

14
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/RecipeController.java → L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java
View File

@@ -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 org.l2jmobius.gameserver;
package org.l2jmobius.gameserver.instancemanager;
import java.util.ArrayList;
import java.util.List;
@@ -54,11 +54,11 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
import org.l2jmobius.gameserver.util.Util;
public class RecipeController
public class RecipeManager
{
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
protected RecipeController()
protected RecipeManager()
{
// Prevent external initialization.
}
@@ -78,7 +78,7 @@ public class RecipeController
public void requestMakeItemAbort(PlayerInstance player)
{
_activeMakers.remove(player.getObjectId()); // TODO: anything else here?
_activeMakers.remove(player.getObjectId());
}
public void requestManufactureItem(PlayerInstance manufacturer, int recipeListId, PlayerInstance player)
@@ -341,7 +341,7 @@ public class RecipeController
{
_delay = (int) (Config.ALT_GAME_CREATION_SPEED * _player.getStat().getReuseTime(_skill) * GameTimeTaskManager.TICKS_PER_SECOND * GameTimeTaskManager.MILLIS_IN_TICK);
// FIXME: please fix this packet to show crafting animation (somebody)
// TODO: Fix this packet to show crafting animation?
final MagicSkillUse msk = new MagicSkillUse(_player, _skillId, _skillLevel, _delay, 0);
_player.broadcastPacket(msk);
@@ -755,13 +755,13 @@ public class RecipeController
}
}
public static RecipeController getInstance()
public static RecipeManager getInstance()
{
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final RecipeController INSTANCE = new RecipeController();
protected static final RecipeManager INSTANCE = new RecipeManager();
}
}

4
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -54,7 +54,6 @@ import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.LoginServerThread;
import org.l2jmobius.gameserver.RecipeController;
import org.l2jmobius.gameserver.ai.CreatureAI;
import org.l2jmobius.gameserver.ai.CreatureAI.IntentionCommand;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@@ -130,6 +129,7 @@ import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
import org.l2jmobius.gameserver.instancemanager.MentorManager;
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager;
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
import org.l2jmobius.gameserver.instancemanager.SellBuffsManager;
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
@@ -10908,7 +10908,7 @@ public class PlayerInstance extends Playable
// Stop crafting, if in progress
try
{
RecipeController.getInstance().requestMakeItemAbort(this);
RecipeManager.getInstance().requestMakeItemAbort(this);
}
catch (Exception e)
{

4
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
View File

@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.RecipeController;
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -54,6 +54,6 @@ public class RequestRecipeBookOpen implements IClientIncomingPacket
return;
}
RecipeController.getInstance().requestBookOpen(player, _isDwarvenCraft);
RecipeManager.getInstance().requestBookOpen(player, _isDwarvenCraft);
}
}

4
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java
View File

@@ -17,8 +17,8 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.RecipeController;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.GameClient;
@@ -62,6 +62,6 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket
return;
}
RecipeController.getInstance().requestMakeItem(player, _id);
RecipeManager.getInstance().requestMakeItem(player, _id);
}
}

4
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java
View File

@@ -17,8 +17,8 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.RecipeController;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.GameClient;
@@ -86,7 +86,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket
}
if (Util.checkIfInRange(150, player, manufacturer, true))
{
RecipeController.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
RecipeManager.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
}
}
}