Skip to content

Commit

Permalink
Change packages for penalties.
Browse files Browse the repository at this point in the history 
So actions.types remains soemwhat consistent for now.
  • Loading branch information
@asofold
asofold committed Apr 17, 2018
1 parent f6d00c3 commit ad5be20
Show file tree
Hide file tree
Showing 21 changed files with 36 additions and 31 deletions.
6 changes: 3 additions & 3 deletions NCPCore/src/main/java/fr/neatmonster/nocheatplus/actions/ActionFactory.java
View file
Expand Up @@ -18,11 +18,11 @@

import fr.neatmonster.nocheatplus.actions.types.CancelAction;
import fr.neatmonster.nocheatplus.actions.types.LogAction;
import fr.neatmonster.nocheatplus.actions.types.penalty.CancelPenalty;
import fr.neatmonster.nocheatplus.actions.types.penalty.PenaltyAction;
import fr.neatmonster.nocheatplus.actions.types.penalty.PenaltyNode;
import fr.neatmonster.nocheatplus.actions.types.PenaltyAction;
import fr.neatmonster.nocheatplus.checks.ViolationData;
import fr.neatmonster.nocheatplus.logging.StaticLog;
import fr.neatmonster.nocheatplus.penalties.CancelPenalty;
import fr.neatmonster.nocheatplus.penalties.PenaltyNode;
import fr.neatmonster.nocheatplus.utilities.CheckUtils;

/**
Expand Down
5 changes: 2 additions & 3 deletions NCPCore/src/main/java/fr/neatmonster/nocheatplus/actions/types/CancelAction.java
View file
Expand Up @@ -16,9 +16,8 @@

import fr.neatmonster.nocheatplus.actions.AbstractActionList;
import fr.neatmonster.nocheatplus.actions.ActionData;
import fr.neatmonster.nocheatplus.actions.types.penalty.CancelPenalty;
import fr.neatmonster.nocheatplus.actions.types.penalty.PenaltyAction;
import fr.neatmonster.nocheatplus.actions.types.penalty.PenaltyNode;
import fr.neatmonster.nocheatplus.penalties.CancelPenalty;
import fr.neatmonster.nocheatplus.penalties.PenaltyNode;

/**
* Sole purpose is to indicate that an action is to be cancelled 100% (as
Expand Down
4 changes: 3 additions & 1 deletion .../actions/types/penalty/PenaltyAction.java → ...heatplus/actions/types/PenaltyAction.java
View file
Expand Up @@ -12,11 +12,13 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.neatmonster.nocheatplus.actions.types.penalty;
package fr.neatmonster.nocheatplus.actions.types;

import fr.neatmonster.nocheatplus.actions.AbstractActionList;
import fr.neatmonster.nocheatplus.actions.Action;
import fr.neatmonster.nocheatplus.actions.ActionData;
import fr.neatmonster.nocheatplus.penalties.IPenaltyList;
import fr.neatmonster.nocheatplus.penalties.PenaltyNode;

/**
* Penalty action, referencing a certain penalty defined elsewhere. <br>
Expand Down
2 changes: 1 addition & 1 deletion NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/Check.java
View file
Expand Up @@ -22,11 +22,11 @@

import fr.neatmonster.nocheatplus.NCPAPIProvider;
import fr.neatmonster.nocheatplus.actions.ActionList;
import fr.neatmonster.nocheatplus.actions.types.penalty.IPenaltyList;
import fr.neatmonster.nocheatplus.compat.MCAccess;
import fr.neatmonster.nocheatplus.components.debug.IDebugPlayer;
import fr.neatmonster.nocheatplus.components.registry.event.IGenericInstanceHandle;
import fr.neatmonster.nocheatplus.hooks.NCPHookManager;
import fr.neatmonster.nocheatplus.penalties.IPenaltyList;
import fr.neatmonster.nocheatplus.players.DataManager;
import fr.neatmonster.nocheatplus.players.ExecutionHistory;
import fr.neatmonster.nocheatplus.players.IPlayerData;
Expand Down
10 changes: 7 additions & 3 deletions NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/ViolationData.java
View file
Expand Up @@ -24,13 +24,13 @@
import fr.neatmonster.nocheatplus.actions.ActionList;
import fr.neatmonster.nocheatplus.actions.ParameterName;
import fr.neatmonster.nocheatplus.actions.types.GenericLogAction;
import fr.neatmonster.nocheatplus.actions.types.penalty.DefaultPenaltyList;
import fr.neatmonster.nocheatplus.actions.types.penalty.IPenaltyList;
import fr.neatmonster.nocheatplus.actions.types.penalty.PenaltyAction;
import fr.neatmonster.nocheatplus.actions.types.PenaltyAction;
import fr.neatmonster.nocheatplus.checks.access.IViolationInfo;
import fr.neatmonster.nocheatplus.compat.BridgeHealth;
import fr.neatmonster.nocheatplus.logging.StaticLog;
import fr.neatmonster.nocheatplus.logging.StreamID;
import fr.neatmonster.nocheatplus.penalties.DefaultPenaltyList;
import fr.neatmonster.nocheatplus.penalties.IPenaltyList;
import fr.neatmonster.nocheatplus.permissions.RegisteredPermission;

/**
Expand Down Expand Up @@ -193,6 +193,10 @@ public void executeActions() {
if (!penaltyList.isEmpty()) {
penaltyList.applyAllApplicablePenalties(player, true);
}
/*
* TODO: Concept for penalties running actions. E.g.
* penaltyList.applyAllApplicablePenalties(ViolationData, true);
*/
} catch (final Exception e) {
StaticLog.logSevere(e);
// On exceptions cancel events.
Expand Down
2 changes: 1 addition & 1 deletion NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/Critical.java
View file
Expand Up @@ -23,7 +23,6 @@

import fr.neatmonster.nocheatplus.NCPAPIProvider;
import fr.neatmonster.nocheatplus.actions.ParameterName;
import fr.neatmonster.nocheatplus.actions.types.penalty.IPenaltyList;
import fr.neatmonster.nocheatplus.checks.Check;
import fr.neatmonster.nocheatplus.checks.CheckType;
import fr.neatmonster.nocheatplus.checks.ViolationData;
Expand All @@ -33,6 +32,7 @@
import fr.neatmonster.nocheatplus.checks.moving.model.PlayerMoveInfo;
import fr.neatmonster.nocheatplus.checks.moving.util.AuxMoving;
import fr.neatmonster.nocheatplus.checks.moving.util.MovingUtil;
import fr.neatmonster.nocheatplus.penalties.IPenaltyList;
import fr.neatmonster.nocheatplus.players.IPlayerData;
import fr.neatmonster.nocheatplus.utilities.StringUtil;
import fr.neatmonster.nocheatplus.utilities.map.BlockProperties;
Expand Down
4 changes: 2 additions & 2 deletions NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/FightListener.java
View file
Expand Up @@ -34,8 +34,6 @@
import org.bukkit.inventory.ItemStack;

import fr.neatmonster.nocheatplus.NCPAPIProvider;
import fr.neatmonster.nocheatplus.actions.types.penalty.DefaultPenaltyList;
import fr.neatmonster.nocheatplus.actions.types.penalty.IPenaltyList;
import fr.neatmonster.nocheatplus.checks.CheckListener;
import fr.neatmonster.nocheatplus.checks.CheckType;
import fr.neatmonster.nocheatplus.checks.combined.Combined;
Expand All @@ -62,6 +60,8 @@
import fr.neatmonster.nocheatplus.components.registry.event.IGenericInstanceHandle;
import fr.neatmonster.nocheatplus.components.registry.factory.IFactoryOne;
import fr.neatmonster.nocheatplus.components.registry.feature.JoinLeaveListener;
import fr.neatmonster.nocheatplus.penalties.DefaultPenaltyList;
import fr.neatmonster.nocheatplus.penalties.IPenaltyList;
import fr.neatmonster.nocheatplus.permissions.Permissions;
import fr.neatmonster.nocheatplus.players.DataManager;
import fr.neatmonster.nocheatplus.players.IPlayerData;
Expand Down
2 changes: 1 addition & 1 deletion ...ctions/types/penalty/AbstractPenalty.java → ...ocheatplus/penalties/AbstractPenalty.java
View file
Expand Up @@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.neatmonster.nocheatplus.actions.types.penalty;
package fr.neatmonster.nocheatplus.penalties;

/**
* Convenience implementation for input-specific effects (other than Player).
Expand Down
2 changes: 1 addition & 1 deletion .../types/penalty/AbstractPlayerPenalty.java → ...plus/penalties/AbstractPlayerPenalty.java
View file
Expand Up @@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.neatmonster.nocheatplus.actions.types.penalty;
package fr.neatmonster.nocheatplus.penalties;

import org.bukkit.entity.Player;

Expand Down
2 changes: 1 addition & 1 deletion .../actions/types/penalty/CancelPenalty.java → .../nocheatplus/penalties/CancelPenalty.java
View file
Expand Up @@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.neatmonster.nocheatplus.actions.types.penalty;
package fr.neatmonster.nocheatplus.penalties;

/**
* This penalty does nothing. It's presence solely indicates that an action is
Expand Down
2 changes: 1 addition & 1 deletion ...ons/types/penalty/DefaultPenaltyList.java → ...eatplus/penalties/DefaultPenaltyList.java
View file
Expand Up @@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.neatmonster.nocheatplus.actions.types.penalty;
package fr.neatmonster.nocheatplus.penalties;

import java.util.Iterator;
import java.util.LinkedHashMap;
Expand Down
2 changes: 1 addition & 1 deletion ...ctions/types/penalty/IPenaltyFactory.java → ...ocheatplus/penalties/IPenaltyFactory.java
View file
Expand Up @@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.neatmonster.nocheatplus.actions.types.penalty;
package fr.neatmonster.nocheatplus.penalties;

public interface IPenaltyFactory {

Expand Down
2 changes: 1 addition & 1 deletion ...types/penalty/IPenaltyFactoryFactory.java → ...lus/penalties/IPenaltyFactoryFactory.java
View file
Expand Up @@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.neatmonster.nocheatplus.actions.types.penalty;
package fr.neatmonster.nocheatplus.penalties;

import org.bukkit.configuration.MemorySection;

Expand Down
2 changes: 1 addition & 1 deletion ...s/actions/types/penalty/IPenaltyList.java → ...r/nocheatplus/penalties/IPenaltyList.java
View file
Expand Up @@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.neatmonster.nocheatplus.actions.types.penalty;
package fr.neatmonster.nocheatplus.penalties;

/**
* Contain applicable penalty types that need to be handled outside of
Expand Down
2 changes: 1 addition & 1 deletion ...ions/types/penalty/IPenaltyReference.java → ...heatplus/penalties/IPenaltyReference.java
View file
Expand Up @@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.neatmonster.nocheatplus.actions.types.penalty;
package fr.neatmonster.nocheatplus.penalties;

/**
* A reference to a penalty by id. Concept-wise this is meant for an early
Expand Down
2 changes: 1 addition & 1 deletion ...atplus/actions/types/penalty/Penalty.java → ...onster/nocheatplus/penalties/Penalty.java
View file
Expand Up @@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.neatmonster.nocheatplus.actions.types.penalty;
package fr.neatmonster.nocheatplus.penalties;

/**
* Penalty for one type of input.
Expand Down
2 changes: 1 addition & 1 deletion ...us/actions/types/penalty/PenaltyNode.java → ...er/nocheatplus/penalties/PenaltyNode.java
View file
Expand Up @@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.neatmonster.nocheatplus.actions.types.penalty;
package fr.neatmonster.nocheatplus.penalties;

import java.util.Collection;
import java.util.Random;
Expand Down
4 changes: 2 additions & 2 deletions ...nalty/fight/FightPenaltyEntityDamage.java → ...lties/fight/FightPenaltyEntityDamage.java
View file
Expand Up @@ -12,11 +12,11 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.neatmonster.nocheatplus.actions.types.penalty.fight;
package fr.neatmonster.nocheatplus.penalties.fight;

import org.bukkit.event.entity.EntityDamageEvent;

import fr.neatmonster.nocheatplus.actions.types.penalty.AbstractPenalty;
import fr.neatmonster.nocheatplus.penalties.AbstractPenalty;

/**
* Basic fight specific penalty.
Expand Down
4 changes: 2 additions & 2 deletions ...ght/FightPenaltyEntityDamageByEntity.java → ...ght/FightPenaltyEntityDamageByEntity.java
View file
Expand Up @@ -12,11 +12,11 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.neatmonster.nocheatplus.actions.types.penalty.fight;
package fr.neatmonster.nocheatplus.penalties.fight;

import org.bukkit.event.entity.EntityDamageByEntityEvent;

import fr.neatmonster.nocheatplus.actions.types.penalty.AbstractPenalty;
import fr.neatmonster.nocheatplus.penalties.AbstractPenalty;

/**
* Specifically target damage done by entities to entities.
Expand Down
2 changes: 1 addition & 1 deletion ...lty/fight/FightPenaltyMultiplyDamage.java → ...ies/fight/FightPenaltyMultiplyDamage.java
View file
Expand Up @@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.neatmonster.nocheatplus.actions.types.penalty.fight;
package fr.neatmonster.nocheatplus.penalties.fight;

import org.bukkit.event.entity.EntityDamageEvent;

Expand Down
4 changes: 2 additions & 2 deletions NCPPlugin/src/test/java/fr/neatmonster/nocheatplus/test/TestActions.java
View file
Expand Up @@ -22,12 +22,12 @@
import fr.neatmonster.nocheatplus.PluginTests;
import fr.neatmonster.nocheatplus.actions.Action;
import fr.neatmonster.nocheatplus.actions.ActionList;
import fr.neatmonster.nocheatplus.actions.types.penalty.PenaltyAction;
import fr.neatmonster.nocheatplus.actions.types.penalty.PenaltyNode;
import fr.neatmonster.nocheatplus.actions.types.PenaltyAction;
import fr.neatmonster.nocheatplus.checks.ViolationData;
import fr.neatmonster.nocheatplus.config.ConfPaths;
import fr.neatmonster.nocheatplus.config.ConfigFile;
import fr.neatmonster.nocheatplus.config.DefaultConfig;
import fr.neatmonster.nocheatplus.penalties.PenaltyNode;
import fr.neatmonster.nocheatplus.permissions.PermissionRegistry;

public class TestActions {
Expand Down

0 comments on commit ad5be20

Please sign in to comment.