diff --git a/src/games/stendhal/server/core/scripting/ScriptInJava.java b/src/games/stendhal/server/core/scripting/ScriptInJava.java index f08e34401ea..a47c93fd7df 100644 --- a/src/games/stendhal/server/core/scripting/ScriptInJava.java +++ b/src/games/stendhal/server/core/scripting/ScriptInJava.java @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2003-2023 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -22,6 +22,7 @@ import org.apache.log4j.Logger; +import games.stendhal.server.core.scripting.impl.Script; import games.stendhal.server.entity.player.Player; /** diff --git a/src/games/stendhal/server/core/scripting/AbstractAdminScript.java b/src/games/stendhal/server/core/scripting/impl/AbstractAdminScript.java similarity index 99% rename from src/games/stendhal/server/core/scripting/AbstractAdminScript.java rename to src/games/stendhal/server/core/scripting/impl/AbstractAdminScript.java index 27b8e784213..45a9d7501ce 100644 --- a/src/games/stendhal/server/core/scripting/AbstractAdminScript.java +++ b/src/games/stendhal/server/core/scripting/impl/AbstractAdminScript.java @@ -9,7 +9,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -package games.stendhal.server.core.scripting; +package games.stendhal.server.core.scripting.impl; import java.util.Arrays; import java.util.LinkedList; diff --git a/src/games/stendhal/server/core/scripting/Script.java b/src/games/stendhal/server/core/scripting/impl/Script.java similarity index 92% rename from src/games/stendhal/server/core/scripting/Script.java rename to src/games/stendhal/server/core/scripting/impl/Script.java index 7e895944bc3..39e29811f6c 100644 --- a/src/games/stendhal/server/core/scripting/Script.java +++ b/src/games/stendhal/server/core/scripting/impl/Script.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -10,10 +10,11 @@ * (at your option) any later version. * * * ***************************************************************************/ -package games.stendhal.server.core.scripting; +package games.stendhal.server.core.scripting.impl; import java.util.List; +import games.stendhal.server.core.scripting.ScriptingSandbox; import games.stendhal.server.entity.player.Player; /** diff --git a/src/games/stendhal/server/core/scripting/ScriptImpl.java b/src/games/stendhal/server/core/scripting/impl/ScriptImpl.java similarity index 89% rename from src/games/stendhal/server/core/scripting/ScriptImpl.java rename to src/games/stendhal/server/core/scripting/impl/ScriptImpl.java index 72f837d3bb1..3f7b365f896 100644 --- a/src/games/stendhal/server/core/scripting/ScriptImpl.java +++ b/src/games/stendhal/server/core/scripting/impl/ScriptImpl.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -10,10 +10,11 @@ * (at your option) any later version. * * * ***************************************************************************/ -package games.stendhal.server.core.scripting; +package games.stendhal.server.core.scripting.impl; import java.util.List; +import games.stendhal.server.core.scripting.ScriptingSandbox; import games.stendhal.server.entity.player.Player; /** diff --git a/src/games/stendhal/server/core/scripting/impl/package-info.java b/src/games/stendhal/server/core/scripting/impl/package-info.java new file mode 100644 index 00000000000..37af4fd877e --- /dev/null +++ b/src/games/stendhal/server/core/scripting/impl/package-info.java @@ -0,0 +1,12 @@ +/*************************************************************************** + * Copyright © 2024 - Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * 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 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ +package games.stendhal.server.core.scripting.impl; diff --git a/src/games/stendhal/server/script/AbstractOfflineAction.java b/src/games/stendhal/server/script/AbstractOfflineAction.java index ac6387fa0f0..8882540634c 100644 --- a/src/games/stendhal/server/script/AbstractOfflineAction.java +++ b/src/games/stendhal/server/script/AbstractOfflineAction.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -20,7 +20,7 @@ import games.stendhal.server.core.engine.StendhalRPRuleProcessor; import games.stendhal.server.core.engine.StendhalRPWorld; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import marauroa.common.game.IRPZone; import marauroa.common.game.RPObject; diff --git a/src/games/stendhal/server/script/AdminMaker.java b/src/games/stendhal/server/script/AdminMaker.java index c971c4b7880..3c347783ef1 100644 --- a/src/games/stendhal/server/script/AdminMaker.java +++ b/src/games/stendhal/server/script/AdminMaker.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -23,9 +23,9 @@ import games.stendhal.server.core.config.annotations.ServerModeUtil; import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.StendhalRPZone; -import games.stendhal.server.core.scripting.ScriptImpl; import games.stendhal.server.core.scripting.ScriptingNPC; import games.stendhal.server.core.scripting.ScriptingSandbox; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.item.Item; import games.stendhal.server.entity.item.StackableItem; import games.stendhal.server.entity.npc.ChatAction; diff --git a/src/games/stendhal/server/script/AdminPortal.java b/src/games/stendhal/server/script/AdminPortal.java index b411395c8b5..92d7bd49d5e 100644 --- a/src/games/stendhal/server/script/AdminPortal.java +++ b/src/games/stendhal/server/script/AdminPortal.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2011 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -14,7 +14,7 @@ import java.util.List; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.mapstuff.portal.LevelCheckingPortal; import games.stendhal.server.entity.mapstuff.portal.Portal; import games.stendhal.server.entity.player.Player; diff --git a/src/games/stendhal/server/script/AdminSign.java b/src/games/stendhal/server/script/AdminSign.java index 27c2775c200..02d9ecd2c9a 100644 --- a/src/games/stendhal/server/script/AdminSign.java +++ b/src/games/stendhal/server/script/AdminSign.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2011 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -17,7 +17,7 @@ import java.util.Map; import games.stendhal.common.MathHelper; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.mapstuff.sign.Sign; import games.stendhal.server.entity.player.Player; diff --git a/src/games/stendhal/server/script/AlterLoot.java b/src/games/stendhal/server/script/AlterLoot.java index 6c3e066fbdf..5a3ce0b6791 100644 --- a/src/games/stendhal/server/script/AlterLoot.java +++ b/src/games/stendhal/server/script/AlterLoot.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright © 2020 - Arianne * + * Copyright © 2020-2024 - Arianne * *************************************************************************** *************************************************************************** * * @@ -16,7 +16,7 @@ import games.stendhal.common.NotificationType; import games.stendhal.server.core.engine.SingletonRepository; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; /** diff --git a/src/games/stendhal/server/script/AlterQuest.java b/src/games/stendhal/server/script/AlterQuest.java index 8318e824c7e..95dc85d0e97 100644 --- a/src/games/stendhal/server/script/AlterQuest.java +++ b/src/games/stendhal/server/script/AlterQuest.java @@ -17,7 +17,7 @@ import games.stendhal.server.constants.StandardMessages; import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.StendhalRPRuleProcessor; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; /** diff --git a/src/games/stendhal/server/script/BetManager.java b/src/games/stendhal/server/script/BetManager.java index d0f9450c384..bc5dd7d45ae 100644 --- a/src/games/stendhal/server/script/BetManager.java +++ b/src/games/stendhal/server/script/BetManager.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2023 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -23,9 +23,9 @@ import games.stendhal.common.parser.Sentence; import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.events.TurnListener; -import games.stendhal.server.core.scripting.ScriptImpl; import games.stendhal.server.core.scripting.ScriptingNPC; import games.stendhal.server.core.scripting.ScriptingSandbox; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.Entity; import games.stendhal.server.entity.item.ConsumableItem; import games.stendhal.server.entity.item.Item; diff --git a/src/games/stendhal/server/script/BugInspect.java b/src/games/stendhal/server/script/BugInspect.java index 0d09ec227be..58f0783a5d5 100644 --- a/src/games/stendhal/server/script/BugInspect.java +++ b/src/games/stendhal/server/script/BugInspect.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -22,7 +22,7 @@ import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.Task; import games.stendhal.server.core.events.TurnListener; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.item.StackableItem; import games.stendhal.server.entity.player.Player; import marauroa.common.game.RPObject; diff --git a/src/games/stendhal/server/script/ChangeDaytime.java b/src/games/stendhal/server/script/ChangeDaytime.java index 18e1d1a1738..41a7991597b 100644 --- a/src/games/stendhal/server/script/ChangeDaytime.java +++ b/src/games/stendhal/server/script/ChangeDaytime.java @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2023 - Faiumoni e.V. * + * (C) Copyright 2023-2024 - Faiumoni e.V. * *************************************************************************** *************************************************************************** * * @@ -17,7 +17,7 @@ import games.stendhal.server.core.rp.DaylightPhase; import games.stendhal.server.core.rp.DaylightUpdater; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; /** diff --git a/src/games/stendhal/server/script/ChangeMap.java b/src/games/stendhal/server/script/ChangeMap.java index 174316715e4..b728d2f7a74 100644 --- a/src/games/stendhal/server/script/ChangeMap.java +++ b/src/games/stendhal/server/script/ChangeMap.java @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2003-2015 - Faiumoni e.V. * + * (C) Copyright 2003-2024 - Faiumoni e.V. * *************************************************************************** *************************************************************************** * * @@ -20,7 +20,7 @@ import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.StendhalRPWorld; import games.stendhal.server.core.engine.StendhalRPZone; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import marauroa.common.game.IRPZone; diff --git a/src/games/stendhal/server/script/CommerceExchange.java b/src/games/stendhal/server/script/CommerceExchange.java index 06844aa0b18..a33ff672107 100644 --- a/src/games/stendhal/server/script/CommerceExchange.java +++ b/src/games/stendhal/server/script/CommerceExchange.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright © 2003-2023 - Arianne * + * Copyright © 2003-2024 - Arianne * *************************************************************************** *************************************************************************** * * @@ -16,7 +16,7 @@ import games.stendhal.common.NotificationType; import games.stendhal.server.constants.StandardMessages; import games.stendhal.server.core.engine.SingletonRepository; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; diff --git a/src/games/stendhal/server/script/ContMoveAndStrengthenOnlinePlayers.java b/src/games/stendhal/server/script/ContMoveAndStrengthenOnlinePlayers.java index afaca28c2cd..84059e29504 100644 --- a/src/games/stendhal/server/script/ContMoveAndStrengthenOnlinePlayers.java +++ b/src/games/stendhal/server/script/ContMoveAndStrengthenOnlinePlayers.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -22,7 +22,7 @@ import games.stendhal.server.core.engine.StendhalRPWorld; import games.stendhal.server.core.engine.StendhalRPZone; import games.stendhal.server.core.events.TurnListener; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.item.Item; import games.stendhal.server.entity.item.StackableItem; import games.stendhal.server.entity.player.Player; diff --git a/src/games/stendhal/server/script/CountObjects.java b/src/games/stendhal/server/script/CountObjects.java index 920f0457e8d..40d7557e542 100644 --- a/src/games/stendhal/server/script/CountObjects.java +++ b/src/games/stendhal/server/script/CountObjects.java @@ -1,4 +1,15 @@ /* $Id$ */ +/*************************************************************************** + * Copyright © 2007-2024 - Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * 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 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ package games.stendhal.server.script; import java.util.Iterator; @@ -7,7 +18,7 @@ import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.StendhalRPWorld; import games.stendhal.server.core.engine.StendhalRPZone; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import marauroa.common.game.IRPZone; import marauroa.common.game.RPObject; diff --git a/src/games/stendhal/server/script/CountUnusedSprites.java b/src/games/stendhal/server/script/CountUnusedSprites.java index 9796e9d1c31..818877eed1a 100644 --- a/src/games/stendhal/server/script/CountUnusedSprites.java +++ b/src/games/stendhal/server/script/CountUnusedSprites.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * Copyright © 2003-2022 - Arianne * + * Copyright © 2003-2024 - Arianne * *************************************************************************** *************************************************************************** * * @@ -31,7 +31,7 @@ import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.rule.defaultruleset.DefaultCreature; import games.stendhal.server.core.rule.defaultruleset.DefaultItem; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; diff --git a/src/games/stendhal/server/script/CreateRaid.java b/src/games/stendhal/server/script/CreateRaid.java index 38bd002de0a..1c03152b318 100644 --- a/src/games/stendhal/server/script/CreateRaid.java +++ b/src/games/stendhal/server/script/CreateRaid.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2023 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -19,7 +19,7 @@ import games.stendhal.common.Rand; import games.stendhal.server.core.engine.StendhalRPZone; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.creature.Creature; import games.stendhal.server.entity.creature.RaidCreature; import games.stendhal.server.entity.player.Player; diff --git a/src/games/stendhal/server/script/CreaturesRatioCalculator.java b/src/games/stendhal/server/script/CreaturesRatioCalculator.java index d5d741e6fb9..e238d3c3250 100644 --- a/src/games/stendhal/server/script/CreaturesRatioCalculator.java +++ b/src/games/stendhal/server/script/CreaturesRatioCalculator.java @@ -1,4 +1,15 @@ /* $Id$ */ +/*************************************************************************** + * Copyright © 2012-2024 - Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * 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 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ package games.stendhal.server.script; import java.util.Collection; @@ -8,7 +19,7 @@ import org.apache.log4j.Logger; import games.stendhal.server.core.engine.SingletonRepository; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.creature.Creature; import games.stendhal.server.entity.creature.impl.DropItem; import games.stendhal.server.entity.npc.behaviour.impl.BuyerBehaviour; diff --git a/src/games/stendhal/server/script/DBLogging.java b/src/games/stendhal/server/script/DBLogging.java index 781b5df4992..a8e3a008832 100644 --- a/src/games/stendhal/server/script/DBLogging.java +++ b/src/games/stendhal/server/script/DBLogging.java @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2020 - Stendhal * + * (C) Copyright 2020-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -14,7 +14,7 @@ import java.util.List; import games.stendhal.common.NotificationType; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import marauroa.server.db.command.DBCommandQueueLogger; diff --git a/src/games/stendhal/server/script/DebugWeather.java b/src/games/stendhal/server/script/DebugWeather.java index a061efcd982..f913a70b360 100644 --- a/src/games/stendhal/server/script/DebugWeather.java +++ b/src/games/stendhal/server/script/DebugWeather.java @@ -22,7 +22,7 @@ import games.stendhal.server.constants.StandardMessages; import games.stendhal.server.core.engine.StendhalRPZone; import games.stendhal.server.core.rp.WeatherUpdater; -import games.stendhal.server.core.scripting.AbstractAdminScript; +import games.stendhal.server.core.scripting.impl.AbstractAdminScript; import marauroa.common.Pair; diff --git a/src/games/stendhal/server/script/Debuggera.java b/src/games/stendhal/server/script/Debuggera.java index a5bae8977f0..1f73489ac19 100644 --- a/src/games/stendhal/server/script/Debuggera.java +++ b/src/games/stendhal/server/script/Debuggera.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -25,9 +25,9 @@ import games.stendhal.server.core.engine.StendhalRPWorld; import games.stendhal.server.core.engine.StendhalRPZone; import games.stendhal.server.core.events.TurnListener; -import games.stendhal.server.core.scripting.ScriptImpl; import games.stendhal.server.core.scripting.ScriptingNPC; import games.stendhal.server.core.scripting.ScriptingSandbox; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.npc.ChatAction; import games.stendhal.server.entity.npc.ConversationStates; import games.stendhal.server.entity.npc.EventRaiser; diff --git a/src/games/stendhal/server/script/DeepInspect.java b/src/games/stendhal/server/script/DeepInspect.java index 7d35226fedf..15af8587814 100644 --- a/src/games/stendhal/server/script/DeepInspect.java +++ b/src/games/stendhal/server/script/DeepInspect.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2023 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -29,7 +29,7 @@ import games.stendhal.server.core.engine.StendhalRPZone; import games.stendhal.server.core.events.TurnListener; import games.stendhal.server.core.events.TurnNotifier; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.item.Item; import games.stendhal.server.entity.npc.behaviour.journal.ProducerRegister; import games.stendhal.server.entity.player.Player; diff --git a/src/games/stendhal/server/script/DisableFeature.java b/src/games/stendhal/server/script/DisableFeature.java index 580ed0763f7..6db53359b95 100644 --- a/src/games/stendhal/server/script/DisableFeature.java +++ b/src/games/stendhal/server/script/DisableFeature.java @@ -1,11 +1,23 @@ +/*************************************************************************** + * Copyright © 2011-2024 - Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * 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 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ package games.stendhal.server.script; import java.util.List; import games.stendhal.server.core.engine.SingletonRepository; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.npc.action.DisableFeatureAction; import games.stendhal.server.entity.player.Player; + /** * Script to disable a feature like keyring for a player * diff --git a/src/games/stendhal/server/script/DropPlayerItems.java b/src/games/stendhal/server/script/DropPlayerItems.java index 49cdda58a67..058b52c50c2 100644 --- a/src/games/stendhal/server/script/DropPlayerItems.java +++ b/src/games/stendhal/server/script/DropPlayerItems.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -17,7 +17,7 @@ import games.stendhal.common.grammar.Grammar; import games.stendhal.server.core.engine.GameEvent; import games.stendhal.server.core.engine.SingletonRepository; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; /** diff --git a/src/games/stendhal/server/script/DumpCharacterFromDatabase.java b/src/games/stendhal/server/script/DumpCharacterFromDatabase.java index 05b8af6c516..a746de16f40 100644 --- a/src/games/stendhal/server/script/DumpCharacterFromDatabase.java +++ b/src/games/stendhal/server/script/DumpCharacterFromDatabase.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -18,7 +18,7 @@ import org.apache.log4j.Logger; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import marauroa.common.game.RPObject; import marauroa.server.game.db.DAORegister; diff --git a/src/games/stendhal/server/script/DumpConditions.java b/src/games/stendhal/server/script/DumpConditions.java index fd2b38b426d..18052d50b62 100644 --- a/src/games/stendhal/server/script/DumpConditions.java +++ b/src/games/stendhal/server/script/DumpConditions.java @@ -1,4 +1,15 @@ /* $Id$ */ +/*************************************************************************** + * Copyright © 2007-2024 - Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * 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 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ package games.stendhal.server.script; import java.util.Collection; @@ -8,7 +19,7 @@ import games.stendhal.common.parser.Expression; import games.stendhal.server.core.engine.SingletonRepository; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.npc.ConversationStates; import games.stendhal.server.entity.npc.SpeakerNPC; import games.stendhal.server.entity.npc.fsm.PreTransitionCondition; diff --git a/src/games/stendhal/server/script/DumpDeletionCandidates.java b/src/games/stendhal/server/script/DumpDeletionCandidates.java index 610177a6d9c..b3c37e78a7f 100644 --- a/src/games/stendhal/server/script/DumpDeletionCandidates.java +++ b/src/games/stendhal/server/script/DumpDeletionCandidates.java @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2012-2023 - Faiumoni e. V. * + * (C) Copyright 2012-2024 - Faiumoni e. V. * *************************************************************************** *************************************************************************** * * @@ -18,7 +18,7 @@ import org.apache.log4j.Logger; import games.stendhal.common.MathHelper; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import marauroa.common.game.RPObject; import marauroa.common.game.RPSlot; diff --git a/src/games/stendhal/server/script/DumpOpenDBTransactions.java b/src/games/stendhal/server/script/DumpOpenDBTransactions.java index 64542b8ec04..96505454168 100644 --- a/src/games/stendhal/server/script/DumpOpenDBTransactions.java +++ b/src/games/stendhal/server/script/DumpOpenDBTransactions.java @@ -1,9 +1,20 @@ /* $Id$ */ +/*************************************************************************** + * Copyright © 2009-2024 - Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * 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 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ package games.stendhal.server.script; import java.util.List; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import marauroa.server.db.TransactionPool; diff --git a/src/games/stendhal/server/script/DumpTransitions.java b/src/games/stendhal/server/script/DumpTransitions.java index 11f0c574d53..995d6d91b0f 100644 --- a/src/games/stendhal/server/script/DumpTransitions.java +++ b/src/games/stendhal/server/script/DumpTransitions.java @@ -1,11 +1,22 @@ /* $Id$ */ +/*************************************************************************** + * Copyright © 2007-2024 - Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * 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 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ package games.stendhal.server.script; import java.util.List; import games.stendhal.common.parser.Expression; import games.stendhal.server.core.engine.SingletonRepository; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.npc.ConversationStates; import games.stendhal.server.entity.npc.SpeakerNPC; import games.stendhal.server.entity.npc.fsm.Transition; diff --git a/src/games/stendhal/server/script/DumpTransitionsEx.java b/src/games/stendhal/server/script/DumpTransitionsEx.java index 368c734364f..b6eae6180c8 100644 --- a/src/games/stendhal/server/script/DumpTransitionsEx.java +++ b/src/games/stendhal/server/script/DumpTransitionsEx.java @@ -1,4 +1,15 @@ /* $Id$ */ +/*************************************************************************** + * Copyright © 2007-2024 - Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * 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 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ package games.stendhal.server.script; import java.util.List; @@ -8,7 +19,7 @@ import games.stendhal.common.parser.Expression; import games.stendhal.server.core.engine.SingletonRepository; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.npc.ConversationStates; import games.stendhal.server.entity.npc.SpeakerNPC; import games.stendhal.server.entity.npc.fsm.PostTransitionAction; diff --git a/src/games/stendhal/server/script/DumpTurnListenerEvents.java b/src/games/stendhal/server/script/DumpTurnListenerEvents.java index edaa0f0474e..5e20e1b1133 100644 --- a/src/games/stendhal/server/script/DumpTurnListenerEvents.java +++ b/src/games/stendhal/server/script/DumpTurnListenerEvents.java @@ -1,4 +1,15 @@ /* $Id$ */ +/*************************************************************************** + * Copyright © 2007-2024 - Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * 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 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ package games.stendhal.server.script; import java.util.List; @@ -8,7 +19,7 @@ import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.events.TurnListener; import games.stendhal.server.core.events.TurnNotifier; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import games.stendhal.server.util.ObjectCounter; diff --git a/src/games/stendhal/server/script/EasterBunny.java b/src/games/stendhal/server/script/EasterBunny.java index 8cd9dde1deb..6b107d39546 100644 --- a/src/games/stendhal/server/script/EasterBunny.java +++ b/src/games/stendhal/server/script/EasterBunny.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -15,7 +15,7 @@ import java.util.List; import games.stendhal.server.core.rp.StendhalQuestSystem; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import games.stendhal.server.maps.quests.MeetBunny; diff --git a/src/games/stendhal/server/script/EasyRPAction.java b/src/games/stendhal/server/script/EasyRPAction.java index 4158d210bee..cea8c65fa8d 100644 --- a/src/games/stendhal/server/script/EasyRPAction.java +++ b/src/games/stendhal/server/script/EasyRPAction.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -15,7 +15,7 @@ import java.util.List; import games.stendhal.server.core.engine.SingletonRepository; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import marauroa.common.game.RPAction; diff --git a/src/games/stendhal/server/script/EnableFeature.java b/src/games/stendhal/server/script/EnableFeature.java index 937ac4fa185..efc4571006a 100644 --- a/src/games/stendhal/server/script/EnableFeature.java +++ b/src/games/stendhal/server/script/EnableFeature.java @@ -1,11 +1,23 @@ +/*************************************************************************** + * Copyright © 2011-2024 - Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * 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 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ package games.stendhal.server.script; import java.util.List; import games.stendhal.server.core.engine.SingletonRepository; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.npc.action.EnableFeatureAction; import games.stendhal.server.entity.player.Player; + /** * Script to enable a feature like keyring for a player * diff --git a/src/games/stendhal/server/script/Enchant.java b/src/games/stendhal/server/script/Enchant.java index 9ab972a0cbc..21d63c80052 100644 --- a/src/games/stendhal/server/script/Enchant.java +++ b/src/games/stendhal/server/script/Enchant.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -16,7 +16,7 @@ import games.stendhal.server.core.config.annotations.ServerModeUtil; import games.stendhal.server.core.engine.StendhalRPZone; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.creature.Creature; import games.stendhal.server.entity.creature.RaidCreature; import games.stendhal.server.entity.player.Player; diff --git a/src/games/stendhal/server/script/EntitySearch.java b/src/games/stendhal/server/script/EntitySearch.java index bf7e7bc1137..c1ef17075f2 100644 --- a/src/games/stendhal/server/script/EntitySearch.java +++ b/src/games/stendhal/server/script/EntitySearch.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -18,7 +18,7 @@ import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.StendhalRPZone; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.creature.Creature; import games.stendhal.server.entity.creature.DomesticAnimal; import games.stendhal.server.entity.mapstuff.spawner.CreatureRespawnPoint; diff --git a/src/games/stendhal/server/script/EventTest.java b/src/games/stendhal/server/script/EventTest.java index e5f0f348870..6a883b015bf 100644 --- a/src/games/stendhal/server/script/EventTest.java +++ b/src/games/stendhal/server/script/EventTest.java @@ -1,9 +1,20 @@ /* $Id$ */ +/*************************************************************************** + * Copyright © 2007-2024 - Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * 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 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ package games.stendhal.server.script; import java.util.List; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import marauroa.common.game.Definition; import marauroa.common.game.Definition.DefinitionClass; diff --git a/src/games/stendhal/server/script/ExecuteLua.java b/src/games/stendhal/server/script/ExecuteLua.java index 8922681faad..7b341518031 100644 --- a/src/games/stendhal/server/script/ExecuteLua.java +++ b/src/games/stendhal/server/script/ExecuteLua.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright © 2020-2023 - Stendhal * + * Copyright © 2020-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -16,7 +16,7 @@ import java.util.List; import games.stendhal.common.NotificationType; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.core.scripting.lua.LuaLoader; import games.stendhal.server.entity.player.Player; diff --git a/src/games/stendhal/server/script/ExecuteSQL.java b/src/games/stendhal/server/script/ExecuteSQL.java index eb54bd0186d..169fff5e009 100644 --- a/src/games/stendhal/server/script/ExecuteSQL.java +++ b/src/games/stendhal/server/script/ExecuteSQL.java @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -18,7 +18,7 @@ import org.apache.log4j.Logger; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import marauroa.server.db.DBTransaction; import marauroa.server.db.TransactionPool; diff --git a/src/games/stendhal/server/script/ExtendedSummonAt.java b/src/games/stendhal/server/script/ExtendedSummonAt.java index dff6baedca6..d262777aa3e 100644 --- a/src/games/stendhal/server/script/ExtendedSummonAt.java +++ b/src/games/stendhal/server/script/ExtendedSummonAt.java @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2003-2022 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -24,7 +24,7 @@ import games.stendhal.server.core.engine.GameEvent; import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.rule.EntityManager; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.item.Item; import games.stendhal.server.entity.item.SlotActivatedItem; import games.stendhal.server.entity.item.StackableItem; diff --git a/src/games/stendhal/server/script/FieldInspect.java b/src/games/stendhal/server/script/FieldInspect.java index fc091de5207..0fd449ae31d 100644 --- a/src/games/stendhal/server/script/FieldInspect.java +++ b/src/games/stendhal/server/script/FieldInspect.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -15,7 +15,7 @@ import java.util.List; import games.stendhal.server.core.reflectiondebugger.FieldLister; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import games.stendhal.server.util.EntityHelper; diff --git a/src/games/stendhal/server/script/FindBrokenCorpses.java b/src/games/stendhal/server/script/FindBrokenCorpses.java index 631c1f368ff..909707984fc 100644 --- a/src/games/stendhal/server/script/FindBrokenCorpses.java +++ b/src/games/stendhal/server/script/FindBrokenCorpses.java @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -18,7 +18,7 @@ import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.rule.EntityManager; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.creature.Creature; import games.stendhal.server.entity.player.Player; diff --git a/src/games/stendhal/server/script/FishInspect.java b/src/games/stendhal/server/script/FishInspect.java index 809c72d90a2..f6124661572 100644 --- a/src/games/stendhal/server/script/FishInspect.java +++ b/src/games/stendhal/server/script/FishInspect.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2023 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -22,7 +22,7 @@ import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.Task; import games.stendhal.server.core.events.TurnListener; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.item.StackableItem; import games.stendhal.server.entity.player.Player; import marauroa.common.game.RPObject; diff --git a/src/games/stendhal/server/script/FixDM.java b/src/games/stendhal/server/script/FixDM.java index 0c618d2f492..58b4f44ffb2 100644 --- a/src/games/stendhal/server/script/FixDM.java +++ b/src/games/stendhal/server/script/FixDM.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2023 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -16,7 +16,7 @@ import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.StendhalRPRuleProcessor; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; /** diff --git a/src/games/stendhal/server/script/FixNegativeHp.java b/src/games/stendhal/server/script/FixNegativeHp.java index 9254c910fab..bbb9f3beacc 100644 --- a/src/games/stendhal/server/script/FixNegativeHp.java +++ b/src/games/stendhal/server/script/FixNegativeHp.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -17,7 +17,7 @@ import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.events.LoginListener; import games.stendhal.server.core.events.LoginNotifier; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; /** diff --git a/src/games/stendhal/server/script/FreezeHell.java b/src/games/stendhal/server/script/FreezeHell.java index edb1d239641..b417ccd3a0a 100644 --- a/src/games/stendhal/server/script/FreezeHell.java +++ b/src/games/stendhal/server/script/FreezeHell.java @@ -32,7 +32,7 @@ import games.stendhal.server.core.engine.StendhalRPWorld; import games.stendhal.server.core.engine.StendhalRPZone; import games.stendhal.server.core.engine.ZoneAttributes; -import games.stendhal.server.core.scripting.AbstractAdminScript; +import games.stendhal.server.core.scripting.impl.AbstractAdminScript; import marauroa.common.game.IRPZone; /** diff --git a/src/games/stendhal/server/script/GC.java b/src/games/stendhal/server/script/GC.java index f59ce879dd0..820b738b09c 100644 --- a/src/games/stendhal/server/script/GC.java +++ b/src/games/stendhal/server/script/GC.java @@ -1,9 +1,20 @@ /* $Id$ */ +/*************************************************************************** + * Copyright © 2007-2024 - Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * 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 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ package games.stendhal.server.script; import java.util.List; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; /** diff --git a/src/games/stendhal/server/script/HandleTransitions.java b/src/games/stendhal/server/script/HandleTransitions.java index 0b46283fedc..78755c80e13 100644 --- a/src/games/stendhal/server/script/HandleTransitions.java +++ b/src/games/stendhal/server/script/HandleTransitions.java @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2003-2023 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -17,7 +17,7 @@ import org.apache.log4j.Logger; import games.stendhal.server.core.engine.SingletonRepository; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.npc.ConversationStates; import games.stendhal.server.entity.npc.SpeakerNPC; import games.stendhal.server.entity.npc.fsm.Transition; diff --git a/src/games/stendhal/server/script/Herald.java b/src/games/stendhal/server/script/Herald.java index 74db22e1305..d684e6a0d30 100644 --- a/src/games/stendhal/server/script/Herald.java +++ b/src/games/stendhal/server/script/Herald.java @@ -25,8 +25,8 @@ import games.stendhal.server.core.engine.StendhalRPZone; import games.stendhal.server.core.events.TurnListener; import games.stendhal.server.core.events.TurnNotifier; -import games.stendhal.server.core.scripting.ScriptImpl; import games.stendhal.server.core.scripting.ScriptingSandbox; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.npc.ChatAction; import games.stendhal.server.entity.npc.ConversationStates; import games.stendhal.server.entity.npc.EventRaiser; diff --git a/src/games/stendhal/server/script/ItemRarity.java b/src/games/stendhal/server/script/ItemRarity.java index 4c7c1ebe3ce..2ced9b379e5 100644 --- a/src/games/stendhal/server/script/ItemRarity.java +++ b/src/games/stendhal/server/script/ItemRarity.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -22,7 +22,7 @@ import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.StendhalRPWorld; import games.stendhal.server.core.engine.StendhalRPZone; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.creature.Creature; import games.stendhal.server.entity.creature.impl.DropItem; import games.stendhal.server.entity.mapstuff.spawner.CreatureRespawnPoint; diff --git a/src/games/stendhal/server/script/ListNPCs.java b/src/games/stendhal/server/script/ListNPCs.java index a2eba8beb51..124afe18b70 100644 --- a/src/games/stendhal/server/script/ListNPCs.java +++ b/src/games/stendhal/server/script/ListNPCs.java @@ -1,10 +1,21 @@ /* $Id$ */ +/*************************************************************************** + * Copyright © 2007-2024 - Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * 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 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ package games.stendhal.server.script; import java.util.List; import games.stendhal.server.core.engine.SingletonRepository; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.npc.NPCList; import games.stendhal.server.entity.npc.SpeakerNPC; import games.stendhal.server.entity.player.Player; diff --git a/src/games/stendhal/server/script/ListRaids.java b/src/games/stendhal/server/script/ListRaids.java index da35ab6eeef..a64faa3c2bd 100644 --- a/src/games/stendhal/server/script/ListRaids.java +++ b/src/games/stendhal/server/script/ListRaids.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -24,7 +24,7 @@ import com.google.common.reflect.ClassPath; import com.google.common.reflect.ClassPath.ClassInfo; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; /** diff --git a/src/games/stendhal/server/script/ListSpawnPoints.java b/src/games/stendhal/server/script/ListSpawnPoints.java index 360db961dc6..2d92af5afd2 100644 --- a/src/games/stendhal/server/script/ListSpawnPoints.java +++ b/src/games/stendhal/server/script/ListSpawnPoints.java @@ -22,7 +22,7 @@ import games.stendhal.server.constants.StandardMessages; import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.StendhalRPZone; -import games.stendhal.server.core.scripting.AbstractAdminScript; +import games.stendhal.server.core.scripting.impl.AbstractAdminScript; import games.stendhal.server.entity.mapstuff.spawner.CreatureRespawnPoint; import games.stendhal.server.entity.mapstuff.spawner.PassiveEntityRespawnPoint; diff --git a/src/games/stendhal/server/script/ListUnusedCharacters.java b/src/games/stendhal/server/script/ListUnusedCharacters.java index f20779d14a8..3bc062c8f93 100644 --- a/src/games/stendhal/server/script/ListUnusedCharacters.java +++ b/src/games/stendhal/server/script/ListUnusedCharacters.java @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2022-2022 - Stendhal * + * (C) Copyright 2022-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -23,7 +23,7 @@ import org.apache.log4j.Logger; import games.stendhal.common.KeyedSlotUtil; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import games.stendhal.server.entity.slot.KeyedSlot; import marauroa.common.game.RPObject; diff --git a/src/games/stendhal/server/script/ListZones.java b/src/games/stendhal/server/script/ListZones.java index 5af0bba9462..23c31924f14 100644 --- a/src/games/stendhal/server/script/ListZones.java +++ b/src/games/stendhal/server/script/ListZones.java @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2018 - Arianne * + * (C) Copyright 2018-2024 - Arianne * *************************************************************************** *************************************************************************** * * @@ -21,7 +21,7 @@ import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.StendhalRPWorld; import games.stendhal.server.core.engine.StendhalRPZone; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; /** diff --git a/src/games/stendhal/server/script/Log4J.java b/src/games/stendhal/server/script/Log4J.java index 697afe6c94a..f0c496c5c74 100644 --- a/src/games/stendhal/server/script/Log4J.java +++ b/src/games/stendhal/server/script/Log4J.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -17,8 +17,9 @@ import org.apache.log4j.Level; import org.apache.log4j.Logger; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; + /** * Script to change log level of certain loggers at runtime * diff --git a/src/games/stendhal/server/script/LogoutPlayer.java b/src/games/stendhal/server/script/LogoutPlayer.java index b3ae9b471a7..16b3c5f7994 100644 --- a/src/games/stendhal/server/script/LogoutPlayer.java +++ b/src/games/stendhal/server/script/LogoutPlayer.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -17,7 +17,7 @@ import org.apache.log4j.Logger; import games.stendhal.server.core.engine.SingletonRepository; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; /** diff --git a/src/games/stendhal/server/script/ManageClover.java b/src/games/stendhal/server/script/ManageClover.java index dd5ac1ba1f2..6f4e68cf042 100644 --- a/src/games/stendhal/server/script/ManageClover.java +++ b/src/games/stendhal/server/script/ManageClover.java @@ -17,7 +17,7 @@ import games.stendhal.common.NotificationType; import games.stendhal.server.core.engine.StendhalRPZone; -import games.stendhal.server.core.scripting.AbstractAdminScript; +import games.stendhal.server.core.scripting.impl.AbstractAdminScript; import games.stendhal.server.entity.mapstuff.spawner.CloverSpawner; import games.stendhal.server.util.TimeUtil; diff --git a/src/games/stendhal/server/script/ManageHouse.java b/src/games/stendhal/server/script/ManageHouse.java index e624532871c..9503ec04685 100644 --- a/src/games/stendhal/server/script/ManageHouse.java +++ b/src/games/stendhal/server/script/ManageHouse.java @@ -20,7 +20,7 @@ import games.stendhal.common.NotificationType; import games.stendhal.server.constants.StandardMessages; import games.stendhal.server.core.engine.SingletonRepository; -import games.stendhal.server.core.scripting.AbstractAdminScript; +import games.stendhal.server.core.scripting.impl.AbstractAdminScript; import games.stendhal.server.entity.mapstuff.portal.HousePortal; import games.stendhal.server.entity.player.Player; import games.stendhal.server.maps.quests.HouseBuying; diff --git a/src/games/stendhal/server/script/Maria.java b/src/games/stendhal/server/script/Maria.java index 1e666ffbad5..bde92069dea 100644 --- a/src/games/stendhal/server/script/Maria.java +++ b/src/games/stendhal/server/script/Maria.java @@ -18,9 +18,9 @@ import games.stendhal.common.parser.Sentence; import games.stendhal.server.core.engine.SingletonRepository; -import games.stendhal.server.core.scripting.ScriptImpl; import games.stendhal.server.core.scripting.ScriptingNPC; import games.stendhal.server.core.scripting.ScriptingSandbox; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.npc.ChatAction; import games.stendhal.server.entity.npc.ConversationPhrases; import games.stendhal.server.entity.npc.ConversationStates; diff --git a/src/games/stendhal/server/script/MineTown.java b/src/games/stendhal/server/script/MineTown.java index d62af504c72..54bddad808d 100644 --- a/src/games/stendhal/server/script/MineTown.java +++ b/src/games/stendhal/server/script/MineTown.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -15,7 +15,7 @@ import java.util.List; import games.stendhal.server.core.rp.StendhalQuestSystem; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import games.stendhal.server.maps.quests.MineTownRevivalWeeks; diff --git a/src/games/stendhal/server/script/MoveAndStrengthenOnlinePlayers.java b/src/games/stendhal/server/script/MoveAndStrengthenOnlinePlayers.java index d601a65deab..28a95e3bc87 100644 --- a/src/games/stendhal/server/script/MoveAndStrengthenOnlinePlayers.java +++ b/src/games/stendhal/server/script/MoveAndStrengthenOnlinePlayers.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -24,7 +24,7 @@ import games.stendhal.server.core.engine.StendhalRPZone; import games.stendhal.server.core.engine.Task; import games.stendhal.server.core.events.TurnListener; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.item.Item; import games.stendhal.server.entity.item.StackableItem; import games.stendhal.server.entity.player.Player; diff --git a/src/games/stendhal/server/script/NPCPathCheck.java b/src/games/stendhal/server/script/NPCPathCheck.java index 25dbe01a8d7..cc836319056 100644 --- a/src/games/stendhal/server/script/NPCPathCheck.java +++ b/src/games/stendhal/server/script/NPCPathCheck.java @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2003-2012 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -19,7 +19,7 @@ import games.stendhal.server.core.engine.StendhalRPZone; import games.stendhal.server.core.pathfinder.FixedPath; import games.stendhal.server.core.pathfinder.Node; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.ActiveEntity; import games.stendhal.server.entity.npc.NPCList; import games.stendhal.server.entity.npc.SpeakerNPC; diff --git a/src/games/stendhal/server/script/NPCShout.java b/src/games/stendhal/server/script/NPCShout.java index 632c4b88b2b..b154a60ee98 100644 --- a/src/games/stendhal/server/script/NPCShout.java +++ b/src/games/stendhal/server/script/NPCShout.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -16,7 +16,7 @@ import games.stendhal.common.NotificationType; import games.stendhal.server.core.engine.SingletonRepository; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; /** diff --git a/src/games/stendhal/server/script/NPCShoutZone.java b/src/games/stendhal/server/script/NPCShoutZone.java index 77035fde963..9fcc82eda7c 100644 --- a/src/games/stendhal/server/script/NPCShoutZone.java +++ b/src/games/stendhal/server/script/NPCShoutZone.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -16,7 +16,7 @@ import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.StendhalRPZone; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; /** diff --git a/src/games/stendhal/server/script/NameChange.java b/src/games/stendhal/server/script/NameChange.java index 5d5b671138d..fb4ad7c6b0a 100644 --- a/src/games/stendhal/server/script/NameChange.java +++ b/src/games/stendhal/server/script/NameChange.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -14,7 +14,7 @@ import java.util.List; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import marauroa.common.Configuration; diff --git a/src/games/stendhal/server/script/Observer.java b/src/games/stendhal/server/script/Observer.java index 3a283e73252..e4b7a559f1d 100644 --- a/src/games/stendhal/server/script/Observer.java +++ b/src/games/stendhal/server/script/Observer.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -19,7 +19,7 @@ import games.stendhal.server.core.engine.GameEvent; import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.StendhalRPRuleProcessor; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; /** diff --git a/src/games/stendhal/server/script/Plague.java b/src/games/stendhal/server/script/Plague.java index 273be8528d4..cd08e1fc6d3 100644 --- a/src/games/stendhal/server/script/Plague.java +++ b/src/games/stendhal/server/script/Plague.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -16,7 +16,7 @@ import games.stendhal.common.MathHelper; import games.stendhal.server.core.config.annotations.ServerModeUtil; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.creature.Creature; import games.stendhal.server.entity.creature.RaidCreature; import games.stendhal.server.entity.player.Player; diff --git a/src/games/stendhal/server/script/PlayerPositionMonitoring.java b/src/games/stendhal/server/script/PlayerPositionMonitoring.java index 722bbba0fc9..92f2442eeaa 100644 --- a/src/games/stendhal/server/script/PlayerPositionMonitoring.java +++ b/src/games/stendhal/server/script/PlayerPositionMonitoring.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -18,7 +18,7 @@ import games.stendhal.server.core.engine.StendhalRPZone; import games.stendhal.server.core.engine.Task; import games.stendhal.server.core.events.TurnListener; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; /** diff --git a/src/games/stendhal/server/script/RemoveClient.java b/src/games/stendhal/server/script/RemoveClient.java index 273a919f9f7..762ecbb4b03 100644 --- a/src/games/stendhal/server/script/RemoveClient.java +++ b/src/games/stendhal/server/script/RemoveClient.java @@ -1,8 +1,19 @@ +/*************************************************************************** + * Copyright © 2015-2024 - Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * 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 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ package games.stendhal.server.script; import java.util.List; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import marauroa.server.game.container.PlayerEntry; import marauroa.server.game.container.PlayerEntryContainer; diff --git a/src/games/stendhal/server/script/RemoveVisitedZone.java b/src/games/stendhal/server/script/RemoveVisitedZone.java index 30479a67d82..42400ca3fdf 100644 --- a/src/games/stendhal/server/script/RemoveVisitedZone.java +++ b/src/games/stendhal/server/script/RemoveVisitedZone.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2021 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -17,7 +17,7 @@ import games.stendhal.common.KeyedSlotUtil; import games.stendhal.server.core.engine.GameEvent; import games.stendhal.server.core.engine.SingletonRepository; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; /** diff --git a/src/games/stendhal/server/script/RemoveZone.java b/src/games/stendhal/server/script/RemoveZone.java index 9ea5a06a38c..859207bcace 100644 --- a/src/games/stendhal/server/script/RemoveZone.java +++ b/src/games/stendhal/server/script/RemoveZone.java @@ -17,7 +17,7 @@ import games.stendhal.server.core.engine.StendhalRPWorld; import games.stendhal.server.core.engine.StendhalRPZone; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; /** diff --git a/src/games/stendhal/server/script/ResetSlot.java b/src/games/stendhal/server/script/ResetSlot.java index 154b3cd9922..7f5e8dd7177 100644 --- a/src/games/stendhal/server/script/ResetSlot.java +++ b/src/games/stendhal/server/script/ResetSlot.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -16,7 +16,7 @@ import games.stendhal.common.NotificationType; import games.stendhal.server.core.engine.SingletonRepository; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import marauroa.common.game.RPObject; import marauroa.common.game.RPSlot; diff --git a/src/games/stendhal/server/script/ResetTutorial.java b/src/games/stendhal/server/script/ResetTutorial.java index 349b480f92b..05e1d49e50f 100644 --- a/src/games/stendhal/server/script/ResetTutorial.java +++ b/src/games/stendhal/server/script/ResetTutorial.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -17,7 +17,7 @@ import games.stendhal.common.NotificationType; import games.stendhal.server.constants.StandardMessages; import games.stendhal.server.core.engine.SingletonRepository; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import marauroa.common.game.RPObject; import marauroa.common.game.RPSlot; diff --git a/src/games/stendhal/server/script/RestoreOriginalOutfit.java b/src/games/stendhal/server/script/RestoreOriginalOutfit.java index 5f526444c69..7d1e04d4649 100644 --- a/src/games/stendhal/server/script/RestoreOriginalOutfit.java +++ b/src/games/stendhal/server/script/RestoreOriginalOutfit.java @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2003-2021 Stendhal * + * (C) Copyright 2003-2024 Stendhal * *************************************************************************** *************************************************************************** * * @@ -18,7 +18,7 @@ import java.util.List; import games.stendhal.server.core.engine.SingletonRepository; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; diff --git a/src/games/stendhal/server/script/Santa.java b/src/games/stendhal/server/script/Santa.java index 66eb3e58d1b..28d8fac0a2a 100644 --- a/src/games/stendhal/server/script/Santa.java +++ b/src/games/stendhal/server/script/Santa.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -15,7 +15,7 @@ import java.util.List; import games.stendhal.server.core.rp.StendhalQuestSystem; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import games.stendhal.server.maps.quests.MeetSanta; diff --git a/src/games/stendhal/server/script/SaveAllPlayers.java b/src/games/stendhal/server/script/SaveAllPlayers.java index 003fad76145..b9400f2a957 100644 --- a/src/games/stendhal/server/script/SaveAllPlayers.java +++ b/src/games/stendhal/server/script/SaveAllPlayers.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2011 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -18,7 +18,7 @@ import org.apache.log4j.Logger; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import marauroa.server.game.container.PlayerEntry; import marauroa.server.game.container.PlayerEntryContainer; diff --git a/src/games/stendhal/server/script/ServerDown.java b/src/games/stendhal/server/script/ServerDown.java index 9151d2c133c..8a25cabc97e 100644 --- a/src/games/stendhal/server/script/ServerDown.java +++ b/src/games/stendhal/server/script/ServerDown.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2011 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -20,7 +20,7 @@ import games.stendhal.server.core.engine.StendhalRPZone; import games.stendhal.server.core.pathfinder.FixedPath; import games.stendhal.server.core.pathfinder.Node; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.mapstuff.portal.Portal; import games.stendhal.server.entity.npc.NPCList; import games.stendhal.server.entity.npc.SpeakerNPC; diff --git a/src/games/stendhal/server/script/ServerReset.java b/src/games/stendhal/server/script/ServerReset.java index 5440c226a4a..f49c8026f37 100644 --- a/src/games/stendhal/server/script/ServerReset.java +++ b/src/games/stendhal/server/script/ServerReset.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -16,7 +16,7 @@ import games.stendhal.common.NotificationType; import games.stendhal.server.core.engine.SingletonRepository; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; /** diff --git a/src/games/stendhal/server/script/ServerShutdown.java b/src/games/stendhal/server/script/ServerShutdown.java index e742d68c1d0..d4e9fa7de48 100644 --- a/src/games/stendhal/server/script/ServerShutdown.java +++ b/src/games/stendhal/server/script/ServerShutdown.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2023 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -16,7 +16,7 @@ import games.stendhal.common.NotificationType; import games.stendhal.server.core.engine.SingletonRepository; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; /** diff --git a/src/games/stendhal/server/script/SetNPCPath.java b/src/games/stendhal/server/script/SetNPCPath.java index 2292163e83b..4ed96420383 100644 --- a/src/games/stendhal/server/script/SetNPCPath.java +++ b/src/games/stendhal/server/script/SetNPCPath.java @@ -1,3 +1,14 @@ +/*************************************************************************** + * Copyright © 2012-2024 - Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * 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 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ package games.stendhal.server.script; import java.util.LinkedList; @@ -8,7 +19,7 @@ import games.stendhal.common.NotificationType; import games.stendhal.server.core.pathfinder.FixedPath; import games.stendhal.server.core.pathfinder.Node; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.npc.NPCList; import games.stendhal.server.entity.npc.SpeakerNPC; import games.stendhal.server.entity.player.Player; diff --git a/src/games/stendhal/server/script/SetNPCPathReversible.java b/src/games/stendhal/server/script/SetNPCPathReversible.java index d366cc6a7da..4b1ff068a26 100644 --- a/src/games/stendhal/server/script/SetNPCPathReversible.java +++ b/src/games/stendhal/server/script/SetNPCPathReversible.java @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -14,7 +14,7 @@ import java.util.List; import games.stendhal.common.NotificationType; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.CollisionAction; import games.stendhal.server.entity.npc.NPCList; import games.stendhal.server.entity.npc.SpeakerNPC; diff --git a/src/games/stendhal/server/script/SetWelcomeText.java b/src/games/stendhal/server/script/SetWelcomeText.java index 8e7936862ae..f103203cdc9 100644 --- a/src/games/stendhal/server/script/SetWelcomeText.java +++ b/src/games/stendhal/server/script/SetWelcomeText.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -16,7 +16,7 @@ import games.stendhal.common.NotificationType; import games.stendhal.server.core.engine.StendhalRPRuleProcessor; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; /** diff --git a/src/games/stendhal/server/script/SokobanReload.java b/src/games/stendhal/server/script/SokobanReload.java index 99d8c0994d0..e19fba321d0 100644 --- a/src/games/stendhal/server/script/SokobanReload.java +++ b/src/games/stendhal/server/script/SokobanReload.java @@ -1,6 +1,17 @@ /* $Id$ * $Log$ */ +/*************************************************************************** + * Copyright © 2014-2024 - Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * 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 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ package games.stendhal.server.script; import java.io.BufferedReader; @@ -16,7 +27,7 @@ import games.stendhal.common.filter.FilterCriteria; import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.StendhalRPZone; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.Entity; import games.stendhal.server.entity.mapstuff.game.SokobanBoard; import games.stendhal.server.entity.player.Player; diff --git a/src/games/stendhal/server/script/SokobanWatcher.java b/src/games/stendhal/server/script/SokobanWatcher.java index 9a76812f7d4..e673707a9e3 100644 --- a/src/games/stendhal/server/script/SokobanWatcher.java +++ b/src/games/stendhal/server/script/SokobanWatcher.java @@ -1,3 +1,14 @@ +/*************************************************************************** + * Copyright © 2014-2024 - Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * 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 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ package games.stendhal.server.script; import java.lang.reflect.Field; @@ -14,7 +25,7 @@ import games.stendhal.server.core.engine.StendhalRPZone; import games.stendhal.server.core.events.TurnListener; import games.stendhal.server.core.events.TurnNotifier; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.mapstuff.area.Wall; import games.stendhal.server.entity.player.Player; diff --git a/src/games/stendhal/server/script/SpawnCreature.java b/src/games/stendhal/server/script/SpawnCreature.java index b693a5230e2..53fe30be37e 100644 --- a/src/games/stendhal/server/script/SpawnCreature.java +++ b/src/games/stendhal/server/script/SpawnCreature.java @@ -18,7 +18,7 @@ import games.stendhal.server.constants.StandardMessages; import games.stendhal.server.core.engine.StendhalRPZone; -import games.stendhal.server.core.scripting.AbstractAdminScript; +import games.stendhal.server.core.scripting.impl.AbstractAdminScript; import games.stendhal.server.entity.mapstuff.spawner.CreatureRespawnPoint; diff --git a/src/games/stendhal/server/script/SummonChest.java b/src/games/stendhal/server/script/SummonChest.java index dd4501e0afa..90d0a0a963e 100644 --- a/src/games/stendhal/server/script/SummonChest.java +++ b/src/games/stendhal/server/script/SummonChest.java @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2003-2011 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -16,7 +16,7 @@ import java.util.Map; import games.stendhal.common.MathHelper; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.mapstuff.chest.Chest; import games.stendhal.server.entity.player.Player; diff --git a/src/games/stendhal/server/script/SummonSpell.java b/src/games/stendhal/server/script/SummonSpell.java index 5a7537fec80..b6cfe693e60 100644 --- a/src/games/stendhal/server/script/SummonSpell.java +++ b/src/games/stendhal/server/script/SummonSpell.java @@ -1,22 +1,34 @@ +/*************************************************************************** + * Copyright © 2011-2024 - Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * 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 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ package games.stendhal.server.script; import java.util.List; import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.rule.EntityManager; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import games.stendhal.server.entity.spell.Spell; import marauroa.common.game.RPObject; import marauroa.common.game.RPObject.ID; import marauroa.common.game.RPSlot; + /** * Summon a spell into the spells slot for the given player. * * @author madmetzger * */ -public class SummonSpell extends ScriptImpl{ +public class SummonSpell extends ScriptImpl{ @Override public void execute(final Player admin, final List args) { diff --git a/src/games/stendhal/server/script/TPPNextPhase.java b/src/games/stendhal/server/script/TPPNextPhase.java index b8dd949878a..ba34f3d2dca 100644 --- a/src/games/stendhal/server/script/TPPNextPhase.java +++ b/src/games/stendhal/server/script/TPPNextPhase.java @@ -14,7 +14,7 @@ import java.util.List; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import games.stendhal.server.maps.quests.ThePiedPiper; diff --git a/src/games/stendhal/server/script/TPPShowQuestState.java b/src/games/stendhal/server/script/TPPShowQuestState.java index 5bfb551330d..0d712d79f65 100644 --- a/src/games/stendhal/server/script/TPPShowQuestState.java +++ b/src/games/stendhal/server/script/TPPShowQuestState.java @@ -15,7 +15,7 @@ import java.util.List; import games.stendhal.server.core.rp.StendhalQuestSystem; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import games.stendhal.server.maps.quests.ThePiedPiper; import games.stendhal.server.util.TimeUtil; diff --git a/src/games/stendhal/server/script/TeleportAllPlayers.java b/src/games/stendhal/server/script/TeleportAllPlayers.java index 82c47c996c6..85a8cd92143 100644 --- a/src/games/stendhal/server/script/TeleportAllPlayers.java +++ b/src/games/stendhal/server/script/TeleportAllPlayers.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2011 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -17,7 +17,7 @@ import games.stendhal.common.NotificationType; import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.StendhalRPZone; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import marauroa.server.game.container.PlayerEntry; import marauroa.server.game.container.PlayerEntryContainer; diff --git a/src/games/stendhal/server/script/TeleportNPC.java b/src/games/stendhal/server/script/TeleportNPC.java index 2c810887a96..c0c784aa44f 100644 --- a/src/games/stendhal/server/script/TeleportNPC.java +++ b/src/games/stendhal/server/script/TeleportNPC.java @@ -1,6 +1,17 @@ /* $Id$ * $Log$ */ +/*************************************************************************** + * Copyright © 2012-2024 - Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * 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 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ package games.stendhal.server.script; import java.util.List; @@ -9,7 +20,7 @@ import games.stendhal.common.NotificationType; import games.stendhal.server.core.engine.StendhalRPWorld; import games.stendhal.server.core.engine.StendhalRPZone; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.npc.NPCList; import games.stendhal.server.entity.npc.SpeakerNPC; import games.stendhal.server.entity.player.Player; diff --git a/src/games/stendhal/server/script/TestShowItemList.java b/src/games/stendhal/server/script/TestShowItemList.java index cddada18dcc..1596ceeaf2e 100644 --- a/src/games/stendhal/server/script/TestShowItemList.java +++ b/src/games/stendhal/server/script/TestShowItemList.java @@ -19,7 +19,7 @@ import games.stendhal.common.NotificationType; import games.stendhal.server.core.engine.SingletonRepository; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.item.Item; import games.stendhal.server.entity.item.ItemInformation; import games.stendhal.server.entity.npc.shop.ShopType; diff --git a/src/games/stendhal/server/script/Unblock.java b/src/games/stendhal/server/script/Unblock.java index 64ed99b00d4..ddddccea23a 100644 --- a/src/games/stendhal/server/script/Unblock.java +++ b/src/games/stendhal/server/script/Unblock.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -23,7 +23,7 @@ import games.stendhal.server.core.engine.StendhalRPZone; import games.stendhal.server.core.events.TurnListener; import games.stendhal.server.core.events.TurnNotifier; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import games.stendhal.server.util.Area; diff --git a/src/games/stendhal/server/script/UnblockTradeTable.java b/src/games/stendhal/server/script/UnblockTradeTable.java index 5c16d464aa0..fac16cb8de4 100644 --- a/src/games/stendhal/server/script/UnblockTradeTable.java +++ b/src/games/stendhal/server/script/UnblockTradeTable.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -23,7 +23,7 @@ import games.stendhal.server.core.engine.StendhalRPZone; import games.stendhal.server.core.events.TurnListener; import games.stendhal.server.core.events.TurnNotifier; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; import games.stendhal.server.util.Area; diff --git a/src/games/stendhal/server/script/WhereWho.java b/src/games/stendhal/server/script/WhereWho.java index a9247908aaf..f6fc6b2907d 100644 --- a/src/games/stendhal/server/script/WhereWho.java +++ b/src/games/stendhal/server/script/WhereWho.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -19,7 +19,7 @@ import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.StendhalRPZone; import games.stendhal.server.core.engine.Task; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.player.Player; /** diff --git a/src/games/stendhal/server/script/ZoneCollisionCheck.java b/src/games/stendhal/server/script/ZoneCollisionCheck.java index e1ac611a480..6671e468215 100644 --- a/src/games/stendhal/server/script/ZoneCollisionCheck.java +++ b/src/games/stendhal/server/script/ZoneCollisionCheck.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -18,7 +18,7 @@ import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.StendhalRPWorld; import games.stendhal.server.core.engine.StendhalRPZone; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.Entity; import games.stendhal.server.entity.player.Player; import marauroa.common.game.IRPZone; diff --git a/src/games/stendhal/server/script/ZoneStatistics.java b/src/games/stendhal/server/script/ZoneStatistics.java index 78b08f88e5d..fd578474d11 100644 --- a/src/games/stendhal/server/script/ZoneStatistics.java +++ b/src/games/stendhal/server/script/ZoneStatistics.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2010 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -17,7 +17,7 @@ import games.stendhal.server.core.engine.StendhalRPWorld; import games.stendhal.server.core.engine.StendhalRPZone; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.mapstuff.spawner.CreatureRespawnPoint; import games.stendhal.server.entity.player.Player; import games.stendhal.server.util.ObjectCounter; diff --git a/src/games/stendhal/tools/item/DumpItems.java b/src/games/stendhal/tools/item/DumpItems.java index cc9eda85137..cd89f91beb7 100644 --- a/src/games/stendhal/tools/item/DumpItems.java +++ b/src/games/stendhal/tools/item/DumpItems.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright © 2020 - Arianne * + * Copyright © 2020-2024 - Arianne * *************************************************************************** *************************************************************************** * * @@ -26,7 +26,7 @@ import games.stendhal.server.core.rule.defaultruleset.DefaultCreature; import games.stendhal.server.core.rule.defaultruleset.DefaultItem; import games.stendhal.server.core.rule.defaultruleset.LowerCaseMap; -import games.stendhal.server.core.scripting.ScriptImpl; +import games.stendhal.server.core.scripting.impl.ScriptImpl; import games.stendhal.server.entity.creature.impl.DropItem; /**