RecipeController class is an instance manager.
This commit is contained in:
		@@ -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);
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -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,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.
 | 
			
		||||
	}
 | 
			
		||||
@@ -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();
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -53,7 +53,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;
 | 
			
		||||
@@ -126,6 +125,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;
 | 
			
		||||
@@ -10830,7 +10830,7 @@ public class PlayerInstance extends Playable
 | 
			
		||||
		// Stop crafting, if in progress
 | 
			
		||||
		try
 | 
			
		||||
		{
 | 
			
		||||
			RecipeController.getInstance().requestMakeItemAbort(this);
 | 
			
		||||
			RecipeManager.getInstance().requestMakeItemAbort(this);
 | 
			
		||||
		}
 | 
			
		||||
		catch (Exception e)
 | 
			
		||||
		{
 | 
			
		||||
 
 | 
			
		||||
@@ -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);
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -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);
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -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);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user