Merged with released L2J-Unity files.

trunk/java/com/l2jmobius/gameserver/handler/EffectHandler.java

@@ -1,83 +1,70 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * 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.handler;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.l2jmobius.gameserver.model.effects.AbstractEffect;
-import com.l2jmobius.gameserver.scripting.L2ScriptEngineManager;
-
-/**
- * @author BiggBoss, UnAfraid
- */
-public final class EffectHandler implements IHandler<Class<? extends AbstractEffect>, String>
-{
-	private final Map<String, Class<? extends AbstractEffect>> _handlers;
-	
-	protected EffectHandler()
-	{
-		_handlers = new HashMap<>();
-	}
-	
-	@Override
-	public void registerHandler(Class<? extends AbstractEffect> handler)
-	{
-		_handlers.put(handler.getSimpleName(), handler);
-	}
-	
-	@Override
-	public synchronized void removeHandler(Class<? extends AbstractEffect> handler)
-	{
-		_handlers.remove(handler.getSimpleName());
-	}
-	
-	@Override
-	public Class<? extends AbstractEffect> getHandler(String name)
-	{
-		return _handlers.get(name);
-	}
-	
-	@Override
-	public int size()
-	{
-		return _handlers.size();
-	}
-	
-	public void executeScript()
-	{
-		try
-		{
-			L2ScriptEngineManager.getInstance().executeScript(new File(L2ScriptEngineManager.SCRIPT_FOLDER, "handlers/EffectMasterHandler.java"));
-		}
-		catch (Exception e)
-		{
-			throw new Error("Problems while running EffectMansterHandler", e);
-		}
-	}
-	
-	private static final class SingletonHolder
-	{
-		protected static final EffectHandler _instance = new EffectHandler();
-	}
-	
-	public static EffectHandler getInstance()
-	{
-		return SingletonHolder._instance;
-	}
-}
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * 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.handler;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+
+import com.l2jmobius.gameserver.model.StatsSet;
+import com.l2jmobius.gameserver.model.effects.AbstractEffect;
+import com.l2jmobius.gameserver.scripting.ScriptEngineManager;
+
+/**
+ * @author BiggBoss, UnAfraid
+ */
+public final class EffectHandler
+{
+	private final Map<String, Function<StatsSet, AbstractEffect>> _effectHandlerFactories = new HashMap<>();
+	
+	public void registerHandler(String name, Function<StatsSet, AbstractEffect> handlerFactory)
+	{
+		_effectHandlerFactories.put(name, handlerFactory);
+	}
+	
+	public Function<StatsSet, AbstractEffect> getHandlerFactory(String name)
+	{
+		return _effectHandlerFactories.get(name);
+	}
+	
+	public int size()
+	{
+		return _effectHandlerFactories.size();
+	}
+	
+	public void executeScript()
+	{
+		try
+		{
+			ScriptEngineManager.getInstance().executeEffectMasterHandler();
+		}
+		catch (Exception e)
+		{
+			throw new Error("Problems while running EffectMansterHandler", e);
+		}
+	}
+	
+	private static final class SingletonHolder
+	{
+		protected static final EffectHandler _instance = new EffectHandler();
+	}
+	
+	public static EffectHandler getInstance()
+	{
+		return SingletonHolder._instance;
+	}
+}