From f3973cd0438e1c385bc94a6b91250bd657c36449 Mon Sep 17 00:00:00 2001 From: asofold Date: Tue, 27 Jan 2015 00:50:30 +0100 Subject: [PATCH] Move the net package inside of checks. --- .../{ => checks}/net/protocollib/FlyingFrequency.java | 6 +++--- .../{ => checks}/net/protocollib/ProtocolLibComponent.java | 4 ++-- .../{ => checks}/net/protocollib/SoundDistance.java | 6 +++--- .../neatmonster/nocheatplus/checks/moving/MorePackets.java | 2 +- .../neatmonster/nocheatplus/{ => checks}/net/NetConfig.java | 2 +- .../nocheatplus/{ => checks}/net/NetConfigCache.java | 2 +- .../neatmonster/nocheatplus/{ => checks}/net/NetStatic.java | 2 +- .../nocheatplus/compat/DefaultComponentFactory.java | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) rename NCPCompatProtocolLib/src/main/java/fr/neatmonster/nocheatplus/{ => checks}/net/protocollib/FlyingFrequency.java (97%) rename NCPCompatProtocolLib/src/main/java/fr/neatmonster/nocheatplus/{ => checks}/net/protocollib/ProtocolLibComponent.java (97%) rename NCPCompatProtocolLib/src/main/java/fr/neatmonster/nocheatplus/{ => checks}/net/protocollib/SoundDistance.java (92%) rename NCPCore/src/main/java/fr/neatmonster/nocheatplus/{ => checks}/net/NetConfig.java (96%) rename NCPCore/src/main/java/fr/neatmonster/nocheatplus/{ => checks}/net/NetConfigCache.java (90%) rename NCPCore/src/main/java/fr/neatmonster/nocheatplus/{ => checks}/net/NetStatic.java (99%) diff --git a/NCPCompatProtocolLib/src/main/java/fr/neatmonster/nocheatplus/net/protocollib/FlyingFrequency.java b/NCPCompatProtocolLib/src/main/java/fr/neatmonster/nocheatplus/checks/net/protocollib/FlyingFrequency.java similarity index 97% rename from NCPCompatProtocolLib/src/main/java/fr/neatmonster/nocheatplus/net/protocollib/FlyingFrequency.java rename to NCPCompatProtocolLib/src/main/java/fr/neatmonster/nocheatplus/checks/net/protocollib/FlyingFrequency.java index 34264db1..faeb7d89 100644 --- a/NCPCompatProtocolLib/src/main/java/fr/neatmonster/nocheatplus/net/protocollib/FlyingFrequency.java +++ b/NCPCompatProtocolLib/src/main/java/fr/neatmonster/nocheatplus/checks/net/protocollib/FlyingFrequency.java @@ -1,4 +1,4 @@ -package fr.neatmonster.nocheatplus.net.protocollib; +package fr.neatmonster.nocheatplus.checks.net.protocollib; import java.util.HashMap; import java.util.List; @@ -14,10 +14,10 @@ import com.comphenix.protocol.events.PacketEvent; import fr.neatmonster.nocheatplus.NCPAPIProvider; import fr.neatmonster.nocheatplus.checks.moving.MovingData; +import fr.neatmonster.nocheatplus.checks.net.NetConfig; +import fr.neatmonster.nocheatplus.checks.net.NetConfigCache; import fr.neatmonster.nocheatplus.components.JoinLeaveListener; import fr.neatmonster.nocheatplus.logging.Streams; -import fr.neatmonster.nocheatplus.net.NetConfig; -import fr.neatmonster.nocheatplus.net.NetConfigCache; import fr.neatmonster.nocheatplus.stats.Counters; import fr.neatmonster.nocheatplus.time.monotonic.Monotonic; import fr.neatmonster.nocheatplus.utilities.ActionFrequency; diff --git a/NCPCompatProtocolLib/src/main/java/fr/neatmonster/nocheatplus/net/protocollib/ProtocolLibComponent.java b/NCPCompatProtocolLib/src/main/java/fr/neatmonster/nocheatplus/checks/net/protocollib/ProtocolLibComponent.java similarity index 97% rename from NCPCompatProtocolLib/src/main/java/fr/neatmonster/nocheatplus/net/protocollib/ProtocolLibComponent.java rename to NCPCompatProtocolLib/src/main/java/fr/neatmonster/nocheatplus/checks/net/protocollib/ProtocolLibComponent.java index 9cda255f..41ae7e31 100644 --- a/NCPCompatProtocolLib/src/main/java/fr/neatmonster/nocheatplus/net/protocollib/ProtocolLibComponent.java +++ b/NCPCompatProtocolLib/src/main/java/fr/neatmonster/nocheatplus/checks/net/protocollib/ProtocolLibComponent.java @@ -1,4 +1,4 @@ -package fr.neatmonster.nocheatplus.net.protocollib; +package fr.neatmonster.nocheatplus.checks.net.protocollib; import java.util.ArrayList; import java.util.LinkedList; @@ -12,13 +12,13 @@ import com.comphenix.protocol.ProtocolManager; import com.comphenix.protocol.events.PacketAdapter; import fr.neatmonster.nocheatplus.NCPAPIProvider; +import fr.neatmonster.nocheatplus.checks.net.NetConfigCache; import fr.neatmonster.nocheatplus.components.DisableListener; import fr.neatmonster.nocheatplus.components.INotifyReload; import fr.neatmonster.nocheatplus.components.NoCheatPlusAPI; import fr.neatmonster.nocheatplus.config.ConfPaths; import fr.neatmonster.nocheatplus.config.ConfigManager; import fr.neatmonster.nocheatplus.logging.StaticLog; -import fr.neatmonster.nocheatplus.net.NetConfigCache; import fr.neatmonster.nocheatplus.utilities.StringUtil; /** diff --git a/NCPCompatProtocolLib/src/main/java/fr/neatmonster/nocheatplus/net/protocollib/SoundDistance.java b/NCPCompatProtocolLib/src/main/java/fr/neatmonster/nocheatplus/checks/net/protocollib/SoundDistance.java similarity index 92% rename from NCPCompatProtocolLib/src/main/java/fr/neatmonster/nocheatplus/net/protocollib/SoundDistance.java rename to NCPCompatProtocolLib/src/main/java/fr/neatmonster/nocheatplus/checks/net/protocollib/SoundDistance.java index 3929008b..a3f2b58c 100644 --- a/NCPCompatProtocolLib/src/main/java/fr/neatmonster/nocheatplus/net/protocollib/SoundDistance.java +++ b/NCPCompatProtocolLib/src/main/java/fr/neatmonster/nocheatplus/checks/net/protocollib/SoundDistance.java @@ -1,4 +1,4 @@ -package fr.neatmonster.nocheatplus.net.protocollib; +package fr.neatmonster.nocheatplus.checks.net.protocollib; import org.bukkit.Location; import org.bukkit.entity.Player; @@ -10,8 +10,8 @@ import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketEvent; import com.comphenix.protocol.reflect.StructureModifier; -import fr.neatmonster.nocheatplus.net.NetConfig; -import fr.neatmonster.nocheatplus.net.NetConfigCache; +import fr.neatmonster.nocheatplus.checks.net.NetConfig; +import fr.neatmonster.nocheatplus.checks.net.NetConfigCache; import fr.neatmonster.nocheatplus.utilities.TrigUtil; public class SoundDistance extends PacketAdapter { diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MorePackets.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MorePackets.java index d9c692da..c8991bde 100644 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MorePackets.java +++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MorePackets.java @@ -10,7 +10,7 @@ import fr.neatmonster.nocheatplus.actions.ParameterName; import fr.neatmonster.nocheatplus.checks.Check; import fr.neatmonster.nocheatplus.checks.CheckType; import fr.neatmonster.nocheatplus.checks.ViolationData; -import fr.neatmonster.nocheatplus.net.NetStatic; +import fr.neatmonster.nocheatplus.checks.net.NetStatic; import fr.neatmonster.nocheatplus.utilities.PlayerLocation; import fr.neatmonster.nocheatplus.utilities.StringUtil; diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/net/NetConfig.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetConfig.java similarity index 96% rename from NCPCore/src/main/java/fr/neatmonster/nocheatplus/net/NetConfig.java rename to NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetConfig.java index e8cfbab1..39c4d613 100644 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/net/NetConfig.java +++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetConfig.java @@ -1,4 +1,4 @@ -package fr.neatmonster.nocheatplus.net; +package fr.neatmonster.nocheatplus.checks.net; import fr.neatmonster.nocheatplus.config.ConfPaths; import fr.neatmonster.nocheatplus.config.ConfigFile; diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/net/NetConfigCache.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetConfigCache.java similarity index 90% rename from NCPCore/src/main/java/fr/neatmonster/nocheatplus/net/NetConfigCache.java rename to NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetConfigCache.java index c36d4b1a..04f77e20 100644 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/net/NetConfigCache.java +++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetConfigCache.java @@ -1,4 +1,4 @@ -package fr.neatmonster.nocheatplus.net; +package fr.neatmonster.nocheatplus.checks.net; import fr.neatmonster.nocheatplus.config.ConfigFile; import fr.neatmonster.nocheatplus.config.WorldConfigCache; diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/net/NetStatic.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetStatic.java similarity index 99% rename from NCPCore/src/main/java/fr/neatmonster/nocheatplus/net/NetStatic.java rename to NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetStatic.java index 48df51a8..41ea05a9 100644 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/net/NetStatic.java +++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/net/NetStatic.java @@ -1,4 +1,4 @@ -package fr.neatmonster.nocheatplus.net; +package fr.neatmonster.nocheatplus.checks.net; import java.util.List; diff --git a/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/compat/DefaultComponentFactory.java b/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/compat/DefaultComponentFactory.java index 7468e2c7..3228e616 100644 --- a/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/compat/DefaultComponentFactory.java +++ b/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/compat/DefaultComponentFactory.java @@ -9,10 +9,10 @@ import fr.neatmonster.nocheatplus.NCPAPIProvider; import fr.neatmonster.nocheatplus.NoCheatPlus; import fr.neatmonster.nocheatplus.checks.inventory.FastConsume; import fr.neatmonster.nocheatplus.checks.inventory.Gutenberg; +import fr.neatmonster.nocheatplus.checks.net.protocollib.ProtocolLibComponent; import fr.neatmonster.nocheatplus.config.ConfPaths; import fr.neatmonster.nocheatplus.config.ConfigManager; import fr.neatmonster.nocheatplus.logging.StaticLog; -import fr.neatmonster.nocheatplus.net.protocollib.ProtocolLibComponent; /** * Default factory for add-in components which might only be available under certain circumstances.