From 5d41f5b939ea0c9f2c707601d87a90bd0ad0d552 Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 29 Jan 2025 13:20:04 -0500 Subject: [PATCH] Rename Namespace to kamkeel.npcs --- .../kamkeel/network/enums/EnumDataPacket.java | 4 ---- .../kamkeel/{ => npcs}/addon/AddonManager.java | 6 +++--- .../java/kamkeel/{ => npcs}/addon/DBCAddon.java | 3 +-- .../java/kamkeel/{ => npcs}/addon/GeckoAddon.java | 4 ++-- .../{ => npcs}/addon/client/DBCClient.java | 7 +------ .../{ => npcs}/addon/client/GeckoAddonClient.java | 2 +- .../{ => npcs}/command/AnimationCommand.java | 2 +- .../kamkeel/{ => npcs}/command/CloneCommand.java | 15 +++++++-------- .../{ => npcs}/command/CommandCommand.java | 2 +- .../{ => npcs}/command/CommandKamkeel.java | 4 ++-- .../{ => npcs}/command/CommandKamkeelBase.java | 2 +- .../kamkeel/{ => npcs}/command/ConfigCommand.java | 2 +- .../{ => npcs}/command/DialogCategoryCommand.java | 2 +- .../kamkeel/{ => npcs}/command/DialogCommand.java | 2 +- .../{ => npcs}/command/FactionCommand.java | 5 ++--- .../kamkeel/{ => npcs}/command/HelpCommand.java | 2 +- .../kamkeel/{ => npcs}/command/NpcCommand.java | 2 +- .../{ => npcs}/command/OverlayCommand.java | 2 +- .../{ => npcs}/command/QuestCategoryCommand.java | 2 +- .../kamkeel/{ => npcs}/command/QuestCommand.java | 6 ++---- .../kamkeel/{ => npcs}/command/ScriptCommand.java | 2 +- .../kamkeel/{ => npcs}/command/SlayCommand.java | 5 ++--- .../command/profile/CommandHelpProfile.java | 2 +- .../command/profile/CommandProfile.java | 4 ++-- .../command/profile/CommandProfileBase.java | 2 +- .../command/profile/CommandProfileChange.java | 6 +++--- .../{ => npcs}/controllers/ProfileController.java | 8 ++++---- .../{ => npcs}/controllers/data/CNPCData.java | 2 +- .../{ => npcs}/controllers/data/IProfileData.java | 2 +- .../{ => npcs}/controllers/data/Profile.java | 2 +- .../kamkeel/{ => npcs}/controllers/data/Slot.java | 4 +--- .../kamkeel/{ => npcs}/developer/Developer.java | 2 +- .../{ => npcs}/network/AbstractPacket.java | 5 +---- .../kamkeel/{ => npcs}/network/KamUtilServer.java | 6 +++--- .../{ => npcs}/network/LargeAbstractPacket.java | 4 +--- .../kamkeel/{ => npcs}/network/PacketChannel.java | 4 ++-- .../kamkeel/{ => npcs}/network/PacketHandler.java | 12 +++++------- .../network/enums/EnumClientPacket.java | 2 +- .../npcs/network/enums/EnumDataPacket.java | 4 ++++ .../{ => npcs}/network/enums/EnumInfoPacket.java | 2 +- .../{ => npcs}/network/enums/EnumPacketType.java | 2 +- .../{ => npcs}/network/packets/LoginPacket.java | 12 ++++++------ .../network/packets/client/ChatBubblePacket.java | 10 +++++----- .../network/packets/client/ChatPacket.java | 10 +++++----- .../packets/client/ConfigCommandPacket.java | 10 +++++----- .../network/packets/client/DBCFormPacket.java | 10 +++++----- .../network/packets/client/DeleteNpcPacket.java | 10 +++++----- .../network/packets/client/DialogDummyPacket.java | 10 +++++----- .../network/packets/client/DialogPacket.java | 10 +++++----- .../packets/client/DisableMouseInputPacket.java | 10 +++++----- .../network/packets/client/EditNpcPacket.java | 10 +++++----- .../network/packets/client/LargeNBTEndPacket.java | 10 +++++----- .../packets/client/LargeNBTPartPacket.java | 10 +++++----- .../network/packets/client/MarkDataPacket.java | 10 +++++----- .../network/packets/client/MessagePacket.java | 11 +++++------ .../network/packets/client/OpenBookPacket.java | 10 +++++----- .../client/OverlayQuestTrackingPacket.java | 10 +++++----- .../network/packets/client/ParticlePacket.java | 10 +++++----- .../network/packets/client/PartyDataPacket.java | 10 +++++----- .../client/PlayerUpdateSkinOverlaysPacket.java | 10 +++++----- .../packets/client/QuestCompletionPacket.java | 10 +++++----- .../network/packets/client/RolePacket.java | 10 +++++----- .../packets/client/ScriptOverlayClosePacket.java | 10 +++++----- .../packets/client/ScriptOverlayDataPacket.java | 10 +++++----- .../packets/client/ScriptedParticlePacket.java | 10 +++++----- .../packets/client/ScrollSelectedPacket.java | 10 +++++----- .../packets/client/StopSoundForPacket.java | 10 +++++----- .../network/packets/client/StopSoundsPacket.java | 10 +++++----- .../packets/client/SwingPlayerArmPacket.java | 10 +++++----- .../network/packets/client/TeleporterPacket.java | 10 +++++----- .../packets/client/UpdateAnimationsPacket.java | 10 +++++----- .../network/packets/client/UpdateNpcPacket.java | 10 +++++----- .../packets/client/VillagerListPacket.java | 11 +++++------ .../packets/client/gui/ClonerGUIPacket.java | 10 +++++----- .../packets/client/gui/GUIClonerPacket.java | 10 +++++----- .../packets/client/gui/GuiClosePacket.java | 10 +++++----- .../network/packets/client/gui/GuiDataPacket.java | 10 +++++----- .../packets/client/gui/GuiErrorPacket.java | 10 +++++----- .../network/packets/client/gui/GuiPacket.java | 10 +++++----- .../packets/client/gui/GuiRedstonePacket.java | 10 +++++----- .../packets/client/gui/GuiWaypointPacket.java | 10 +++++----- .../packets/client/gui/IsGuiOpenPacket.java | 10 +++++----- .../client/sound/ContinueSoundsPacket.java | 10 +++++----- .../packets/client/sound/PauseSoundsPacket.java | 10 +++++----- .../packets/client/sound/PlayMusicPacket.java | 10 +++++----- .../packets/client/sound/PlaySoundPacket.java | 10 +++++----- .../client/sound/PlaySoundToNoIdPacket.java | 10 +++++----- .../packets/client/sound/PlaySoundToPacket.java | 10 +++++----- .../packets/client/sync/SyncAddPacket.java | 10 +++++----- .../packets/client/sync/SyncConfigPacket.java | 10 +++++----- .../packets/client/sync/SyncEndPacket.java | 10 +++++----- .../packets/client/sync/SyncPlayerPacket.java | 10 +++++----- .../packets/client/sync/SyncRecipesAddPacket.java | 10 +++++----- .../sync/SyncRecipesCarpentryBenchPacket.java | 10 +++++----- .../client/sync/SyncRecipesWorkbenchPacket.java | 10 +++++----- .../packets/client/sync/SyncRemovePacket.java | 10 +++++----- .../packets/client/sync/SyncUpdatePacket.java | 10 +++++----- .../packets/client/sync/SyncWeaponPacket.java | 10 +++++----- .../packets/large/LargeScrollDataPacket.java | 12 ++++++------ .../packets/large/LargeScrollGroupPacket.java | 12 ++++++------ .../packets/large/LargeScrollListPacket.java | 12 ++++++------ .../kamkeel/{ => npcs}/util/ByteBufUtils.java | 2 +- .../kamkeel/{ => npcs}/util/TextSplitter.java | 4 ++-- src/main/java/noppes/npcs/CustomNpcs.java | 12 ++++++------ .../java/noppes/npcs/CustomNpcsPermissions.java | 2 +- .../java/noppes/npcs/PacketHandlerPlayer.java | 1 - .../java/noppes/npcs/PacketHandlerServer.java | 1 - .../noppes/npcs/ScriptPlayerEventHandler.java | 3 --- src/main/java/noppes/npcs/ServerTickHandler.java | 2 +- src/main/java/noppes/npcs/ai/CombatHandler.java | 2 +- .../java/noppes/npcs/ai/EntityAIAttackTarget.java | 2 +- .../npcs/ai/selector/NPCAttackSelector.java | 2 +- src/main/java/noppes/npcs/client/ClientProxy.java | 3 +-- .../noppes/npcs/client/ClientTickHandler.java | 5 +---- src/main/java/noppes/npcs/client/EntityUtil.java | 4 ++-- .../npcs/client/gui/mainmenu/GuiNpcDisplay.java | 2 +- .../npcs/client/gui/mainmenu/GuiNpcStats.java | 3 +-- .../npcs/client/gui/model/GuiCreationScreen.java | 2 +- .../gui/player/inventory/GuiCNPCInventory.java | 2 +- .../npcs/client/gui/util/GuiCustomScroll.java | 2 +- .../noppes/npcs/client/gui/util/GuiNpcButton.java | 2 +- .../npcs/client/renderer/RenderNPCInterface.java | 2 +- .../java/noppes/npcs/config/ConfigScript.java | 4 ++-- .../noppes/npcs/controllers/SyncController.java | 2 +- .../noppes/npcs/controllers/data/PlayerData.java | 2 +- .../noppes/npcs/entity/EntityNPCInterface.java | 4 ++-- .../java/noppes/npcs/entity/EntityProjectile.java | 3 +-- .../client/tabs/InventoryTabCustomNpc.java | 3 +-- 128 files changed, 406 insertions(+), 440 deletions(-) delete mode 100644 src/main/java/kamkeel/network/enums/EnumDataPacket.java rename src/main/java/kamkeel/{ => npcs}/addon/AddonManager.java (78%) rename src/main/java/kamkeel/{ => npcs}/addon/DBCAddon.java (96%) rename src/main/java/kamkeel/{ => npcs}/addon/GeckoAddon.java (94%) rename src/main/java/kamkeel/{ => npcs}/addon/client/DBCClient.java (84%) rename src/main/java/kamkeel/{ => npcs}/addon/client/GeckoAddonClient.java (97%) rename src/main/java/kamkeel/{ => npcs}/command/AnimationCommand.java (99%) rename src/main/java/kamkeel/{ => npcs}/command/CloneCommand.java (95%) rename src/main/java/kamkeel/{ => npcs}/command/CommandCommand.java (98%) rename src/main/java/kamkeel/{ => npcs}/command/CommandKamkeel.java (98%) rename src/main/java/kamkeel/{ => npcs}/command/CommandKamkeelBase.java (99%) rename src/main/java/kamkeel/{ => npcs}/command/ConfigCommand.java (99%) rename src/main/java/kamkeel/{ => npcs}/command/DialogCategoryCommand.java (99%) rename src/main/java/kamkeel/{ => npcs}/command/DialogCommand.java (99%) rename src/main/java/kamkeel/{ => npcs}/command/FactionCommand.java (96%) rename src/main/java/kamkeel/{ => npcs}/command/HelpCommand.java (98%) rename src/main/java/kamkeel/{ => npcs}/command/NpcCommand.java (99%) rename src/main/java/kamkeel/{ => npcs}/command/OverlayCommand.java (99%) rename src/main/java/kamkeel/{ => npcs}/command/QuestCategoryCommand.java (99%) rename src/main/java/kamkeel/{ => npcs}/command/QuestCommand.java (98%) rename src/main/java/kamkeel/{ => npcs}/command/ScriptCommand.java (97%) rename src/main/java/kamkeel/{ => npcs}/command/SlayCommand.java (95%) rename src/main/java/kamkeel/{ => npcs}/command/profile/CommandHelpProfile.java (98%) rename src/main/java/kamkeel/{ => npcs}/command/profile/CommandProfile.java (95%) rename src/main/java/kamkeel/{ => npcs}/command/profile/CommandProfileBase.java (99%) rename src/main/java/kamkeel/{ => npcs}/command/profile/CommandProfileChange.java (92%) rename src/main/java/kamkeel/{ => npcs}/controllers/ProfileController.java (97%) rename src/main/java/kamkeel/{ => npcs}/controllers/data/CNPCData.java (96%) rename src/main/java/kamkeel/{ => npcs}/controllers/data/IProfileData.java (94%) rename src/main/java/kamkeel/{ => npcs}/controllers/data/Profile.java (97%) rename src/main/java/kamkeel/{ => npcs}/controllers/data/Slot.java (92%) rename src/main/java/kamkeel/{ => npcs}/developer/Developer.java (97%) rename src/main/java/kamkeel/{ => npcs}/network/AbstractPacket.java (88%) rename src/main/java/kamkeel/{ => npcs}/network/KamUtilServer.java (77%) rename src/main/java/kamkeel/{ => npcs}/network/LargeAbstractPacket.java (95%) rename src/main/java/kamkeel/{ => npcs}/network/PacketChannel.java (91%) rename src/main/java/kamkeel/{ => npcs}/network/PacketHandler.java (94%) rename src/main/java/kamkeel/{ => npcs}/network/enums/EnumClientPacket.java (96%) create mode 100644 src/main/java/kamkeel/npcs/network/enums/EnumDataPacket.java rename src/main/java/kamkeel/{ => npcs}/network/enums/EnumInfoPacket.java (54%) rename src/main/java/kamkeel/{ => npcs}/network/enums/EnumPacketType.java (63%) rename src/main/java/kamkeel/{ => npcs}/network/packets/LoginPacket.java (77%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/ChatBubblePacket.java (88%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/ChatPacket.java (83%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/ConfigCommandPacket.java (89%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/DBCFormPacket.java (76%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/DeleteNpcPacket.java (81%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/DialogDummyPacket.java (81%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/DialogPacket.java (83%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/DisableMouseInputPacket.java (84%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/EditNpcPacket.java (82%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/LargeNBTEndPacket.java (78%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/LargeNBTPartPacket.java (78%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/MarkDataPacket.java (83%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/MessagePacket.java (86%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/OpenBookPacket.java (83%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/OverlayQuestTrackingPacket.java (84%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/ParticlePacket.java (76%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/PartyDataPacket.java (87%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/PlayerUpdateSkinOverlaysPacket.java (84%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/QuestCompletionPacket.java (78%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/RolePacket.java (85%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/ScriptOverlayClosePacket.java (79%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/ScriptOverlayDataPacket.java (83%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/ScriptedParticlePacket.java (77%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/ScrollSelectedPacket.java (82%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/StopSoundForPacket.java (78%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/StopSoundsPacket.java (77%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/SwingPlayerArmPacket.java (77%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/TeleporterPacket.java (78%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/UpdateAnimationsPacket.java (92%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/UpdateNpcPacket.java (83%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/VillagerListPacket.java (80%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/gui/ClonerGUIPacket.java (79%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/gui/GUIClonerPacket.java (82%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/gui/GuiClosePacket.java (84%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/gui/GuiDataPacket.java (86%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/gui/GuiErrorPacket.java (83%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/gui/GuiPacket.java (80%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/gui/GuiRedstonePacket.java (79%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/gui/GuiWaypointPacket.java (79%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/gui/IsGuiOpenPacket.java (79%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/sound/ContinueSoundsPacket.java (77%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/sound/PauseSoundsPacket.java (77%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/sound/PlayMusicPacket.java (79%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/sound/PlaySoundPacket.java (80%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/sound/PlaySoundToNoIdPacket.java (82%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/sound/PlaySoundToPacket.java (82%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/sync/SyncAddPacket.java (80%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/sync/SyncConfigPacket.java (79%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/sync/SyncEndPacket.java (80%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/sync/SyncPlayerPacket.java (77%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/sync/SyncRecipesAddPacket.java (85%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/sync/SyncRecipesCarpentryBenchPacket.java (79%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/sync/SyncRecipesWorkbenchPacket.java (79%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/sync/SyncRemovePacket.java (78%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/sync/SyncUpdatePacket.java (80%) rename src/main/java/kamkeel/{ => npcs}/network/packets/client/sync/SyncWeaponPacket.java (84%) rename src/main/java/kamkeel/{ => npcs}/network/packets/large/LargeScrollDataPacket.java (80%) rename src/main/java/kamkeel/{ => npcs}/network/packets/large/LargeScrollGroupPacket.java (80%) rename src/main/java/kamkeel/{ => npcs}/network/packets/large/LargeScrollListPacket.java (80%) rename src/main/java/kamkeel/{ => npcs}/util/ByteBufUtils.java (99%) rename src/main/java/kamkeel/{ => npcs}/util/TextSplitter.java (97%) diff --git a/src/main/java/kamkeel/network/enums/EnumDataPacket.java b/src/main/java/kamkeel/network/enums/EnumDataPacket.java deleted file mode 100644 index 2481eb446..000000000 --- a/src/main/java/kamkeel/network/enums/EnumDataPacket.java +++ /dev/null @@ -1,4 +0,0 @@ -package kamkeel.network.enums; - -public enum EnumDataPacket { -} diff --git a/src/main/java/kamkeel/addon/AddonManager.java b/src/main/java/kamkeel/npcs/addon/AddonManager.java similarity index 78% rename from src/main/java/kamkeel/addon/AddonManager.java rename to src/main/java/kamkeel/npcs/addon/AddonManager.java index 52aabb0f6..24b58dc3e 100644 --- a/src/main/java/kamkeel/addon/AddonManager.java +++ b/src/main/java/kamkeel/npcs/addon/AddonManager.java @@ -1,7 +1,7 @@ -package kamkeel.addon; +package kamkeel.npcs.addon; -import kamkeel.addon.client.DBCClient; -import kamkeel.addon.client.GeckoAddonClient; +import kamkeel.npcs.addon.client.DBCClient; +import kamkeel.npcs.addon.client.GeckoAddonClient; public class AddonManager { public static AddonManager Instance; diff --git a/src/main/java/kamkeel/addon/DBCAddon.java b/src/main/java/kamkeel/npcs/addon/DBCAddon.java similarity index 96% rename from src/main/java/kamkeel/addon/DBCAddon.java rename to src/main/java/kamkeel/npcs/addon/DBCAddon.java index e8f446143..d109d2393 100644 --- a/src/main/java/kamkeel/addon/DBCAddon.java +++ b/src/main/java/kamkeel/npcs/addon/DBCAddon.java @@ -1,6 +1,5 @@ -package kamkeel.addon; +package kamkeel.npcs.addon; -import io.netty.buffer.ByteBuf; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/addon/GeckoAddon.java b/src/main/java/kamkeel/npcs/addon/GeckoAddon.java similarity index 94% rename from src/main/java/kamkeel/addon/GeckoAddon.java rename to src/main/java/kamkeel/npcs/addon/GeckoAddon.java index 97c7a50c2..ee0f72141 100644 --- a/src/main/java/kamkeel/addon/GeckoAddon.java +++ b/src/main/java/kamkeel/npcs/addon/GeckoAddon.java @@ -1,4 +1,4 @@ -package kamkeel.addon; +package kamkeel.npcs.addon; import net.minecraft.entity.EntityLivingBase; @@ -17,4 +17,4 @@ public class GeckoAddon { public void geckoCopyData(EntityLivingBase copied, EntityLivingBase entity){} -} \ No newline at end of file +} diff --git a/src/main/java/kamkeel/addon/client/DBCClient.java b/src/main/java/kamkeel/npcs/addon/client/DBCClient.java similarity index 84% rename from src/main/java/kamkeel/addon/client/DBCClient.java rename to src/main/java/kamkeel/npcs/addon/client/DBCClient.java index f148439d6..5fdc75d7e 100644 --- a/src/main/java/kamkeel/addon/client/DBCClient.java +++ b/src/main/java/kamkeel/npcs/addon/client/DBCClient.java @@ -1,15 +1,10 @@ -package kamkeel.addon.client; +package kamkeel.npcs.addon.client; -import io.netty.buffer.ByteBuf; -import net.minecraft.client.model.ModelBase; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.client.gui.mainmenu.GuiNpcStats; -import noppes.npcs.client.gui.model.GuiCreationScreen; import noppes.npcs.client.gui.player.inventory.GuiCNPCInventory; import noppes.npcs.client.gui.util.GuiNPCInterface2; import noppes.npcs.client.gui.util.GuiNpcButton; -import noppes.npcs.client.model.ModelMPM; import noppes.npcs.entity.EntityNPCInterface; public class DBCClient { diff --git a/src/main/java/kamkeel/addon/client/GeckoAddonClient.java b/src/main/java/kamkeel/npcs/addon/client/GeckoAddonClient.java similarity index 97% rename from src/main/java/kamkeel/addon/client/GeckoAddonClient.java rename to src/main/java/kamkeel/npcs/addon/client/GeckoAddonClient.java index 088488314..f014b07ad 100644 --- a/src/main/java/kamkeel/addon/client/GeckoAddonClient.java +++ b/src/main/java/kamkeel/npcs/addon/client/GeckoAddonClient.java @@ -1,4 +1,4 @@ -package kamkeel.addon.client; +package kamkeel.npcs.addon.client; import net.minecraft.client.model.ModelBase; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/kamkeel/command/AnimationCommand.java b/src/main/java/kamkeel/npcs/command/AnimationCommand.java similarity index 99% rename from src/main/java/kamkeel/command/AnimationCommand.java rename to src/main/java/kamkeel/npcs/command/AnimationCommand.java index 8a6beec18..05e5e517f 100644 --- a/src/main/java/kamkeel/command/AnimationCommand.java +++ b/src/main/java/kamkeel/npcs/command/AnimationCommand.java @@ -1,4 +1,4 @@ -package kamkeel.command; +package kamkeel.npcs.command; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; diff --git a/src/main/java/kamkeel/command/CloneCommand.java b/src/main/java/kamkeel/npcs/command/CloneCommand.java similarity index 95% rename from src/main/java/kamkeel/command/CloneCommand.java rename to src/main/java/kamkeel/npcs/command/CloneCommand.java index 174d1039a..fc6e26817 100644 --- a/src/main/java/kamkeel/command/CloneCommand.java +++ b/src/main/java/kamkeel/npcs/command/CloneCommand.java @@ -1,8 +1,7 @@ -package kamkeel.command; +package kamkeel.npcs.command; import foxz.utils.Utils; import net.minecraft.block.Block; -import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; import net.minecraft.entity.Entity; @@ -180,9 +179,9 @@ public class CloneCommand extends CommandKamkeelBase { return; } try{ - posX = CommandBase.func_110666_a(sender, posX, par[0]); - posY = CommandBase.func_110665_a(sender, posY, par[1].trim(), 0, 0); - posZ = CommandBase.func_110666_a(sender, posZ, par[2]); + posX = func_110666_a(sender, posX, par[0]); + posY = func_110665_a(sender, posY, par[1].trim(), 0, 0); + posZ = func_110666_a(sender, posZ, par[2]); } catch(NumberFormatException ex){ sendError(sender, "Location should be in numbers"); return; @@ -272,9 +271,9 @@ public class CloneCommand extends CommandKamkeelBase { return; } try{ - posX = CommandBase.func_110666_a(sender, posX, par[0]); - posY = CommandBase.func_110665_a(sender, posY, par[1].trim(), 0, 0); - posZ = CommandBase.func_110666_a(sender, posZ, par[2]); + posX = func_110666_a(sender, posX, par[0]); + posY = func_110665_a(sender, posY, par[1].trim(), 0, 0); + posZ = func_110666_a(sender, posZ, par[2]); } catch(NumberFormatException ex){ sendError(sender, "Location should be in numbers"); return; diff --git a/src/main/java/kamkeel/command/CommandCommand.java b/src/main/java/kamkeel/npcs/command/CommandCommand.java similarity index 98% rename from src/main/java/kamkeel/command/CommandCommand.java rename to src/main/java/kamkeel/npcs/command/CommandCommand.java index 80a41ec28..facac35f1 100644 --- a/src/main/java/kamkeel/command/CommandCommand.java +++ b/src/main/java/kamkeel/npcs/command/CommandCommand.java @@ -1,4 +1,4 @@ -package kamkeel.command; +package kamkeel.npcs.command; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; diff --git a/src/main/java/kamkeel/command/CommandKamkeel.java b/src/main/java/kamkeel/npcs/command/CommandKamkeel.java similarity index 98% rename from src/main/java/kamkeel/command/CommandKamkeel.java rename to src/main/java/kamkeel/npcs/command/CommandKamkeel.java index 86c192847..6c5bfd28d 100644 --- a/src/main/java/kamkeel/command/CommandKamkeel.java +++ b/src/main/java/kamkeel/npcs/command/CommandKamkeel.java @@ -1,4 +1,4 @@ -package kamkeel.command; +package kamkeel.npcs.command; import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; @@ -46,7 +46,7 @@ public class CommandKamkeel extends CommandBase{ @Override public String getCommandName() { - return "kamkeel"; + return "kamkeel/npcs"; } @Override diff --git a/src/main/java/kamkeel/command/CommandKamkeelBase.java b/src/main/java/kamkeel/npcs/command/CommandKamkeelBase.java similarity index 99% rename from src/main/java/kamkeel/command/CommandKamkeelBase.java rename to src/main/java/kamkeel/npcs/command/CommandKamkeelBase.java index 9c380f7c2..cf87c5d36 100644 --- a/src/main/java/kamkeel/command/CommandKamkeelBase.java +++ b/src/main/java/kamkeel/npcs/command/CommandKamkeelBase.java @@ -1,4 +1,4 @@ -package kamkeel.command; +package kamkeel.npcs.command; import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; diff --git a/src/main/java/kamkeel/command/ConfigCommand.java b/src/main/java/kamkeel/npcs/command/ConfigCommand.java similarity index 99% rename from src/main/java/kamkeel/command/ConfigCommand.java rename to src/main/java/kamkeel/npcs/command/ConfigCommand.java index 4be014417..89d22db44 100644 --- a/src/main/java/kamkeel/command/ConfigCommand.java +++ b/src/main/java/kamkeel/npcs/command/ConfigCommand.java @@ -1,4 +1,4 @@ -package kamkeel.command; +package kamkeel.npcs.command; import foxz.utils.Market; import net.minecraft.block.Block; diff --git a/src/main/java/kamkeel/command/DialogCategoryCommand.java b/src/main/java/kamkeel/npcs/command/DialogCategoryCommand.java similarity index 99% rename from src/main/java/kamkeel/command/DialogCategoryCommand.java rename to src/main/java/kamkeel/npcs/command/DialogCategoryCommand.java index 648920e06..d149a15b7 100644 --- a/src/main/java/kamkeel/command/DialogCategoryCommand.java +++ b/src/main/java/kamkeel/npcs/command/DialogCategoryCommand.java @@ -1,4 +1,4 @@ -package kamkeel.command; +package kamkeel.npcs.command; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; diff --git a/src/main/java/kamkeel/command/DialogCommand.java b/src/main/java/kamkeel/npcs/command/DialogCommand.java similarity index 99% rename from src/main/java/kamkeel/command/DialogCommand.java rename to src/main/java/kamkeel/npcs/command/DialogCommand.java index ac9ecd543..4a4e3bc66 100644 --- a/src/main/java/kamkeel/command/DialogCommand.java +++ b/src/main/java/kamkeel/npcs/command/DialogCommand.java @@ -1,4 +1,4 @@ -package kamkeel.command; +package kamkeel.npcs.command; import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; diff --git a/src/main/java/kamkeel/command/FactionCommand.java b/src/main/java/kamkeel/npcs/command/FactionCommand.java similarity index 96% rename from src/main/java/kamkeel/command/FactionCommand.java rename to src/main/java/kamkeel/npcs/command/FactionCommand.java index c3874c325..f5de2f3b5 100644 --- a/src/main/java/kamkeel/command/FactionCommand.java +++ b/src/main/java/kamkeel/npcs/command/FactionCommand.java @@ -1,6 +1,5 @@ -package kamkeel.command; +package kamkeel.npcs.command; -import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; import noppes.npcs.controllers.FactionController; @@ -153,7 +152,7 @@ public class FactionCommand extends CommandKamkeelBase { @Override public List addTabCompletionOptions(ICommandSender par1, String[] args) { if(args.length == 3){ - return CommandBase.getListOfStringsMatchingLastWord(args, new String[]{"add", "subtract", "set", "reset", "drop", "create"}); + return getListOfStringsMatchingLastWord(args, new String[]{"add", "subtract", "set", "reset", "drop", "create"}); } return null; } diff --git a/src/main/java/kamkeel/command/HelpCommand.java b/src/main/java/kamkeel/npcs/command/HelpCommand.java similarity index 98% rename from src/main/java/kamkeel/command/HelpCommand.java rename to src/main/java/kamkeel/npcs/command/HelpCommand.java index 67b7d092a..f5e0828da 100644 --- a/src/main/java/kamkeel/command/HelpCommand.java +++ b/src/main/java/kamkeel/npcs/command/HelpCommand.java @@ -1,4 +1,4 @@ -package kamkeel.command; +package kamkeel.npcs.command; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; diff --git a/src/main/java/kamkeel/command/NpcCommand.java b/src/main/java/kamkeel/npcs/command/NpcCommand.java similarity index 99% rename from src/main/java/kamkeel/command/NpcCommand.java rename to src/main/java/kamkeel/npcs/command/NpcCommand.java index 0a19dda0d..18d3fb730 100644 --- a/src/main/java/kamkeel/command/NpcCommand.java +++ b/src/main/java/kamkeel/npcs/command/NpcCommand.java @@ -1,4 +1,4 @@ -package kamkeel.command; +package kamkeel.npcs.command; import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; diff --git a/src/main/java/kamkeel/command/OverlayCommand.java b/src/main/java/kamkeel/npcs/command/OverlayCommand.java similarity index 99% rename from src/main/java/kamkeel/command/OverlayCommand.java rename to src/main/java/kamkeel/npcs/command/OverlayCommand.java index 68c8f68c2..e740bc5e0 100644 --- a/src/main/java/kamkeel/command/OverlayCommand.java +++ b/src/main/java/kamkeel/npcs/command/OverlayCommand.java @@ -1,4 +1,4 @@ -package kamkeel.command; +package kamkeel.npcs.command; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; diff --git a/src/main/java/kamkeel/command/QuestCategoryCommand.java b/src/main/java/kamkeel/npcs/command/QuestCategoryCommand.java similarity index 99% rename from src/main/java/kamkeel/command/QuestCategoryCommand.java rename to src/main/java/kamkeel/npcs/command/QuestCategoryCommand.java index 2e9852a31..b3bbaae6f 100644 --- a/src/main/java/kamkeel/command/QuestCategoryCommand.java +++ b/src/main/java/kamkeel/npcs/command/QuestCategoryCommand.java @@ -1,4 +1,4 @@ -package kamkeel.command; +package kamkeel.npcs.command; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; diff --git a/src/main/java/kamkeel/command/QuestCommand.java b/src/main/java/kamkeel/npcs/command/QuestCommand.java similarity index 98% rename from src/main/java/kamkeel/command/QuestCommand.java rename to src/main/java/kamkeel/npcs/command/QuestCommand.java index 887b5e47b..cd89ab044 100644 --- a/src/main/java/kamkeel/command/QuestCommand.java +++ b/src/main/java/kamkeel/npcs/command/QuestCommand.java @@ -1,11 +1,9 @@ -package kamkeel.command; +package kamkeel.npcs.command; -import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.server.MinecraftServer; import noppes.npcs.Server; import noppes.npcs.api.handler.data.IQuestObjective; import noppes.npcs.constants.EnumPacketClient; @@ -192,7 +190,7 @@ public class QuestCommand extends CommandKamkeelBase { usage = " [objective] [value]" ) public void objective(ICommandSender sender, String[] args) throws CommandException { - EntityPlayer player = CommandBase.getPlayer(sender, args[0]); + EntityPlayer player = getPlayer(sender, args[0]); int questid; try { questid = Integer.parseInt(args[1]); diff --git a/src/main/java/kamkeel/command/ScriptCommand.java b/src/main/java/kamkeel/npcs/command/ScriptCommand.java similarity index 97% rename from src/main/java/kamkeel/command/ScriptCommand.java rename to src/main/java/kamkeel/npcs/command/ScriptCommand.java index 5edbfb904..bf62cc3fb 100644 --- a/src/main/java/kamkeel/command/ScriptCommand.java +++ b/src/main/java/kamkeel/npcs/command/ScriptCommand.java @@ -1,4 +1,4 @@ -package kamkeel.command; +package kamkeel.npcs.command; import net.minecraft.command.ICommandSender; import noppes.npcs.controllers.ScriptController; diff --git a/src/main/java/kamkeel/command/SlayCommand.java b/src/main/java/kamkeel/npcs/command/SlayCommand.java similarity index 95% rename from src/main/java/kamkeel/command/SlayCommand.java rename to src/main/java/kamkeel/npcs/command/SlayCommand.java index c4ebed36f..60af6d6cf 100644 --- a/src/main/java/kamkeel/command/SlayCommand.java +++ b/src/main/java/kamkeel/npcs/command/SlayCommand.java @@ -1,6 +1,5 @@ -package kamkeel.command; +package kamkeel.npcs.command; -import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; import net.minecraft.entity.Entity; @@ -134,6 +133,6 @@ public class SlayCommand extends CommandKamkeelBase { @Override public List addTabCompletionOptions(ICommandSender sender, String[] args){ - return CommandBase.getListOfStringsMatchingLastWord(args, SlayMap.keySet().toArray(new String[SlayMap.size()])); + return getListOfStringsMatchingLastWord(args, SlayMap.keySet().toArray(new String[SlayMap.size()])); } } diff --git a/src/main/java/kamkeel/command/profile/CommandHelpProfile.java b/src/main/java/kamkeel/npcs/command/profile/CommandHelpProfile.java similarity index 98% rename from src/main/java/kamkeel/command/profile/CommandHelpProfile.java rename to src/main/java/kamkeel/npcs/command/profile/CommandHelpProfile.java index fe228dfa1..672e7886c 100644 --- a/src/main/java/kamkeel/command/profile/CommandHelpProfile.java +++ b/src/main/java/kamkeel/npcs/command/profile/CommandHelpProfile.java @@ -1,4 +1,4 @@ -package kamkeel.command.profile; +package kamkeel.npcs.command.profile; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; diff --git a/src/main/java/kamkeel/command/profile/CommandProfile.java b/src/main/java/kamkeel/npcs/command/profile/CommandProfile.java similarity index 95% rename from src/main/java/kamkeel/command/profile/CommandProfile.java rename to src/main/java/kamkeel/npcs/command/profile/CommandProfile.java index a8a19de4b..33d853d91 100644 --- a/src/main/java/kamkeel/command/profile/CommandProfile.java +++ b/src/main/java/kamkeel/npcs/command/profile/CommandProfile.java @@ -1,4 +1,4 @@ -package kamkeel.command.profile; +package kamkeel.npcs.command.profile; import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; @@ -84,7 +84,7 @@ public class CommandProfile extends CommandBase { if(command == null) return null; if(args.length == 2 && command.runSubCommands()) - return CommandBase.getListOfStringsMatchingLastWord(args, command.subcommands.keySet().toArray(new String[command.subcommands.keySet().size()])); + return getListOfStringsMatchingLastWord(args, command.subcommands.keySet().toArray(new String[command.subcommands.keySet().size()])); String[] useArgs = command.getUsage().split(" "); if(command.runSubCommands()) { Method m = command.subcommands.get(args[1].toLowerCase()); diff --git a/src/main/java/kamkeel/command/profile/CommandProfileBase.java b/src/main/java/kamkeel/npcs/command/profile/CommandProfileBase.java similarity index 99% rename from src/main/java/kamkeel/command/profile/CommandProfileBase.java rename to src/main/java/kamkeel/npcs/command/profile/CommandProfileBase.java index 24487dba2..18c06ad4f 100644 --- a/src/main/java/kamkeel/command/profile/CommandProfileBase.java +++ b/src/main/java/kamkeel/npcs/command/profile/CommandProfileBase.java @@ -1,4 +1,4 @@ -package kamkeel.command.profile; +package kamkeel.npcs.command.profile; import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; diff --git a/src/main/java/kamkeel/command/profile/CommandProfileChange.java b/src/main/java/kamkeel/npcs/command/profile/CommandProfileChange.java similarity index 92% rename from src/main/java/kamkeel/command/profile/CommandProfileChange.java rename to src/main/java/kamkeel/npcs/command/profile/CommandProfileChange.java index 8cda00afc..1e38da197 100644 --- a/src/main/java/kamkeel/command/profile/CommandProfileChange.java +++ b/src/main/java/kamkeel/npcs/command/profile/CommandProfileChange.java @@ -1,7 +1,7 @@ -package kamkeel.command.profile; +package kamkeel.npcs.command.profile; -import kamkeel.controllers.ProfileController; -import kamkeel.controllers.data.Profile; +import kamkeel.npcs.controllers.ProfileController; +import kamkeel.npcs.controllers.data.Profile; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/controllers/ProfileController.java b/src/main/java/kamkeel/npcs/controllers/ProfileController.java similarity index 97% rename from src/main/java/kamkeel/controllers/ProfileController.java rename to src/main/java/kamkeel/npcs/controllers/ProfileController.java index a5f9a86da..6cde49199 100644 --- a/src/main/java/kamkeel/controllers/ProfileController.java +++ b/src/main/java/kamkeel/npcs/controllers/ProfileController.java @@ -1,8 +1,8 @@ -package kamkeel.controllers; +package kamkeel.npcs.controllers; -import kamkeel.controllers.data.IProfileData; -import kamkeel.controllers.data.Profile; -import kamkeel.controllers.data.Slot; +import kamkeel.npcs.controllers.data.IProfileData; +import kamkeel.npcs.controllers.data.Profile; +import kamkeel.npcs.controllers.data.Slot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/kamkeel/controllers/data/CNPCData.java b/src/main/java/kamkeel/npcs/controllers/data/CNPCData.java similarity index 96% rename from src/main/java/kamkeel/controllers/data/CNPCData.java rename to src/main/java/kamkeel/npcs/controllers/data/CNPCData.java index fc1ae9d72..9b0b0dece 100644 --- a/src/main/java/kamkeel/controllers/data/CNPCData.java +++ b/src/main/java/kamkeel/npcs/controllers/data/CNPCData.java @@ -1,4 +1,4 @@ -package kamkeel.controllers.data; +package kamkeel.npcs.controllers.data; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/kamkeel/controllers/data/IProfileData.java b/src/main/java/kamkeel/npcs/controllers/data/IProfileData.java similarity index 94% rename from src/main/java/kamkeel/controllers/data/IProfileData.java rename to src/main/java/kamkeel/npcs/controllers/data/IProfileData.java index 52653dc53..a68abc597 100644 --- a/src/main/java/kamkeel/controllers/data/IProfileData.java +++ b/src/main/java/kamkeel/npcs/controllers/data/IProfileData.java @@ -1,4 +1,4 @@ -package kamkeel.controllers.data; +package kamkeel.npcs.controllers.data; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/kamkeel/controllers/data/Profile.java b/src/main/java/kamkeel/npcs/controllers/data/Profile.java similarity index 97% rename from src/main/java/kamkeel/controllers/data/Profile.java rename to src/main/java/kamkeel/npcs/controllers/data/Profile.java index 94726b5b9..01002a470 100644 --- a/src/main/java/kamkeel/controllers/data/Profile.java +++ b/src/main/java/kamkeel/npcs/controllers/data/Profile.java @@ -1,4 +1,4 @@ -package kamkeel.controllers.data; +package kamkeel.npcs.controllers.data; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/kamkeel/controllers/data/Slot.java b/src/main/java/kamkeel/npcs/controllers/data/Slot.java similarity index 92% rename from src/main/java/kamkeel/controllers/data/Slot.java rename to src/main/java/kamkeel/npcs/controllers/data/Slot.java index 592497f54..5e6f86869 100644 --- a/src/main/java/kamkeel/controllers/data/Slot.java +++ b/src/main/java/kamkeel/npcs/controllers/data/Slot.java @@ -1,7 +1,5 @@ -package kamkeel.controllers.data; +package kamkeel.npcs.controllers.data; -import kamkeel.controllers.ProfileController; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; public class Slot { diff --git a/src/main/java/kamkeel/developer/Developer.java b/src/main/java/kamkeel/npcs/developer/Developer.java similarity index 97% rename from src/main/java/kamkeel/developer/Developer.java rename to src/main/java/kamkeel/npcs/developer/Developer.java index fc321b9cc..2c89cfc50 100644 --- a/src/main/java/kamkeel/developer/Developer.java +++ b/src/main/java/kamkeel/npcs/developer/Developer.java @@ -1,4 +1,4 @@ -package kamkeel.developer; +package kamkeel.npcs.developer; import java.util.HashSet; import java.util.UUID; diff --git a/src/main/java/kamkeel/network/AbstractPacket.java b/src/main/java/kamkeel/npcs/network/AbstractPacket.java similarity index 88% rename from src/main/java/kamkeel/network/AbstractPacket.java rename to src/main/java/kamkeel/npcs/network/AbstractPacket.java index 7d8fa4d77..7d373581d 100644 --- a/src/main/java/kamkeel/network/AbstractPacket.java +++ b/src/main/java/kamkeel/npcs/network/AbstractPacket.java @@ -1,12 +1,9 @@ -package kamkeel.network; +package kamkeel.npcs.network; -import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.internal.FMLProxyPacket; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.EntityPlayer; -import noppes.npcs.CustomNpcs; -import noppes.npcs.LogWriter; import java.io.IOException; diff --git a/src/main/java/kamkeel/network/KamUtilServer.java b/src/main/java/kamkeel/npcs/network/KamUtilServer.java similarity index 77% rename from src/main/java/kamkeel/network/KamUtilServer.java rename to src/main/java/kamkeel/npcs/network/KamUtilServer.java index 14710ac7c..4ffb3b7f0 100644 --- a/src/main/java/kamkeel/network/KamUtilServer.java +++ b/src/main/java/kamkeel/npcs/network/KamUtilServer.java @@ -1,7 +1,7 @@ -package kamkeel.network; +package kamkeel.npcs.network; -import kamkeel.network.packets.large.LargeScrollGroupPacket; -import kamkeel.network.packets.large.LargeScrollDataPacket; +import kamkeel.npcs.network.packets.large.LargeScrollGroupPacket; +import kamkeel.npcs.network.packets.large.LargeScrollDataPacket; import net.minecraft.entity.player.EntityPlayerMP; import java.util.Map; diff --git a/src/main/java/kamkeel/network/LargeAbstractPacket.java b/src/main/java/kamkeel/npcs/network/LargeAbstractPacket.java similarity index 95% rename from src/main/java/kamkeel/network/LargeAbstractPacket.java rename to src/main/java/kamkeel/npcs/network/LargeAbstractPacket.java index bd748225c..7c398dbfb 100644 --- a/src/main/java/kamkeel/network/LargeAbstractPacket.java +++ b/src/main/java/kamkeel/npcs/network/LargeAbstractPacket.java @@ -1,9 +1,7 @@ -package kamkeel.network; +package kamkeel.npcs.network; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; -import kamkeel.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; -import noppes.npcs.client.NoppesUtil; import java.io.IOException; import java.util.HashMap; diff --git a/src/main/java/kamkeel/network/PacketChannel.java b/src/main/java/kamkeel/npcs/network/PacketChannel.java similarity index 91% rename from src/main/java/kamkeel/network/PacketChannel.java rename to src/main/java/kamkeel/npcs/network/PacketChannel.java index 05f656294..c7109d856 100644 --- a/src/main/java/kamkeel/network/PacketChannel.java +++ b/src/main/java/kamkeel/npcs/network/PacketChannel.java @@ -1,6 +1,6 @@ -package kamkeel.network; +package kamkeel.npcs.network; -import kamkeel.network.enums.EnumPacketType; +import kamkeel.npcs.network.enums.EnumPacketType; import java.util.Hashtable; import java.util.Map; diff --git a/src/main/java/kamkeel/network/PacketHandler.java b/src/main/java/kamkeel/npcs/network/PacketHandler.java similarity index 94% rename from src/main/java/kamkeel/network/PacketHandler.java rename to src/main/java/kamkeel/npcs/network/PacketHandler.java index c4c718e77..8c0d49162 100644 --- a/src/main/java/kamkeel/network/PacketHandler.java +++ b/src/main/java/kamkeel/npcs/network/PacketHandler.java @@ -1,4 +1,4 @@ -package kamkeel.network; +package kamkeel.npcs.network; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.FMLEventChannel; @@ -6,12 +6,10 @@ import cpw.mods.fml.common.network.FMLNetworkEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.internal.FMLProxyPacket; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.enums.EnumPacketType; -import kamkeel.network.packets.large.LargeScrollDataPacket; -import kamkeel.network.packets.large.LargeScrollGroupPacket; -import kamkeel.network.packets.large.LargeScrollListPacket; +import kamkeel.npcs.network.enums.EnumPacketType; +import kamkeel.npcs.network.packets.large.LargeScrollDataPacket; +import kamkeel.npcs.network.packets.large.LargeScrollGroupPacket; +import kamkeel.npcs.network.packets.large.LargeScrollListPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.NetHandlerPlayServer; diff --git a/src/main/java/kamkeel/network/enums/EnumClientPacket.java b/src/main/java/kamkeel/npcs/network/enums/EnumClientPacket.java similarity index 96% rename from src/main/java/kamkeel/network/enums/EnumClientPacket.java rename to src/main/java/kamkeel/npcs/network/enums/EnumClientPacket.java index 6ae61ad6e..83b08450d 100644 --- a/src/main/java/kamkeel/network/enums/EnumClientPacket.java +++ b/src/main/java/kamkeel/npcs/network/enums/EnumClientPacket.java @@ -1,4 +1,4 @@ -package kamkeel.network.enums; +package kamkeel.npcs.network.enums; // Packets to the Client public enum EnumClientPacket { diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumDataPacket.java b/src/main/java/kamkeel/npcs/network/enums/EnumDataPacket.java new file mode 100644 index 000000000..9ca60f8f8 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/enums/EnumDataPacket.java @@ -0,0 +1,4 @@ +package kamkeel.npcs.network.enums; + +public enum EnumDataPacket { +} diff --git a/src/main/java/kamkeel/network/enums/EnumInfoPacket.java b/src/main/java/kamkeel/npcs/network/enums/EnumInfoPacket.java similarity index 54% rename from src/main/java/kamkeel/network/enums/EnumInfoPacket.java rename to src/main/java/kamkeel/npcs/network/enums/EnumInfoPacket.java index 06586758d..86cab3ee5 100644 --- a/src/main/java/kamkeel/network/enums/EnumInfoPacket.java +++ b/src/main/java/kamkeel/npcs/network/enums/EnumInfoPacket.java @@ -1,4 +1,4 @@ -package kamkeel.network.enums; +package kamkeel.npcs.network.enums; public enum EnumInfoPacket { LOGIN, diff --git a/src/main/java/kamkeel/network/enums/EnumPacketType.java b/src/main/java/kamkeel/npcs/network/enums/EnumPacketType.java similarity index 63% rename from src/main/java/kamkeel/network/enums/EnumPacketType.java rename to src/main/java/kamkeel/npcs/network/enums/EnumPacketType.java index e38ad0ac4..c7ccd39cc 100644 --- a/src/main/java/kamkeel/network/enums/EnumPacketType.java +++ b/src/main/java/kamkeel/npcs/network/enums/EnumPacketType.java @@ -1,4 +1,4 @@ -package kamkeel.network.enums; +package kamkeel.npcs.network.enums; public enum EnumPacketType { INFO, DATA, CLIENT, LARGE diff --git a/src/main/java/kamkeel/network/packets/LoginPacket.java b/src/main/java/kamkeel/npcs/network/packets/LoginPacket.java similarity index 77% rename from src/main/java/kamkeel/network/packets/LoginPacket.java rename to src/main/java/kamkeel/npcs/network/packets/LoginPacket.java index 82d5899d4..c27cbcad4 100644 --- a/src/main/java/kamkeel/network/packets/LoginPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/LoginPacket.java @@ -1,11 +1,11 @@ -package kamkeel.network.packets; +package kamkeel.npcs.network.packets; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumInfoPacket; -import kamkeel.util.ByteBufUtils; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumInfoPacket; +import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import java.io.IOException; diff --git a/src/main/java/kamkeel/network/packets/client/ChatBubblePacket.java b/src/main/java/kamkeel/npcs/network/packets/client/ChatBubblePacket.java similarity index 88% rename from src/main/java/kamkeel/network/packets/client/ChatBubblePacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/ChatBubblePacket.java index 7a2867e6f..79db88414 100644 --- a/src/main/java/kamkeel/network/packets/client/ChatBubblePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/ChatBubblePacket.java @@ -1,11 +1,11 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/network/packets/client/ChatPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/ChatPacket.java similarity index 83% rename from src/main/java/kamkeel/network/packets/client/ChatPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/ChatPacket.java index 5aabefda8..8e9452423 100644 --- a/src/main/java/kamkeel/network/packets/client/ChatPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/ChatPacket.java @@ -1,11 +1,11 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ChatComponentTranslation; import noppes.npcs.CustomNpcs; diff --git a/src/main/java/kamkeel/network/packets/client/ConfigCommandPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/ConfigCommandPacket.java similarity index 89% rename from src/main/java/kamkeel/network/packets/client/ConfigCommandPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/ConfigCommandPacket.java index 09f1c91dd..2e030eb9e 100644 --- a/src/main/java/kamkeel/network/packets/client/ConfigCommandPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/ConfigCommandPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.Server; import noppes.npcs.client.ClientProxy; diff --git a/src/main/java/kamkeel/network/packets/client/DBCFormPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/DBCFormPacket.java similarity index 76% rename from src/main/java/kamkeel/network/packets/client/DBCFormPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/DBCFormPacket.java index 0a4432f79..2efc85ea0 100644 --- a/src/main/java/kamkeel/network/packets/client/DBCFormPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/DBCFormPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.client.NoppesUtil; diff --git a/src/main/java/kamkeel/network/packets/client/DeleteNpcPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/DeleteNpcPacket.java similarity index 81% rename from src/main/java/kamkeel/network/packets/client/DeleteNpcPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/DeleteNpcPacket.java index 98537c751..24b167de8 100644 --- a/src/main/java/kamkeel/network/packets/client/DeleteNpcPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/DeleteNpcPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/network/packets/client/DialogDummyPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/DialogDummyPacket.java similarity index 81% rename from src/main/java/kamkeel/network/packets/client/DialogDummyPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/DialogDummyPacket.java index 221f66aa8..b9c49d7cc 100644 --- a/src/main/java/kamkeel/network/packets/client/DialogDummyPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/DialogDummyPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.Server; import noppes.npcs.client.NoppesUtil; diff --git a/src/main/java/kamkeel/network/packets/client/DialogPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/DialogPacket.java similarity index 83% rename from src/main/java/kamkeel/network/packets/client/DialogPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/DialogPacket.java index 343b07891..33302ddf3 100644 --- a/src/main/java/kamkeel/network/packets/client/DialogPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/DialogPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/network/packets/client/DisableMouseInputPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/DisableMouseInputPacket.java similarity index 84% rename from src/main/java/kamkeel/network/packets/client/DisableMouseInputPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/DisableMouseInputPacket.java index 4723b4b3a..e25032599 100644 --- a/src/main/java/kamkeel/network/packets/client/DisableMouseInputPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/DisableMouseInputPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.client.ClientEventHandler; diff --git a/src/main/java/kamkeel/network/packets/client/EditNpcPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/EditNpcPacket.java similarity index 82% rename from src/main/java/kamkeel/network/packets/client/EditNpcPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/EditNpcPacket.java index 4fc5accc5..dc9563938 100644 --- a/src/main/java/kamkeel/network/packets/client/EditNpcPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/EditNpcPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/network/packets/client/LargeNBTEndPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/LargeNBTEndPacket.java similarity index 78% rename from src/main/java/kamkeel/network/packets/client/LargeNBTEndPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/LargeNBTEndPacket.java index 061ccf419..7da3d4bce 100644 --- a/src/main/java/kamkeel/network/packets/client/LargeNBTEndPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/LargeNBTEndPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.client.NoppesUtil; diff --git a/src/main/java/kamkeel/network/packets/client/LargeNBTPartPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/LargeNBTPartPacket.java similarity index 78% rename from src/main/java/kamkeel/network/packets/client/LargeNBTPartPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/LargeNBTPartPacket.java index 7eb8e46fe..d87db4a40 100644 --- a/src/main/java/kamkeel/network/packets/client/LargeNBTPartPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/LargeNBTPartPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.client.NoppesUtil; diff --git a/src/main/java/kamkeel/network/packets/client/MarkDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/MarkDataPacket.java similarity index 83% rename from src/main/java/kamkeel/network/packets/client/MarkDataPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/MarkDataPacket.java index a6412982b..6d053a132 100644 --- a/src/main/java/kamkeel/network/packets/client/MarkDataPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/MarkDataPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/kamkeel/network/packets/client/MessagePacket.java b/src/main/java/kamkeel/npcs/network/packets/client/MessagePacket.java similarity index 86% rename from src/main/java/kamkeel/network/packets/client/MessagePacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/MessagePacket.java index 97d05da72..59aa475fe 100644 --- a/src/main/java/kamkeel/network/packets/client/MessagePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/MessagePacket.java @@ -1,18 +1,17 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import cpw.mods.fml.common.ObfuscationReflectionHelper; import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.achievement.GuiAchievement; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.stats.Achievement; import net.minecraft.util.StatCollector; -import noppes.npcs.CustomItems; import noppes.npcs.CustomNpcs; import noppes.npcs.Server; diff --git a/src/main/java/kamkeel/network/packets/client/OpenBookPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/OpenBookPacket.java similarity index 83% rename from src/main/java/kamkeel/network/packets/client/OpenBookPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/OpenBookPacket.java index 3788c9814..1028896bd 100644 --- a/src/main/java/kamkeel/network/packets/client/OpenBookPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/OpenBookPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/kamkeel/network/packets/client/OverlayQuestTrackingPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/OverlayQuestTrackingPacket.java similarity index 84% rename from src/main/java/kamkeel/network/packets/client/OverlayQuestTrackingPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/OverlayQuestTrackingPacket.java index 487f163dc..46d4c1a84 100644 --- a/src/main/java/kamkeel/network/packets/client/OverlayQuestTrackingPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/OverlayQuestTrackingPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/kamkeel/network/packets/client/ParticlePacket.java b/src/main/java/kamkeel/npcs/network/packets/client/ParticlePacket.java similarity index 76% rename from src/main/java/kamkeel/network/packets/client/ParticlePacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/ParticlePacket.java index ae7230ee4..1e7c4f6a0 100644 --- a/src/main/java/kamkeel/network/packets/client/ParticlePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/ParticlePacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.client.NoppesUtil; diff --git a/src/main/java/kamkeel/network/packets/client/PartyDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/PartyDataPacket.java similarity index 87% rename from src/main/java/kamkeel/network/packets/client/PartyDataPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/PartyDataPacket.java index 95b2f68eb..4243be0da 100644 --- a/src/main/java/kamkeel/network/packets/client/PartyDataPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/PartyDataPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/network/packets/client/PlayerUpdateSkinOverlaysPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/PlayerUpdateSkinOverlaysPacket.java similarity index 84% rename from src/main/java/kamkeel/network/packets/client/PlayerUpdateSkinOverlaysPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/PlayerUpdateSkinOverlaysPacket.java index ee4a9a9c7..a61e06ad5 100644 --- a/src/main/java/kamkeel/network/packets/client/PlayerUpdateSkinOverlaysPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/PlayerUpdateSkinOverlaysPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/kamkeel/network/packets/client/QuestCompletionPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/QuestCompletionPacket.java similarity index 78% rename from src/main/java/kamkeel/network/packets/client/QuestCompletionPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/QuestCompletionPacket.java index e395facec..ab1928890 100644 --- a/src/main/java/kamkeel/network/packets/client/QuestCompletionPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/QuestCompletionPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.Server; import noppes.npcs.client.NoppesUtil; diff --git a/src/main/java/kamkeel/network/packets/client/RolePacket.java b/src/main/java/kamkeel/npcs/network/packets/client/RolePacket.java similarity index 85% rename from src/main/java/kamkeel/network/packets/client/RolePacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/RolePacket.java index 41f8ae187..c7b6d5e2a 100644 --- a/src/main/java/kamkeel/network/packets/client/RolePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/RolePacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/network/packets/client/ScriptOverlayClosePacket.java b/src/main/java/kamkeel/npcs/network/packets/client/ScriptOverlayClosePacket.java similarity index 79% rename from src/main/java/kamkeel/network/packets/client/ScriptOverlayClosePacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/ScriptOverlayClosePacket.java index f40193ceb..3181e3749 100644 --- a/src/main/java/kamkeel/network/packets/client/ScriptOverlayClosePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/ScriptOverlayClosePacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.client.ClientCacheHandler; diff --git a/src/main/java/kamkeel/network/packets/client/ScriptOverlayDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/ScriptOverlayDataPacket.java similarity index 83% rename from src/main/java/kamkeel/network/packets/client/ScriptOverlayDataPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/ScriptOverlayDataPacket.java index 9952be1f9..a3979c5fb 100644 --- a/src/main/java/kamkeel/network/packets/client/ScriptOverlayDataPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/ScriptOverlayDataPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.Server; diff --git a/src/main/java/kamkeel/network/packets/client/ScriptedParticlePacket.java b/src/main/java/kamkeel/npcs/network/packets/client/ScriptedParticlePacket.java similarity index 77% rename from src/main/java/kamkeel/network/packets/client/ScriptedParticlePacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/ScriptedParticlePacket.java index ea8150148..c89c4c352 100644 --- a/src/main/java/kamkeel/network/packets/client/ScriptedParticlePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/ScriptedParticlePacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.client.NoppesUtil; diff --git a/src/main/java/kamkeel/network/packets/client/ScrollSelectedPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/ScrollSelectedPacket.java similarity index 82% rename from src/main/java/kamkeel/network/packets/client/ScrollSelectedPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/ScrollSelectedPacket.java index 7de8e9fed..381b7107a 100644 --- a/src/main/java/kamkeel/network/packets/client/ScrollSelectedPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/ScrollSelectedPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/network/packets/client/StopSoundForPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/StopSoundForPacket.java similarity index 78% rename from src/main/java/kamkeel/network/packets/client/StopSoundForPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/StopSoundForPacket.java index ec066645b..d936f2971 100644 --- a/src/main/java/kamkeel/network/packets/client/StopSoundForPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/StopSoundForPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.client.controllers.ScriptSoundController; diff --git a/src/main/java/kamkeel/network/packets/client/StopSoundsPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/StopSoundsPacket.java similarity index 77% rename from src/main/java/kamkeel/network/packets/client/StopSoundsPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/StopSoundsPacket.java index 14db7f7cc..1abedb3be 100644 --- a/src/main/java/kamkeel/network/packets/client/StopSoundsPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/StopSoundsPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.client.controllers.ScriptSoundController; diff --git a/src/main/java/kamkeel/network/packets/client/SwingPlayerArmPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/SwingPlayerArmPacket.java similarity index 77% rename from src/main/java/kamkeel/network/packets/client/SwingPlayerArmPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/SwingPlayerArmPacket.java index 6ca1511b4..cdc6eaae8 100644 --- a/src/main/java/kamkeel/network/packets/client/SwingPlayerArmPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/SwingPlayerArmPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/network/packets/client/TeleporterPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/TeleporterPacket.java similarity index 78% rename from src/main/java/kamkeel/network/packets/client/TeleporterPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/TeleporterPacket.java index 2ffd14b3a..f6df09f6b 100644 --- a/src/main/java/kamkeel/network/packets/client/TeleporterPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/TeleporterPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.CustomNpcs; import noppes.npcs.constants.EnumGuiType; diff --git a/src/main/java/kamkeel/network/packets/client/UpdateAnimationsPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/UpdateAnimationsPacket.java similarity index 92% rename from src/main/java/kamkeel/network/packets/client/UpdateAnimationsPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/UpdateAnimationsPacket.java index 99ba8f582..91399cc74 100644 --- a/src/main/java/kamkeel/network/packets/client/UpdateAnimationsPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/UpdateAnimationsPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/network/packets/client/UpdateNpcPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/UpdateNpcPacket.java similarity index 83% rename from src/main/java/kamkeel/network/packets/client/UpdateNpcPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/UpdateNpcPacket.java index 1243f8c7f..05edb23e0 100644 --- a/src/main/java/kamkeel/network/packets/client/UpdateNpcPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/UpdateNpcPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/network/packets/client/VillagerListPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/VillagerListPacket.java similarity index 80% rename from src/main/java/kamkeel/network/packets/client/VillagerListPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/VillagerListPacket.java index a763c3fe4..202604664 100644 --- a/src/main/java/kamkeel/network/packets/client/VillagerListPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/VillagerListPacket.java @@ -1,13 +1,12 @@ -package kamkeel.network.packets.client; +package kamkeel.npcs.network.packets.client; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.PacketBuffer; -import noppes.npcs.Server; import noppes.npcs.ServerEventsHandler; import net.minecraft.village.MerchantRecipeList; diff --git a/src/main/java/kamkeel/network/packets/client/gui/ClonerGUIPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/gui/ClonerGUIPacket.java similarity index 79% rename from src/main/java/kamkeel/network/packets/client/gui/ClonerGUIPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/gui/ClonerGUIPacket.java index 4d18cc63a..fda00a01b 100644 --- a/src/main/java/kamkeel/network/packets/client/gui/ClonerGUIPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/gui/ClonerGUIPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client.gui; +package kamkeel.npcs.network.packets.client.gui; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.CustomNpcs; import noppes.npcs.constants.EnumGuiType; diff --git a/src/main/java/kamkeel/network/packets/client/gui/GUIClonerPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/gui/GUIClonerPacket.java similarity index 82% rename from src/main/java/kamkeel/network/packets/client/gui/GUIClonerPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/gui/GUIClonerPacket.java index e69b15463..e7d26d066 100644 --- a/src/main/java/kamkeel/network/packets/client/gui/GUIClonerPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/gui/GUIClonerPacket.java @@ -1,11 +1,11 @@ -package kamkeel.network.packets.client.gui; +package kamkeel.npcs.network.packets.client.gui; import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.CustomNpcs; diff --git a/src/main/java/kamkeel/network/packets/client/gui/GuiClosePacket.java b/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiClosePacket.java similarity index 84% rename from src/main/java/kamkeel/network/packets/client/gui/GuiClosePacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/gui/GuiClosePacket.java index 883fdd29e..5e3fa37ee 100644 --- a/src/main/java/kamkeel/network/packets/client/gui/GuiClosePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiClosePacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client.gui; +package kamkeel.npcs.network.packets.client.gui; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/network/packets/client/gui/GuiDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiDataPacket.java similarity index 86% rename from src/main/java/kamkeel/network/packets/client/gui/GuiDataPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/gui/GuiDataPacket.java index c41427987..7a12d3b1a 100644 --- a/src/main/java/kamkeel/network/packets/client/gui/GuiDataPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiDataPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client.gui; +package kamkeel.npcs.network.packets.client.gui; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/network/packets/client/gui/GuiErrorPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiErrorPacket.java similarity index 83% rename from src/main/java/kamkeel/network/packets/client/gui/GuiErrorPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/gui/GuiErrorPacket.java index d653e88f8..e1242dca8 100644 --- a/src/main/java/kamkeel/network/packets/client/gui/GuiErrorPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiErrorPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client.gui; +package kamkeel.npcs.network.packets.client.gui; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/network/packets/client/gui/GuiPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiPacket.java similarity index 80% rename from src/main/java/kamkeel/network/packets/client/gui/GuiPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/gui/GuiPacket.java index a86c8a8fe..38f880b64 100644 --- a/src/main/java/kamkeel/network/packets/client/gui/GuiPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client.gui; +package kamkeel.npcs.network.packets.client.gui; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.CustomNpcs; import noppes.npcs.constants.EnumGuiType; diff --git a/src/main/java/kamkeel/network/packets/client/gui/GuiRedstonePacket.java b/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiRedstonePacket.java similarity index 79% rename from src/main/java/kamkeel/network/packets/client/gui/GuiRedstonePacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/gui/GuiRedstonePacket.java index d12bbfd60..4116e7eed 100644 --- a/src/main/java/kamkeel/network/packets/client/gui/GuiRedstonePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiRedstonePacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client.gui; +package kamkeel.npcs.network.packets.client.gui; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.Server; diff --git a/src/main/java/kamkeel/network/packets/client/gui/GuiWaypointPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiWaypointPacket.java similarity index 79% rename from src/main/java/kamkeel/network/packets/client/gui/GuiWaypointPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/gui/GuiWaypointPacket.java index 5905b517e..094e9ef90 100644 --- a/src/main/java/kamkeel/network/packets/client/gui/GuiWaypointPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiWaypointPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client.gui; +package kamkeel.npcs.network.packets.client.gui; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.Server; diff --git a/src/main/java/kamkeel/network/packets/client/gui/IsGuiOpenPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/gui/IsGuiOpenPacket.java similarity index 79% rename from src/main/java/kamkeel/network/packets/client/gui/IsGuiOpenPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/gui/IsGuiOpenPacket.java index 20a04f1ca..041deba86 100644 --- a/src/main/java/kamkeel/network/packets/client/gui/IsGuiOpenPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/gui/IsGuiOpenPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client.gui; +package kamkeel.npcs.network.packets.client.gui; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.client.NoppesUtil; diff --git a/src/main/java/kamkeel/network/packets/client/sound/ContinueSoundsPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sound/ContinueSoundsPacket.java similarity index 77% rename from src/main/java/kamkeel/network/packets/client/sound/ContinueSoundsPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/sound/ContinueSoundsPacket.java index f6de38442..47b151726 100644 --- a/src/main/java/kamkeel/network/packets/client/sound/ContinueSoundsPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/sound/ContinueSoundsPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client.sound; +package kamkeel.npcs.network.packets.client.sound; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.client.controllers.ScriptSoundController; diff --git a/src/main/java/kamkeel/network/packets/client/sound/PauseSoundsPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sound/PauseSoundsPacket.java similarity index 77% rename from src/main/java/kamkeel/network/packets/client/sound/PauseSoundsPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/sound/PauseSoundsPacket.java index 297e9e6b6..add8d770e 100644 --- a/src/main/java/kamkeel/network/packets/client/sound/PauseSoundsPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/sound/PauseSoundsPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client.sound; +package kamkeel.npcs.network.packets.client.sound; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.client.controllers.ScriptSoundController; diff --git a/src/main/java/kamkeel/network/packets/client/sound/PlayMusicPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sound/PlayMusicPacket.java similarity index 79% rename from src/main/java/kamkeel/network/packets/client/sound/PlayMusicPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/sound/PlayMusicPacket.java index e0c8fe9b5..b59cfb9e3 100644 --- a/src/main/java/kamkeel/network/packets/client/sound/PlayMusicPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/sound/PlayMusicPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client.sound; +package kamkeel.npcs.network.packets.client.sound; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.Server; import noppes.npcs.client.controllers.MusicController; diff --git a/src/main/java/kamkeel/network/packets/client/sound/PlaySoundPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sound/PlaySoundPacket.java similarity index 80% rename from src/main/java/kamkeel/network/packets/client/sound/PlaySoundPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/sound/PlaySoundPacket.java index f0ed27cdc..a81e3873a 100644 --- a/src/main/java/kamkeel/network/packets/client/sound/PlaySoundPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/sound/PlaySoundPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client.sound; +package kamkeel.npcs.network.packets.client.sound; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.Server; import noppes.npcs.client.controllers.MusicController; diff --git a/src/main/java/kamkeel/network/packets/client/sound/PlaySoundToNoIdPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sound/PlaySoundToNoIdPacket.java similarity index 82% rename from src/main/java/kamkeel/network/packets/client/sound/PlaySoundToNoIdPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/sound/PlaySoundToNoIdPacket.java index a2b53fee6..665a477a0 100644 --- a/src/main/java/kamkeel/network/packets/client/sound/PlaySoundToNoIdPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/sound/PlaySoundToNoIdPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client.sound; +package kamkeel.npcs.network.packets.client.sound; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.Server; diff --git a/src/main/java/kamkeel/network/packets/client/sound/PlaySoundToPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sound/PlaySoundToPacket.java similarity index 82% rename from src/main/java/kamkeel/network/packets/client/sound/PlaySoundToPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/sound/PlaySoundToPacket.java index 5c651de5c..d8f4a94f0 100644 --- a/src/main/java/kamkeel/network/packets/client/sound/PlaySoundToPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/sound/PlaySoundToPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client.sound; +package kamkeel.npcs.network.packets.client.sound; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.Server; diff --git a/src/main/java/kamkeel/network/packets/client/sync/SyncAddPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncAddPacket.java similarity index 80% rename from src/main/java/kamkeel/network/packets/client/sync/SyncAddPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/sync/SyncAddPacket.java index 6224bb102..4318fedd6 100644 --- a/src/main/java/kamkeel/network/packets/client/sync/SyncAddPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncAddPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client.sync; +package kamkeel.npcs.network.packets.client.sync; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.Server; diff --git a/src/main/java/kamkeel/network/packets/client/sync/SyncConfigPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncConfigPacket.java similarity index 79% rename from src/main/java/kamkeel/network/packets/client/sync/SyncConfigPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/sync/SyncConfigPacket.java index eaf3b419a..5532cd97f 100644 --- a/src/main/java/kamkeel/network/packets/client/sync/SyncConfigPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncConfigPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client.sync; +package kamkeel.npcs.network.packets.client.sync; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.Server; diff --git a/src/main/java/kamkeel/network/packets/client/sync/SyncEndPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncEndPacket.java similarity index 80% rename from src/main/java/kamkeel/network/packets/client/sync/SyncEndPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/sync/SyncEndPacket.java index bc5a4e26d..b9cbcb7b0 100644 --- a/src/main/java/kamkeel/network/packets/client/sync/SyncEndPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncEndPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client.sync; +package kamkeel.npcs.network.packets.client.sync; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.Server; diff --git a/src/main/java/kamkeel/network/packets/client/sync/SyncPlayerPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncPlayerPacket.java similarity index 77% rename from src/main/java/kamkeel/network/packets/client/sync/SyncPlayerPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/sync/SyncPlayerPacket.java index 372f26e60..a595e3622 100644 --- a/src/main/java/kamkeel/network/packets/client/sync/SyncPlayerPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncPlayerPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client.sync; +package kamkeel.npcs.network.packets.client.sync; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.client.NoppesUtil; diff --git a/src/main/java/kamkeel/network/packets/client/sync/SyncRecipesAddPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesAddPacket.java similarity index 85% rename from src/main/java/kamkeel/network/packets/client/sync/SyncRecipesAddPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesAddPacket.java index 8460dac7f..cdef473ec 100644 --- a/src/main/java/kamkeel/network/packets/client/sync/SyncRecipesAddPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesAddPacket.java @@ -1,11 +1,11 @@ -package kamkeel.network.packets.client.sync; +package kamkeel.npcs.network.packets.client.sync; import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcs; diff --git a/src/main/java/kamkeel/network/packets/client/sync/SyncRecipesCarpentryBenchPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesCarpentryBenchPacket.java similarity index 79% rename from src/main/java/kamkeel/network/packets/client/sync/SyncRecipesCarpentryBenchPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesCarpentryBenchPacket.java index c49a37dc0..f78cf1ea1 100644 --- a/src/main/java/kamkeel/network/packets/client/sync/SyncRecipesCarpentryBenchPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesCarpentryBenchPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client.sync; +package kamkeel.npcs.network.packets.client.sync; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.controllers.RecipeController; diff --git a/src/main/java/kamkeel/network/packets/client/sync/SyncRecipesWorkbenchPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesWorkbenchPacket.java similarity index 79% rename from src/main/java/kamkeel/network/packets/client/sync/SyncRecipesWorkbenchPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesWorkbenchPacket.java index bb3a4ab79..da4608155 100644 --- a/src/main/java/kamkeel/network/packets/client/sync/SyncRecipesWorkbenchPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesWorkbenchPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client.sync; +package kamkeel.npcs.network.packets.client.sync; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.controllers.RecipeController; diff --git a/src/main/java/kamkeel/network/packets/client/sync/SyncRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRemovePacket.java similarity index 78% rename from src/main/java/kamkeel/network/packets/client/sync/SyncRemovePacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRemovePacket.java index adc7c9ae3..20708ec7b 100644 --- a/src/main/java/kamkeel/network/packets/client/sync/SyncRemovePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRemovePacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client.sync; +package kamkeel.npcs.network.packets.client.sync; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.controllers.SyncController; diff --git a/src/main/java/kamkeel/network/packets/client/sync/SyncUpdatePacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncUpdatePacket.java similarity index 80% rename from src/main/java/kamkeel/network/packets/client/sync/SyncUpdatePacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/sync/SyncUpdatePacket.java index c95ad6357..69ce07ae5 100644 --- a/src/main/java/kamkeel/network/packets/client/sync/SyncUpdatePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncUpdatePacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client.sync; +package kamkeel.npcs.network.packets.client.sync; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.Server; diff --git a/src/main/java/kamkeel/network/packets/client/sync/SyncWeaponPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncWeaponPacket.java similarity index 84% rename from src/main/java/kamkeel/network/packets/client/sync/SyncWeaponPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/sync/SyncWeaponPacket.java index 59be33b6e..22d9d9789 100644 --- a/src/main/java/kamkeel/network/packets/client/sync/SyncWeaponPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/sync/SyncWeaponPacket.java @@ -1,10 +1,10 @@ -package kamkeel.network.packets.client.sync; +package kamkeel.npcs.network.packets.client.sync; import io.netty.buffer.ByteBuf; -import kamkeel.network.AbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/kamkeel/network/packets/large/LargeScrollDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/large/LargeScrollDataPacket.java similarity index 80% rename from src/main/java/kamkeel/network/packets/large/LargeScrollDataPacket.java rename to src/main/java/kamkeel/npcs/network/packets/large/LargeScrollDataPacket.java index acdd6757d..9a31961d6 100644 --- a/src/main/java/kamkeel/network/packets/large/LargeScrollDataPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/large/LargeScrollDataPacket.java @@ -1,11 +1,11 @@ -package kamkeel.network.packets.large; +package kamkeel.npcs.network.packets.large; import io.netty.buffer.ByteBuf; -import kamkeel.network.LargeAbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; -import kamkeel.util.ByteBufUtils; +import kamkeel.npcs.network.LargeAbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; +import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.client.NoppesUtil; diff --git a/src/main/java/kamkeel/network/packets/large/LargeScrollGroupPacket.java b/src/main/java/kamkeel/npcs/network/packets/large/LargeScrollGroupPacket.java similarity index 80% rename from src/main/java/kamkeel/network/packets/large/LargeScrollGroupPacket.java rename to src/main/java/kamkeel/npcs/network/packets/large/LargeScrollGroupPacket.java index 95384acfb..40a1a2f4f 100644 --- a/src/main/java/kamkeel/network/packets/large/LargeScrollGroupPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/large/LargeScrollGroupPacket.java @@ -1,11 +1,11 @@ -package kamkeel.network.packets.large; +package kamkeel.npcs.network.packets.large; import io.netty.buffer.ByteBuf; -import kamkeel.network.LargeAbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; -import kamkeel.util.ByteBufUtils; +import kamkeel.npcs.network.LargeAbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; +import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.client.NoppesUtil; diff --git a/src/main/java/kamkeel/network/packets/large/LargeScrollListPacket.java b/src/main/java/kamkeel/npcs/network/packets/large/LargeScrollListPacket.java similarity index 80% rename from src/main/java/kamkeel/network/packets/large/LargeScrollListPacket.java rename to src/main/java/kamkeel/npcs/network/packets/large/LargeScrollListPacket.java index 3fc99cff0..b2e8d5af5 100644 --- a/src/main/java/kamkeel/network/packets/large/LargeScrollListPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/large/LargeScrollListPacket.java @@ -1,12 +1,12 @@ // src/main/java/kamkeel/network/packets/large/LargeScrollListPacket.java -package kamkeel.network.packets.large; +package kamkeel.npcs.network.packets.large; import io.netty.buffer.ByteBuf; -import kamkeel.network.LargeAbstractPacket; -import kamkeel.network.PacketChannel; -import kamkeel.network.PacketHandler; -import kamkeel.network.enums.EnumClientPacket; -import kamkeel.util.ByteBufUtils; +import kamkeel.npcs.network.LargeAbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumClientPacket; +import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.client.NoppesUtil; diff --git a/src/main/java/kamkeel/util/ByteBufUtils.java b/src/main/java/kamkeel/npcs/util/ByteBufUtils.java similarity index 99% rename from src/main/java/kamkeel/util/ByteBufUtils.java rename to src/main/java/kamkeel/npcs/util/ByteBufUtils.java index c5e4dee1d..0c7bfa779 100644 --- a/src/main/java/kamkeel/util/ByteBufUtils.java +++ b/src/main/java/kamkeel/npcs/util/ByteBufUtils.java @@ -1,4 +1,4 @@ -package kamkeel.util; +package kamkeel.npcs.util; import com.google.common.base.Charsets; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/kamkeel/util/TextSplitter.java b/src/main/java/kamkeel/npcs/util/TextSplitter.java similarity index 97% rename from src/main/java/kamkeel/util/TextSplitter.java rename to src/main/java/kamkeel/npcs/util/TextSplitter.java index 30092cf92..d4b887dcf 100644 --- a/src/main/java/kamkeel/util/TextSplitter.java +++ b/src/main/java/kamkeel/npcs/util/TextSplitter.java @@ -1,4 +1,4 @@ -package kamkeel.util; +package kamkeel.npcs.util; import java.util.ArrayList; import java.util.List; @@ -37,4 +37,4 @@ public class TextSplitter { System.out.println(line); } } -} \ No newline at end of file +} diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index 1a8108a2f..4e800cbd7 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -10,12 +10,12 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.relauncher.Side; import foxz.command.CommandNoppes; -import kamkeel.addon.AddonManager; -import kamkeel.command.CommandKamkeel; -import kamkeel.command.profile.CommandProfile; -import kamkeel.controllers.ProfileController; -import kamkeel.controllers.data.CNPCData; -import kamkeel.developer.Developer; +import kamkeel.npcs.addon.AddonManager; +import kamkeel.npcs.command.CommandKamkeel; +import kamkeel.npcs.command.profile.CommandProfile; +import kamkeel.npcs.controllers.ProfileController; +import kamkeel.npcs.controllers.data.CNPCData; +import kamkeel.npcs.developer.Developer; import net.minecraft.block.Block; import net.minecraft.block.BlockIce; import net.minecraft.block.BlockLeavesBase; diff --git a/src/main/java/noppes/npcs/CustomNpcsPermissions.java b/src/main/java/noppes/npcs/CustomNpcsPermissions.java index ebb749fe5..24898e8a4 100644 --- a/src/main/java/noppes/npcs/CustomNpcsPermissions.java +++ b/src/main/java/noppes/npcs/CustomNpcsPermissions.java @@ -2,7 +2,7 @@ package noppes.npcs; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; -import kamkeel.developer.Developer; +import kamkeel.npcs.developer.Developer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/noppes/npcs/PacketHandlerPlayer.java b/src/main/java/noppes/npcs/PacketHandlerPlayer.java index ec85c256b..7d57b2184 100644 --- a/src/main/java/noppes/npcs/PacketHandlerPlayer.java +++ b/src/main/java/noppes/npcs/PacketHandlerPlayer.java @@ -3,7 +3,6 @@ package noppes.npcs; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent; import io.netty.buffer.ByteBuf; -import kamkeel.addon.DBCAddon; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Items; diff --git a/src/main/java/noppes/npcs/PacketHandlerServer.java b/src/main/java/noppes/npcs/PacketHandlerServer.java index 83bf168df..4f5bbb9d6 100644 --- a/src/main/java/noppes/npcs/PacketHandlerServer.java +++ b/src/main/java/noppes/npcs/PacketHandlerServer.java @@ -6,7 +6,6 @@ import cpw.mods.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent; import cpw.mods.fml.relauncher.Side; import foxz.utils.Market; import io.netty.buffer.ByteBuf; -import kamkeel.addon.DBCAddon; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.passive.EntityVillager; diff --git a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java index 8ae6a17ee..211edc791 100644 --- a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java @@ -5,7 +5,6 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; -import kamkeel.controllers.ProfileController; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -22,9 +21,7 @@ import net.minecraftforge.event.entity.living.*; import net.minecraftforge.event.entity.player.*; import net.minecraftforge.event.world.BlockEvent; import noppes.npcs.api.entity.IPlayer; -import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumQuestType; -import noppes.npcs.constants.SyncType; import noppes.npcs.controllers.PartyController; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.ScriptController; diff --git a/src/main/java/noppes/npcs/ServerTickHandler.java b/src/main/java/noppes/npcs/ServerTickHandler.java index 2b0e79be7..4a7584060 100644 --- a/src/main/java/noppes/npcs/ServerTickHandler.java +++ b/src/main/java/noppes/npcs/ServerTickHandler.java @@ -4,7 +4,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import kamkeel.controllers.ProfileController; +import kamkeel.npcs.controllers.ProfileController; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; import net.minecraft.world.WorldServer; diff --git a/src/main/java/noppes/npcs/ai/CombatHandler.java b/src/main/java/noppes/npcs/ai/CombatHandler.java index eb980a959..310ec79dd 100644 --- a/src/main/java/noppes/npcs/ai/CombatHandler.java +++ b/src/main/java/noppes/npcs/ai/CombatHandler.java @@ -1,6 +1,6 @@ package noppes.npcs.ai; -import kamkeel.addon.DBCAddon; +import kamkeel.npcs.addon.DBCAddon; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/noppes/npcs/ai/EntityAIAttackTarget.java b/src/main/java/noppes/npcs/ai/EntityAIAttackTarget.java index dce5b5638..d9cae376f 100644 --- a/src/main/java/noppes/npcs/ai/EntityAIAttackTarget.java +++ b/src/main/java/noppes/npcs/ai/EntityAIAttackTarget.java @@ -1,6 +1,6 @@ package noppes.npcs.ai; -import kamkeel.addon.DBCAddon; +import kamkeel.npcs.addon.DBCAddon; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.EntityAIBase; diff --git a/src/main/java/noppes/npcs/ai/selector/NPCAttackSelector.java b/src/main/java/noppes/npcs/ai/selector/NPCAttackSelector.java index 90d53919d..fbc215f11 100644 --- a/src/main/java/noppes/npcs/ai/selector/NPCAttackSelector.java +++ b/src/main/java/noppes/npcs/ai/selector/NPCAttackSelector.java @@ -1,6 +1,6 @@ package noppes.npcs.ai.selector; -import kamkeel.addon.DBCAddon; +import kamkeel.npcs.addon.DBCAddon; import net.minecraft.command.IEntitySelector; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/noppes/npcs/client/ClientProxy.java b/src/main/java/noppes/npcs/client/ClientProxy.java index 8b511254e..373d52081 100644 --- a/src/main/java/noppes/npcs/client/ClientProxy.java +++ b/src/main/java/noppes/npcs/client/ClientProxy.java @@ -5,8 +5,7 @@ import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.ObfuscationReflectionHelper; -import kamkeel.addon.client.DBCClient; -import net.minecraft.block.Block; +import kamkeel.npcs.addon.client.DBCClient; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.model.ModelBiped; diff --git a/src/main/java/noppes/npcs/client/ClientTickHandler.java b/src/main/java/noppes/npcs/client/ClientTickHandler.java index 6424ea4ad..e1a5a53fc 100644 --- a/src/main/java/noppes/npcs/client/ClientTickHandler.java +++ b/src/main/java/noppes/npcs/client/ClientTickHandler.java @@ -5,11 +5,8 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import kamkeel.addon.DBCAddon; -import kamkeel.addon.client.DBCClient; +import kamkeel.npcs.addon.client.DBCClient; import net.minecraft.client.Minecraft; -import net.minecraft.client.audio.SoundHandler; -import net.minecraft.client.audio.SoundManager; import net.minecraft.entity.Entity; import net.minecraft.inventory.ContainerPlayer; import net.minecraft.world.World; diff --git a/src/main/java/noppes/npcs/client/EntityUtil.java b/src/main/java/noppes/npcs/client/EntityUtil.java index 824bb7dc2..2aadea2a4 100644 --- a/src/main/java/noppes/npcs/client/EntityUtil.java +++ b/src/main/java/noppes/npcs/client/EntityUtil.java @@ -1,7 +1,7 @@ package noppes.npcs.client; -import kamkeel.addon.DBCAddon; -import kamkeel.addon.GeckoAddon; +import kamkeel.npcs.addon.DBCAddon; +import kamkeel.npcs.addon.GeckoAddon; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.boss.EntityDragon; import net.minecraft.entity.passive.EntityChicken; diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java index 94c816936..eff43fae5 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java @@ -1,7 +1,7 @@ package noppes.npcs.client.gui.mainmenu; import com.mojang.authlib.GameProfile; -import kamkeel.addon.client.GeckoAddonClient; +import kamkeel.npcs.addon.client.GeckoAddonClient; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.DataDisplay; diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java index 192b405e3..7ea0de8f8 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java @@ -1,7 +1,6 @@ package noppes.npcs.client.gui.mainmenu; -import kamkeel.addon.DBCAddon; -import kamkeel.addon.client.DBCClient; +import kamkeel.npcs.addon.client.DBCClient; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.EnumCreatureAttribute; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java b/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java index 1aec9f0b4..a6d6c2c54 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java @@ -1,6 +1,6 @@ package noppes.npcs.client.gui.model; -import kamkeel.addon.client.GeckoAddonClient; +import kamkeel.npcs.addon.client.GeckoAddonClient; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiCNPCInventory.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiCNPCInventory.java index 53e0d7ae6..3ab43c14e 100644 --- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiCNPCInventory.java +++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiCNPCInventory.java @@ -1,7 +1,7 @@ package noppes.npcs.client.gui.player.inventory; import cpw.mods.fml.common.Loader; -import kamkeel.addon.client.DBCClient; +import kamkeel.npcs.addon.client.DBCClient; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java b/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java index 7ee107877..ea9a1c700 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java @@ -1,6 +1,6 @@ package noppes.npcs.client.gui.util; -import kamkeel.util.TextSplitter; +import kamkeel.npcs.util.TextSplitter; import net.minecraft.client.gui.GuiScreen; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNpcButton.java b/src/main/java/noppes/npcs/client/gui/util/GuiNpcButton.java index 836c25ab1..bd3e3b8f0 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiNpcButton.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiNpcButton.java @@ -1,6 +1,6 @@ package noppes.npcs.client.gui.util; -import kamkeel.util.TextSplitter; +import kamkeel.npcs.util.TextSplitter; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.RenderHelper; diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java index 1fb76656e..baa3d1720 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java @@ -2,7 +2,7 @@ package noppes.npcs.client.renderer; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import kamkeel.addon.client.GeckoAddonClient; +import kamkeel.npcs.addon.client.GeckoAddonClient; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/noppes/npcs/config/ConfigScript.java b/src/main/java/noppes/npcs/config/ConfigScript.java index 6e4c3dd72..57c6d434c 100644 --- a/src/main/java/noppes/npcs/config/ConfigScript.java +++ b/src/main/java/noppes/npcs/config/ConfigScript.java @@ -1,7 +1,7 @@ package noppes.npcs.config; import cpw.mods.fml.common.FMLLog; -import kamkeel.developer.Developer; +import kamkeel.npcs.developer.Developer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.MinecraftServer; import net.minecraftforge.common.config.Configuration; @@ -178,7 +178,7 @@ public class ConfigScript if(ScriptOpsOnly){ return isOp || scriptDev; } - + return scriptDev || CustomNpcsPermissions.hasPermission(player, perm); } } diff --git a/src/main/java/noppes/npcs/controllers/SyncController.java b/src/main/java/noppes/npcs/controllers/SyncController.java index 8ebf881e5..48c0891b5 100644 --- a/src/main/java/noppes/npcs/controllers/SyncController.java +++ b/src/main/java/noppes/npcs/controllers/SyncController.java @@ -1,7 +1,7 @@ package noppes.npcs.controllers; import io.netty.buffer.ByteBuf; -import kamkeel.addon.DBCAddon; +import kamkeel.npcs.addon.DBCAddon; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerData.java b/src/main/java/noppes/npcs/controllers/data/PlayerData.java index 86dfa91dd..b4d65091a 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerData.java @@ -1,6 +1,6 @@ package noppes.npcs.controllers.data; -import kamkeel.addon.DBCAddon; +import kamkeel.npcs.addon.DBCAddon; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java index 4353d3395..c9df8b905 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java @@ -5,8 +5,8 @@ import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.addon.DBCAddon; -import kamkeel.addon.client.DBCClient; +import kamkeel.npcs.addon.DBCAddon; +import kamkeel.npcs.addon.client.DBCClient; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; diff --git a/src/main/java/noppes/npcs/entity/EntityProjectile.java b/src/main/java/noppes/npcs/entity/EntityProjectile.java index 5e08eb3ae..e3e581df2 100644 --- a/src/main/java/noppes/npcs/entity/EntityProjectile.java +++ b/src/main/java/noppes/npcs/entity/EntityProjectile.java @@ -2,7 +2,7 @@ package noppes.npcs.entity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import kamkeel.addon.DBCAddon; +import kamkeel.npcs.addon.DBCAddon; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -27,7 +27,6 @@ import net.minecraft.world.Explosion; import net.minecraft.world.World; import noppes.npcs.DataStats; import noppes.npcs.EventHooks; -import noppes.npcs.NpcDamageSource; import noppes.npcs.api.IPos; import noppes.npcs.api.IWorld; import noppes.npcs.api.entity.IEntity; diff --git a/src/main/java/tconstruct/client/tabs/InventoryTabCustomNpc.java b/src/main/java/tconstruct/client/tabs/InventoryTabCustomNpc.java index bba7409fd..888bc77f1 100644 --- a/src/main/java/tconstruct/client/tabs/InventoryTabCustomNpc.java +++ b/src/main/java/tconstruct/client/tabs/InventoryTabCustomNpc.java @@ -1,7 +1,6 @@ package tconstruct.client.tabs; -import kamkeel.addon.DBCAddon; -import kamkeel.addon.client.DBCClient; +import kamkeel.npcs.addon.client.DBCClient; import net.minecraft.client.Minecraft; import net.minecraft.init.Items; import net.minecraft.item.ItemStack;