diff --git a/src/main/java/foxz/command/CmdDialog.java b/src/main/java/foxz/command/CmdDialog.java index ee7f71857..ddca58150 100644 --- a/src/main/java/foxz/command/CmdDialog.java +++ b/src/main/java/foxz/command/CmdDialog.java @@ -1,16 +1,15 @@ package foxz.command; -import java.util.Arrays; import java.util.List; import net.minecraft.command.CommandBase; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.NoppesUtilServer; import noppes.npcs.client.EntityUtil; -import noppes.npcs.controllers.Dialog; +import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.DialogController; -import noppes.npcs.controllers.DialogOption; -import noppes.npcs.controllers.PlayerData; +import noppes.npcs.controllers.data.DialogOption; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityDialogNpc; import foxz.commandhelper.ChMcLogger; import foxz.commandhelper.annotations.Command; diff --git a/src/main/java/foxz/command/CmdFaction.java b/src/main/java/foxz/command/CmdFaction.java index fdfab8784..6733f0129 100644 --- a/src/main/java/foxz/command/CmdFaction.java +++ b/src/main/java/foxz/command/CmdFaction.java @@ -2,9 +2,9 @@ package foxz.command; import java.util.List; -import noppes.npcs.controllers.Faction; -import noppes.npcs.controllers.PlayerData; -import noppes.npcs.controllers.PlayerFactionData; +import noppes.npcs.controllers.data.Faction; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerFactionData; import foxz.commandhelper.ChMcLogger; import foxz.commandhelper.annotations.Command; import foxz.commandhelper.annotations.SubCommand; diff --git a/src/main/java/foxz/command/CmdNoppes.java b/src/main/java/foxz/command/CmdNoppes.java index 9e95fe665..8c2cc2e8c 100644 --- a/src/main/java/foxz/command/CmdNoppes.java +++ b/src/main/java/foxz/command/CmdNoppes.java @@ -25,7 +25,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentTranslation; import noppes.npcs.controllers.FactionController; -import noppes.npcs.controllers.PlayerData; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityNPCInterface; import foxz.commandhelper.ChMcLogger; import foxz.commandhelper.annotations.Command; diff --git a/src/main/java/foxz/command/CmdQuest.java b/src/main/java/foxz/command/CmdQuest.java index 5561b0890..d531d8943 100644 --- a/src/main/java/foxz/command/CmdQuest.java +++ b/src/main/java/foxz/command/CmdQuest.java @@ -1,20 +1,15 @@ package foxz.command; -import static foxz.utils.Utils.getOnlinePlayer; - import java.util.List; -import net.minecraft.command.PlayerSelector; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import noppes.npcs.Server; import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.controllers.DialogController; -import noppes.npcs.controllers.PlayerData; -import noppes.npcs.controllers.PlayerDataController; -import noppes.npcs.controllers.Quest; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.Quest; import noppes.npcs.controllers.QuestController; -import noppes.npcs.controllers.QuestData; +import noppes.npcs.controllers.data.QuestData; import foxz.commandhelper.ChMcLogger; import foxz.commandhelper.annotations.Command; import foxz.commandhelper.annotations.SubCommand; diff --git a/src/main/java/foxz/commandhelper/AbstractCommandHelper.java b/src/main/java/foxz/commandhelper/AbstractCommandHelper.java index f7eaf5a84..8667947fd 100644 --- a/src/main/java/foxz/commandhelper/AbstractCommandHelper.java +++ b/src/main/java/foxz/commandhelper/AbstractCommandHelper.java @@ -20,7 +20,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import noppes.npcs.controllers.PlayerData; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.PlayerDataController; import foxz.commandhelper.annotations.Command; import foxz.commandhelper.annotations.SubCommand; diff --git a/src/main/java/noppes/npcs/CommonProxy.java b/src/main/java/noppes/npcs/CommonProxy.java index 47e99d01d..4a8d809e8 100644 --- a/src/main/java/noppes/npcs/CommonProxy.java +++ b/src/main/java/noppes/npcs/CommonProxy.java @@ -12,8 +12,7 @@ import net.minecraftforge.common.util.FakePlayer; import noppes.npcs.blocks.tiles.TileNpcContainer; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.containers.*; -import noppes.npcs.controllers.PlayerData; -import noppes.npcs.entity.EntityCustomNpc; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityNPCInterface; import cpw.mods.fml.common.network.IGuiHandler; import noppes.npcs.scripted.interfaces.IWorld; diff --git a/src/main/java/noppes/npcs/DataAdvanced.java b/src/main/java/noppes/npcs/DataAdvanced.java index e95962f0e..67200a374 100644 --- a/src/main/java/noppes/npcs/DataAdvanced.java +++ b/src/main/java/noppes/npcs/DataAdvanced.java @@ -6,10 +6,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.constants.EnumJobType; import noppes.npcs.constants.EnumRoleType; -import noppes.npcs.controllers.DialogOption; -import noppes.npcs.controllers.FactionOptions; -import noppes.npcs.controllers.Line; -import noppes.npcs.controllers.Lines; +import noppes.npcs.controllers.data.DialogOption; +import noppes.npcs.controllers.data.FactionOptions; +import noppes.npcs.controllers.data.Line; +import noppes.npcs.controllers.data.Lines; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobBard; import noppes.npcs.roles.JobChunkLoader; diff --git a/src/main/java/noppes/npcs/EventHooks.java b/src/main/java/noppes/npcs/EventHooks.java index 6e8d8ea7d..4da9356f7 100644 --- a/src/main/java/noppes/npcs/EventHooks.java +++ b/src/main/java/noppes/npcs/EventHooks.java @@ -20,8 +20,7 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.event.entity.EntityEvent; import net.minecraftforge.event.world.WorldEvent; import noppes.npcs.controllers.*; -import noppes.npcs.controllers.data.ForgeDataScript; -import noppes.npcs.controllers.data.PlayerDataScript; +import noppes.npcs.controllers.data.*; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.event.*; import noppes.npcs.scripted.event.PlayerEvent.ChatEvent; diff --git a/src/main/java/noppes/npcs/NPCSpawning.java b/src/main/java/noppes/npcs/NPCSpawning.java index c1fb610d2..56b12adf7 100644 --- a/src/main/java/noppes/npcs/NPCSpawning.java +++ b/src/main/java/noppes/npcs/NPCSpawning.java @@ -26,7 +26,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.event.ForgeEventFactory; import noppes.npcs.controllers.SpawnController; -import noppes.npcs.controllers.SpawnData; +import noppes.npcs.controllers.data.SpawnData; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/NoppesUtilPlayer.java b/src/main/java/noppes/npcs/NoppesUtilPlayer.java index 80af8a0d3..df129a397 100644 --- a/src/main/java/noppes/npcs/NoppesUtilPlayer.java +++ b/src/main/java/noppes/npcs/NoppesUtilPlayer.java @@ -26,6 +26,7 @@ import noppes.npcs.containers.ContainerNPCBankInterface; import noppes.npcs.containers.ContainerNPCFollower; import noppes.npcs.containers.ContainerNPCFollowerHire; import noppes.npcs.controllers.*; +import noppes.npcs.controllers.data.*; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleFollower; import cpw.mods.fml.common.network.internal.FMLProxyPacket; diff --git a/src/main/java/noppes/npcs/NoppesUtilServer.java b/src/main/java/noppes/npcs/NoppesUtilServer.java index 53e451fde..9490ca117 100644 --- a/src/main/java/noppes/npcs/NoppesUtilServer.java +++ b/src/main/java/noppes/npcs/NoppesUtilServer.java @@ -14,7 +14,6 @@ import java.util.Map; import java.util.UUID; import java.util.zip.GZIPOutputStream; -import net.minecraft.command.ICommandSender; import net.minecraft.command.server.CommandBlockLogic; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; @@ -41,34 +40,33 @@ import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumPlayerData; import noppes.npcs.constants.EnumRoleType; -import noppes.npcs.constants.EnumScriptType; import noppes.npcs.containers.ContainerManageBanks; import noppes.npcs.containers.ContainerManageRecipes; -import noppes.npcs.controllers.Bank; +import noppes.npcs.controllers.data.Bank; import noppes.npcs.controllers.BankController; -import noppes.npcs.controllers.Dialog; -import noppes.npcs.controllers.DialogCategory; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.DialogCategory; import noppes.npcs.controllers.DialogController; -import noppes.npcs.controllers.DialogOption; -import noppes.npcs.controllers.Faction; +import noppes.npcs.controllers.data.DialogOption; +import noppes.npcs.controllers.data.Faction; import noppes.npcs.controllers.FactionController; -import noppes.npcs.controllers.PlayerBankData; -import noppes.npcs.controllers.PlayerData; +import noppes.npcs.controllers.data.PlayerBankData; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.PlayerDataController; -import noppes.npcs.controllers.PlayerDialogData; -import noppes.npcs.controllers.PlayerFactionData; +import noppes.npcs.controllers.data.PlayerDialogData; +import noppes.npcs.controllers.data.PlayerFactionData; import noppes.npcs.controllers.PlayerQuestController; -import noppes.npcs.controllers.PlayerQuestData; -import noppes.npcs.controllers.PlayerTransportData; -import noppes.npcs.controllers.Quest; -import noppes.npcs.controllers.QuestCategory; +import noppes.npcs.controllers.data.PlayerQuestData; +import noppes.npcs.controllers.data.PlayerTransportData; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.QuestCategory; import noppes.npcs.controllers.QuestController; -import noppes.npcs.controllers.RecipeCarpentry; +import noppes.npcs.controllers.data.RecipeCarpentry; import noppes.npcs.controllers.RecipeController; import noppes.npcs.controllers.ServerCloneController; -import noppes.npcs.controllers.TransportCategory; +import noppes.npcs.controllers.data.TransportCategory; import noppes.npcs.controllers.TransportController; -import noppes.npcs.controllers.TransportLocation; +import noppes.npcs.controllers.data.TransportLocation; import noppes.npcs.entity.EntityDialogNpc; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleTransporter; diff --git a/src/main/java/noppes/npcs/PacketHandlerPlayer.java b/src/main/java/noppes/npcs/PacketHandlerPlayer.java index 963a9f94c..7e0c8ae45 100644 --- a/src/main/java/noppes/npcs/PacketHandlerPlayer.java +++ b/src/main/java/noppes/npcs/PacketHandlerPlayer.java @@ -3,8 +3,6 @@ package noppes.npcs; import io.netty.buffer.ByteBuf; import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; import java.util.Iterator; import net.minecraft.entity.player.EntityPlayerMP; @@ -21,6 +19,7 @@ import noppes.npcs.blocks.tiles.TileBook; import noppes.npcs.constants.*; import noppes.npcs.containers.ContainerMail; import noppes.npcs.controllers.*; +import noppes.npcs.controllers.data.*; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleCompanion; import cpw.mods.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/noppes/npcs/PacketHandlerServer.java b/src/main/java/noppes/npcs/PacketHandlerServer.java index c764e97ea..f15693742 100644 --- a/src/main/java/noppes/npcs/PacketHandlerServer.java +++ b/src/main/java/noppes/npcs/PacketHandlerServer.java @@ -40,9 +40,7 @@ import noppes.npcs.containers.ContainerCustomGui; import noppes.npcs.containers.ContainerMail; import noppes.npcs.controllers.*; import noppes.npcs.controllers.LinkedNpcController.LinkedData; -import noppes.npcs.controllers.data.ForgeDataScript; -import noppes.npcs.controllers.data.NPCDataScript; -import noppes.npcs.controllers.data.PlayerDataScript; +import noppes.npcs.controllers.data.*; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobSpawner; diff --git a/src/main/java/noppes/npcs/QuestLogData.java b/src/main/java/noppes/npcs/QuestLogData.java index a0c83726e..423da0757 100644 --- a/src/main/java/noppes/npcs/QuestLogData.java +++ b/src/main/java/noppes/npcs/QuestLogData.java @@ -6,10 +6,10 @@ import java.util.Vector; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.constants.EnumQuestCompletion; -import noppes.npcs.controllers.PlayerData; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.PlayerQuestController; -import noppes.npcs.controllers.Quest; +import noppes.npcs.controllers.data.Quest; public class QuestLogData { public HashMap> categories = new HashMap>(); diff --git a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java index 0af567230..aa6b73239 100644 --- a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java @@ -12,10 +12,7 @@ import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.ContainerPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.MinecraftServer; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.WorldServer; @@ -29,16 +26,15 @@ import net.minecraftforge.event.entity.living.LivingFallEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.event.entity.player.*; import net.minecraftforge.event.world.*; -import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.controllers.*; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.data.PlayerDataScript; +import noppes.npcs.controllers.data.PlayerQuestData; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.interfaces.entity.IPlayer; -import java.util.List; - public class ScriptPlayerEventHandler { public ScriptPlayerEventHandler() { } diff --git a/src/main/java/noppes/npcs/ServerEventsHandler.java b/src/main/java/noppes/npcs/ServerEventsHandler.java index 1d964f24c..a1294a569 100644 --- a/src/main/java/noppes/npcs/ServerEventsHandler.java +++ b/src/main/java/noppes/npcs/ServerEventsHandler.java @@ -34,8 +34,8 @@ import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.constants.EnumRoleType; -import noppes.npcs.constants.EnumScriptType; import noppes.npcs.controllers.*; +import noppes.npcs.controllers.data.*; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.items.ItemExcalibur; import noppes.npcs.items.ItemShield; diff --git a/src/main/java/noppes/npcs/VersionCompatibility.java b/src/main/java/noppes/npcs/VersionCompatibility.java index 90bb2479d..77e33a084 100644 --- a/src/main/java/noppes/npcs/VersionCompatibility.java +++ b/src/main/java/noppes/npcs/VersionCompatibility.java @@ -7,8 +7,8 @@ import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagInt; import net.minecraft.nbt.NBTTagList; -import noppes.npcs.controllers.Line; -import noppes.npcs.controllers.Lines; +import noppes.npcs.controllers.data.Line; +import noppes.npcs.controllers.data.Lines; import noppes.npcs.entity.EntityNPCInterface; public class VersionCompatibility { diff --git a/src/main/java/noppes/npcs/ai/EntityAIWander.java b/src/main/java/noppes/npcs/ai/EntityAIWander.java index 7913edff5..66ecd3025 100644 --- a/src/main/java/noppes/npcs/ai/EntityAIWander.java +++ b/src/main/java/noppes/npcs/ai/EntityAIWander.java @@ -10,7 +10,7 @@ import net.minecraft.util.Vec3; import noppes.npcs.CustomNpcs; import noppes.npcs.ai.selector.NPCInteractSelector; import noppes.npcs.constants.AiMutex; -import noppes.npcs.controllers.Line; +import noppes.npcs.controllers.data.Line; import noppes.npcs.entity.EntityNPCInterface; public class EntityAIWander extends EntityAIBase diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileBorder.java b/src/main/java/noppes/npcs/blocks/tiles/TileBorder.java index 9012a168f..9eb75082a 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileBorder.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileBorder.java @@ -14,7 +14,7 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentTranslation; -import noppes.npcs.controllers.Availability; +import noppes.npcs.controllers.data.Availability; public class TileBorder extends TileEntity implements IEntitySelector{ public Availability availability = new Availability(); diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileRedstoneBlock.java b/src/main/java/noppes/npcs/blocks/tiles/TileRedstoneBlock.java index 6bd1ed8c9..224251e2c 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileRedstoneBlock.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileRedstoneBlock.java @@ -9,7 +9,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import noppes.npcs.CustomNpcs; import noppes.npcs.blocks.BlockNpcRedstone; -import noppes.npcs.controllers.Availability; +import noppes.npcs.controllers.data.Availability; public class TileRedstoneBlock extends TileEntity { public int onRange = 6; diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java b/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java index 5d8b5914a..e57b3e99b 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java @@ -10,10 +10,10 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.StatCollector; import noppes.npcs.constants.EnumQuestType; -import noppes.npcs.controllers.PlayerData; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.PlayerDataController; -import noppes.npcs.controllers.PlayerQuestData; -import noppes.npcs.controllers.QuestData; +import noppes.npcs.controllers.data.PlayerQuestData; +import noppes.npcs.controllers.data.QuestData; import noppes.npcs.quests.QuestLocation; public class TileWaypoint extends TileEntity { diff --git a/src/main/java/noppes/npcs/client/ClientProxy.java b/src/main/java/noppes/npcs/client/ClientProxy.java index c663c371d..22b555211 100644 --- a/src/main/java/noppes/npcs/client/ClientProxy.java +++ b/src/main/java/noppes/npcs/client/ClientProxy.java @@ -131,7 +131,7 @@ import noppes.npcs.client.renderer.blocks.BlockWeaponRackRenderer; import noppes.npcs.config.StringCache; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.containers.*; -import noppes.npcs.controllers.PlayerData; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.*; import noppes.npcs.items.ItemScripted; diff --git a/src/main/java/noppes/npcs/client/NoppesUtil.java b/src/main/java/noppes/npcs/client/NoppesUtil.java index 52e92a78c..2c41363b8 100644 --- a/src/main/java/noppes/npcs/client/NoppesUtil.java +++ b/src/main/java/noppes/npcs/client/NoppesUtil.java @@ -33,9 +33,9 @@ import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.constants.EnumPlayerPacket; -import noppes.npcs.controllers.Dialog; +import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.DialogController; -import noppes.npcs.controllers.Quest; +import noppes.npcs.controllers.data.Quest; import noppes.npcs.controllers.data.SkinOverlay; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/PacketHandlerClient.java b/src/main/java/noppes/npcs/client/PacketHandlerClient.java index 607abd189..023dba9b7 100644 --- a/src/main/java/noppes/npcs/client/PacketHandlerClient.java +++ b/src/main/java/noppes/npcs/client/PacketHandlerClient.java @@ -36,7 +36,7 @@ import noppes.npcs.client.gui.util.IGuiError; import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumPacketClient; -import noppes.npcs.controllers.RecipeCarpentry; +import noppes.npcs.controllers.data.RecipeCarpentry; import noppes.npcs.controllers.RecipeController; import noppes.npcs.entity.EntityDialogNpc; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java b/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java index d0bb5920b..ab3a1674d 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java @@ -11,8 +11,8 @@ import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.GuiNpcTextField; import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.Line; -import noppes.npcs.controllers.Lines; +import noppes.npcs.controllers.data.Line; +import noppes.npcs.controllers.data.Lines; import noppes.npcs.entity.EntityNPCInterface; public class GuiNPCLinesEdit extends GuiNPCInterface2 implements IGuiData diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java b/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java index 2d065fa7b..8c0e5316a 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java @@ -15,7 +15,7 @@ import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.containers.ContainerMail; -import noppes.npcs.controllers.PlayerMail; +import noppes.npcs.controllers.data.PlayerMail; public class SubGuiMailmanSendSetup extends SubGuiInterface implements ITextfieldListener, GuiSelectionListener{ diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java index a1708aa89..bcd12d257 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java @@ -14,8 +14,8 @@ import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumAvailabilityFactionType; import noppes.npcs.constants.EnumDayTime; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.Availability; -import noppes.npcs.controllers.Faction; +import noppes.npcs.controllers.data.Availability; +import noppes.npcs.controllers.data.Faction; public class SubGuiNpcAvailability extends SubGuiInterface implements ITextfieldListener, GuiSelectionListener, IGuiData { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java index 65814d72d..c08f83434 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java @@ -1,7 +1,6 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; @@ -12,8 +11,8 @@ import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumAvailabilityDialog; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.Availability; -import noppes.npcs.controllers.Dialog; +import noppes.npcs.controllers.data.Availability; +import noppes.npcs.controllers.data.Dialog; public class SubGuiNpcAvailabilityDialog extends SubGuiInterface implements GuiSelectionListener, IGuiData{ private Availability availabitily; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java index 33094b7d9..902bb3ce1 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java @@ -1,7 +1,6 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; @@ -13,8 +12,8 @@ import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumAvailabilityQuest; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.Availability; -import noppes.npcs.controllers.Quest; +import noppes.npcs.controllers.data.Availability; +import noppes.npcs.controllers.data.Quest; public class SubGuiNpcAvailabilityQuest extends SubGuiInterface implements GuiSelectionListener, IGuiData { private Availability availabitily; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java index e91743ca6..c4993d393 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java @@ -5,19 +5,11 @@ import java.util.List; import net.minecraft.client.gui.GuiButton; import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.biome.BiomeGenMutated; -import net.minecraftforge.common.BiomeManager; -import noppes.npcs.DataAI; import noppes.npcs.client.gui.util.GuiCustomScroll; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.GuiNpcLabel; -import noppes.npcs.client.gui.util.GuiNpcTextField; -import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.client.gui.util.SubGuiInterface; -import noppes.npcs.constants.EnumAnimation; -import noppes.npcs.constants.EnumMovingType; -import noppes.npcs.constants.EnumStandingType; -import noppes.npcs.controllers.SpawnData; +import noppes.npcs.controllers.data.SpawnData; public class SubGuiNpcBiomes extends SubGuiInterface { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogExtra.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogExtra.java index 3c20cc863..5fc09c88c 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogExtra.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogExtra.java @@ -2,21 +2,14 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; import noppes.npcs.client.gui.util.GuiNpcLabel; -import noppes.npcs.client.gui.util.GuiSelectionListener; -import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.client.gui.util.ISubGuiListener; import noppes.npcs.client.gui.util.SubGuiInterface; -import noppes.npcs.constants.EnumAvailabilityDialog; -import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.Availability; -import noppes.npcs.controllers.Dialog; -import noppes.npcs.controllers.PlayerMail; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.PlayerMail; public class SubGuiNpcDialogExtra extends SubGuiInterface implements ISubGuiListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java index 3b24c9bc7..41f000a03 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java @@ -14,8 +14,8 @@ import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumOptionType; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.Dialog; -import noppes.npcs.controllers.DialogOption; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.DialogOption; public class SubGuiNpcDialogOption extends SubGuiInterface implements IGuiData, ITextfieldListener, GuiSelectionListener, ISubGuiListener{ private DialogOption option; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOptions.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOptions.java index ed2cf708b..7e97d55b3 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOptions.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOptions.java @@ -5,8 +5,8 @@ import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.GuiNpcLabel; import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumOptionType; -import noppes.npcs.controllers.Dialog; -import noppes.npcs.controllers.DialogOption; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.DialogOption; public class SubGuiNpcDialogOptions extends SubGuiInterface { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java index 4f4fa1469..4a1c543f5 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java @@ -14,7 +14,7 @@ import noppes.npcs.client.gui.util.GuiNpcTextField; import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.FactionOptions; +import noppes.npcs.controllers.data.FactionOptions; public class SubGuiNpcFactionOptions extends SubGuiInterface implements IScrollData,ICustomScrollListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java index 0f018ea15..4e6ee1ef0 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java @@ -7,7 +7,7 @@ import noppes.npcs.client.gui.util.GuiNpcLabel; import noppes.npcs.client.gui.util.GuiNpcTextField; import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.client.gui.util.SubGuiInterface; -import noppes.npcs.controllers.Faction; +import noppes.npcs.controllers.data.Faction; public class SubGuiNpcFactionPoints extends SubGuiInterface implements ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java index 1c61e8a52..37e4e88b6 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java @@ -5,32 +5,15 @@ import java.util.HashMap; import java.util.List; import java.util.Vector; -import org.apache.logging.log4j.status.StatusConsoleListener; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.StatCollector; import noppes.npcs.client.Client; -import noppes.npcs.client.gui.SubGuiEditText; -import noppes.npcs.client.gui.SubGuiMailmanSendSetup; -import noppes.npcs.client.gui.SubGuiNpcCommand; -import noppes.npcs.client.gui.SubGuiNpcFactionOptions; -import noppes.npcs.client.gui.SubGuiNpcTextArea; import noppes.npcs.client.gui.util.GuiCustomScroll; import noppes.npcs.client.gui.util.GuiNPCInterface2; import noppes.npcs.client.gui.util.GuiNpcButton; -import noppes.npcs.client.gui.util.GuiNpcTextField; -import noppes.npcs.client.gui.util.GuiSelectionListener; import noppes.npcs.client.gui.util.ICustomScrollListener; -import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.client.gui.util.IScrollData; -import noppes.npcs.client.gui.util.ISubGuiListener; -import noppes.npcs.client.gui.util.ITextfieldListener; -import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.Quest; -import noppes.npcs.controllers.QuestCategory; import noppes.npcs.entity.EntityNPCInterface; public class GuiNPCAdvancedLinkedNpc extends GuiNPCInterface2 implements IScrollData, ICustomScrollListener{ diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java index 1eda4f0f5..7617508e3 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java @@ -14,7 +14,7 @@ import noppes.npcs.client.gui.util.GuiNpcLabel; import noppes.npcs.client.gui.util.GuiSelectionListener; import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.DialogOption; +import noppes.npcs.controllers.data.DialogOption; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCNightSetup.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCNightSetup.java index 1ea39adab..75b14dce9 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCNightSetup.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCNightSetup.java @@ -8,7 +8,7 @@ import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.GuiNpcLabel; import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.TransformData; +import noppes.npcs.controllers.data.TransformData; import noppes.npcs.entity.EntityNPCInterface; public class GuiNPCNightSetup extends GuiNPCInterface2 implements IGuiData diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java index 0a544a5cb..ad8888012 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java @@ -17,7 +17,7 @@ import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.containers.ContainerManageBanks; -import noppes.npcs.controllers.Bank; +import noppes.npcs.controllers.data.Bank; import noppes.npcs.entity.EntityNPCInterface; public class GuiNPCManageBanks extends GuiContainerNPCInterface2 implements IScrollData,ICustomScrollListener,ITextfieldListener, IGuiData diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java index 6594864e2..77d9025b8 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java @@ -8,11 +8,8 @@ import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.GuiNpcSoundSelection; -import noppes.npcs.client.gui.SubGuiMailmanSendSetup; import noppes.npcs.client.gui.SubGuiNpcAvailability; -import noppes.npcs.client.gui.SubGuiNpcCommand; import noppes.npcs.client.gui.SubGuiNpcDialogExtra; -import noppes.npcs.client.gui.SubGuiNpcDialogOption; import noppes.npcs.client.gui.SubGuiNpcDialogOptions; import noppes.npcs.client.gui.SubGuiNpcFactionOptions; import noppes.npcs.client.gui.SubGuiNpcTextArea; @@ -29,9 +26,8 @@ import noppes.npcs.client.gui.util.ISubGuiListener; import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.Dialog; -import noppes.npcs.controllers.DialogCategory; -import noppes.npcs.controllers.PlayerMail; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.DialogCategory; import noppes.npcs.entity.EntityNPCInterface; public class GuiNPCManageDialogs extends GuiNPCInterface2 implements IScrollData, ISubGuiListener, GuiSelectionListener,ICustomScrollListener,ITextfieldListener, IGuiData diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java index b1dac2e2f..0a0f756dd 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java @@ -22,7 +22,7 @@ import noppes.npcs.client.gui.util.ISubGuiListener; import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.Faction; +import noppes.npcs.controllers.data.Faction; import noppes.npcs.entity.EntityNPCInterface; public class GuiNPCManageFactions extends GuiNPCInterface2 implements IScrollData,ICustomScrollListener,ITextfieldListener, IGuiData, ISubGuiListener diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinkedNpc.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinkedNpc.java index 447985566..3eeaf2d99 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinkedNpc.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinkedNpc.java @@ -5,32 +5,17 @@ import java.util.HashMap; import java.util.List; import java.util.Vector; -import org.apache.logging.log4j.status.StatusConsoleListener; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.StatCollector; import noppes.npcs.client.Client; import noppes.npcs.client.gui.SubGuiEditText; -import noppes.npcs.client.gui.SubGuiMailmanSendSetup; -import noppes.npcs.client.gui.SubGuiNpcCommand; -import noppes.npcs.client.gui.SubGuiNpcFactionOptions; -import noppes.npcs.client.gui.SubGuiNpcTextArea; import noppes.npcs.client.gui.util.GuiCustomScroll; import noppes.npcs.client.gui.util.GuiNPCInterface2; import noppes.npcs.client.gui.util.GuiNpcButton; -import noppes.npcs.client.gui.util.GuiNpcTextField; -import noppes.npcs.client.gui.util.GuiSelectionListener; -import noppes.npcs.client.gui.util.ICustomScrollListener; -import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.client.gui.util.ISubGuiListener; -import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.Quest; -import noppes.npcs.controllers.QuestCategory; import noppes.npcs.entity.EntityNPCInterface; public class GuiNPCManageLinkedNpc extends GuiNPCInterface2 implements IScrollData, ISubGuiListener{ diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java index 07c1f94bc..2bda9c993 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java @@ -7,7 +7,6 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; -import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiMailmanSendSetup; import noppes.npcs.client.gui.SubGuiNpcCommand; import noppes.npcs.client.gui.SubGuiNpcFactionOptions; @@ -32,9 +31,8 @@ import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.constants.EnumQuestCompletion; import noppes.npcs.constants.EnumQuestRepeat; import noppes.npcs.constants.EnumQuestType; -import noppes.npcs.controllers.PlayerMail; -import noppes.npcs.controllers.Quest; -import noppes.npcs.controllers.QuestCategory; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.QuestCategory; import noppes.npcs.entity.EntityNPCInterface; public class GuiNPCManageQuest extends GuiNPCInterface2 implements IScrollData, ISubGuiListener, GuiSelectionListener,ICustomScrollListener,ITextfieldListener, IGuiData diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java index dc598c01a..ed8cf2fc2 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java @@ -21,7 +21,7 @@ import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.containers.ContainerManageRecipes; -import noppes.npcs.controllers.RecipeCarpentry; +import noppes.npcs.controllers.data.RecipeCarpentry; import noppes.npcs.entity.EntityNPCInterface; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java index 33f896870..6865e1a2d 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java @@ -22,7 +22,7 @@ import noppes.npcs.client.gui.util.ISliderListener; import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.SpawnData; +import noppes.npcs.controllers.data.SpawnData; import noppes.npcs.entity.EntityNPCInterface; public class GuiNpcNaturalSpawns extends GuiNPCInterface2 implements IGuiData, IScrollData, ITextfieldListener, ICustomScrollListener, ISliderListener{ diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcQuestReward.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcQuestReward.java index 2a0d5bd3c..072b5ee07 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcQuestReward.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcQuestReward.java @@ -9,7 +9,7 @@ import noppes.npcs.client.gui.util.GuiNpcLabel; import noppes.npcs.client.gui.util.GuiNpcTextField; import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.containers.ContainerNpcQuestReward; -import noppes.npcs.controllers.Quest; +import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/global/SubGuiNpcQuestAdvanced.java b/src/main/java/noppes/npcs/client/gui/global/SubGuiNpcQuestAdvanced.java index ed4b9616d..557afa0dd 100644 --- a/src/main/java/noppes/npcs/client/gui/global/SubGuiNpcQuestAdvanced.java +++ b/src/main/java/noppes/npcs/client/gui/global/SubGuiNpcQuestAdvanced.java @@ -10,11 +10,8 @@ import noppes.npcs.client.gui.util.GuiNpcLabel; import noppes.npcs.client.gui.util.GuiNpcTextField; import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.client.gui.util.SubGuiInterface; -import noppes.npcs.constants.EnumAnimation; -import noppes.npcs.constants.EnumMovingType; -import noppes.npcs.constants.EnumStandingType; -import noppes.npcs.controllers.PlayerMail; -import noppes.npcs.controllers.Quest; +import noppes.npcs.controllers.data.PlayerMail; +import noppes.npcs.controllers.data.Quest; public class SubGuiNpcQuestAdvanced extends SubGuiInterface implements ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java b/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java index 20740533c..142fc1127 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java @@ -21,8 +21,8 @@ import noppes.npcs.client.gui.util.GuiNPCInterface; import noppes.npcs.client.gui.util.IGuiClose; import noppes.npcs.constants.EnumOptionType; import noppes.npcs.constants.EnumPlayerPacket; -import noppes.npcs.controllers.Dialog; -import noppes.npcs.controllers.DialogOption; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.DialogOption; import noppes.npcs.entity.EntityNPCInterface; import org.lwjgl.input.Keyboard; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiFaction.java b/src/main/java/noppes/npcs/client/gui/player/GuiFaction.java index 8151df430..5b4ea3590 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiFaction.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiFaction.java @@ -13,8 +13,8 @@ import noppes.npcs.client.gui.util.GuiButtonNextPage; import noppes.npcs.client.gui.util.GuiNPCInterface; import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.constants.EnumPlayerPacket; -import noppes.npcs.controllers.Faction; -import noppes.npcs.controllers.PlayerFactionData; +import noppes.npcs.controllers.data.Faction; +import noppes.npcs.controllers.data.PlayerFactionData; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiMailbox.java b/src/main/java/noppes/npcs/client/gui/player/GuiMailbox.java index a345fd0a0..5306b4def 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiMailbox.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiMailbox.java @@ -19,8 +19,8 @@ import noppes.npcs.client.gui.util.GuiNpcLabel; import noppes.npcs.client.gui.util.ICustomScrollListener; import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.constants.EnumPlayerPacket; -import noppes.npcs.controllers.PlayerMail; -import noppes.npcs.controllers.PlayerMailData; +import noppes.npcs.controllers.data.PlayerMail; +import noppes.npcs.controllers.data.PlayerMailData; public class GuiMailbox extends GuiNPCInterface implements IGuiData, ICustomScrollListener, GuiYesNoCallback{ diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java b/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java index bccb11d4e..46909fd8c 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java @@ -26,7 +26,7 @@ import noppes.npcs.client.gui.util.IGuiError; import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.constants.EnumPlayerPacket; import noppes.npcs.containers.ContainerMail; -import noppes.npcs.controllers.PlayerMail; +import noppes.npcs.controllers.data.PlayerMail; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiQuestCompletion.java b/src/main/java/noppes/npcs/client/gui/player/GuiQuestCompletion.java index 4e689ac0b..7a089c6d2 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiQuestCompletion.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiQuestCompletion.java @@ -3,7 +3,6 @@ package noppes.npcs.client.gui.player; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import noppes.npcs.NoppesStringUtils; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.TextBlockClient; @@ -12,7 +11,7 @@ import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.GuiNpcLabel; import noppes.npcs.client.gui.util.ITopButtonListener; import noppes.npcs.constants.EnumPlayerPacket; -import noppes.npcs.controllers.Quest; +import noppes.npcs.controllers.data.Quest; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiRecipes.java b/src/main/java/noppes/npcs/client/gui/player/GuiRecipes.java index f41060706..0348bba47 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiRecipes.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiRecipes.java @@ -1,7 +1,6 @@ package noppes.npcs.client.gui.player; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import org.lwjgl.opengl.GL11; @@ -18,7 +17,7 @@ import noppes.npcs.client.gui.util.GuiButtonNextPage; import noppes.npcs.client.gui.util.GuiNPCInterface; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.GuiNpcLabel; -import noppes.npcs.controllers.RecipeCarpentry; +import noppes.npcs.controllers.data.RecipeCarpentry; import noppes.npcs.controllers.RecipeController; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeDialog.java b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeDialog.java index 1f0b321b9..f4e7694cb 100644 --- a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeDialog.java +++ b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeDialog.java @@ -8,13 +8,12 @@ import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.GuiNPCDialogSelection; -import noppes.npcs.client.gui.util.GuiNPCInterface; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.GuiSelectionListener; import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.Quest; +import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.quests.QuestDialog; diff --git a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeItem.java b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeItem.java index 7b2ef8221..87a3297f3 100644 --- a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeItem.java +++ b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeItem.java @@ -11,7 +11,7 @@ import noppes.npcs.client.gui.util.GuiNpcLabel; import noppes.npcs.client.gui.util.GuiNpcTextField; import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.containers.ContainerNpcQuestTypeItem; -import noppes.npcs.controllers.Quest; +import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.quests.QuestItem; diff --git a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeKill.java b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeKill.java index 0e1dc39e1..f903a3d77 100644 --- a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeKill.java +++ b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeKill.java @@ -17,7 +17,7 @@ import noppes.npcs.client.gui.util.GuiNpcLabel; import noppes.npcs.client.gui.util.GuiNpcTextField; import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.client.gui.util.SubGuiInterface; -import noppes.npcs.controllers.Quest; +import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.quests.QuestKill; diff --git a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeLocation.java b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeLocation.java index 04c6c66cf..879ee0eae 100644 --- a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeLocation.java +++ b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeLocation.java @@ -2,13 +2,12 @@ package noppes.npcs.client.gui.questtypes; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.GuiNpcLabel; import noppes.npcs.client.gui.util.GuiNpcTextField; import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.client.gui.util.SubGuiInterface; -import noppes.npcs.controllers.Quest; +import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.quests.QuestLocation; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBankSetup.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBankSetup.java index 14dd9ccb5..10b433b1f 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBankSetup.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBankSetup.java @@ -11,7 +11,7 @@ import noppes.npcs.client.gui.util.ICustomScrollListener; import noppes.npcs.client.gui.util.GuiNPCInterface2; import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.Bank; +import noppes.npcs.controllers.data.Bank; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleBank; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java index b3c93a8e3..523ebc295 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java @@ -6,19 +6,15 @@ import java.util.Vector; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; -import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.mainmenu.GuiNpcAdvanced; import noppes.npcs.client.gui.util.GuiCustomScroll; -import noppes.npcs.client.gui.util.GuiNPCInterface; import noppes.npcs.client.gui.util.GuiNPCInterface2; -import noppes.npcs.client.gui.util.GuiNPCStringSlot; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.GuiNpcLabel; import noppes.npcs.client.gui.util.GuiNpcTextField; import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.TransportLocation; +import noppes.npcs.controllers.data.TransportLocation; import noppes.npcs.entity.EntityNPCInterface; public class GuiNpcTransporter extends GuiNPCInterface2 implements IScrollData, IGuiData{ diff --git a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java index a6cf8cf8c..1abf5cb16 100644 --- a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java +++ b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java @@ -13,7 +13,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.play.server.S2FPacketSetSlot; import net.minecraft.world.World; import noppes.npcs.CustomItems; -import noppes.npcs.controllers.RecipeCarpentry; +import noppes.npcs.controllers.data.RecipeCarpentry; import noppes.npcs.controllers.RecipeController; public class ContainerCarpentryBench extends Container diff --git a/src/main/java/noppes/npcs/containers/ContainerMail.java b/src/main/java/noppes/npcs/containers/ContainerMail.java index c2e2a6f2c..b6b268225 100644 --- a/src/main/java/noppes/npcs/containers/ContainerMail.java +++ b/src/main/java/noppes/npcs/containers/ContainerMail.java @@ -3,18 +3,11 @@ package noppes.npcs.containers; import java.util.Iterator; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ContainerChest; -import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; -import noppes.npcs.CustomNpcs; -import noppes.npcs.client.gui.player.GuiMailmanWrite; -import noppes.npcs.constants.EnumGuiType; import noppes.npcs.controllers.PlayerDataController; -import noppes.npcs.controllers.PlayerMail; -import noppes.npcs.controllers.PlayerMailData; +import noppes.npcs.controllers.data.PlayerMail; +import noppes.npcs.controllers.data.PlayerMailData; public class ContainerMail extends ContainerNpcInterface{ private static final String __OBFID = "CL_00001742"; diff --git a/src/main/java/noppes/npcs/containers/ContainerManageBanks.java b/src/main/java/noppes/npcs/containers/ContainerManageBanks.java index e83eb490e..f95e11378 100644 --- a/src/main/java/noppes/npcs/containers/ContainerManageBanks.java +++ b/src/main/java/noppes/npcs/containers/ContainerManageBanks.java @@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import noppes.npcs.controllers.Bank; +import noppes.npcs.controllers.data.Bank; public class ContainerManageBanks extends Container { diff --git a/src/main/java/noppes/npcs/containers/ContainerManageRecipes.java b/src/main/java/noppes/npcs/containers/ContainerManageRecipes.java index b11209893..905cfd3b1 100644 --- a/src/main/java/noppes/npcs/containers/ContainerManageRecipes.java +++ b/src/main/java/noppes/npcs/containers/ContainerManageRecipes.java @@ -10,7 +10,7 @@ import net.minecraft.inventory.InventoryBasic; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import noppes.npcs.NoppesUtilPlayer; -import noppes.npcs.controllers.RecipeCarpentry; +import noppes.npcs.controllers.data.RecipeCarpentry; public class ContainerManageRecipes extends Container { diff --git a/src/main/java/noppes/npcs/containers/ContainerNPCBankInterface.java b/src/main/java/noppes/npcs/containers/ContainerNPCBankInterface.java index 72d582643..acca8a9aa 100644 --- a/src/main/java/noppes/npcs/containers/ContainerNPCBankInterface.java +++ b/src/main/java/noppes/npcs/containers/ContainerNPCBankInterface.java @@ -1,12 +1,11 @@ package noppes.npcs.containers; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import noppes.npcs.NpcMiscInventory; -import noppes.npcs.controllers.PlayerBankData; +import noppes.npcs.controllers.data.PlayerBankData; import noppes.npcs.controllers.PlayerDataController; public class ContainerNPCBankInterface extends ContainerNpcInterface diff --git a/src/main/java/noppes/npcs/containers/ContainerNpcQuestReward.java b/src/main/java/noppes/npcs/containers/ContainerNpcQuestReward.java index ce8103eb6..af9199c31 100644 --- a/src/main/java/noppes/npcs/containers/ContainerNpcQuestReward.java +++ b/src/main/java/noppes/npcs/containers/ContainerNpcQuestReward.java @@ -6,7 +6,7 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import noppes.npcs.NoppesUtilServer; import noppes.npcs.client.gui.global.GuiNPCManageQuest; -import noppes.npcs.controllers.Quest; +import noppes.npcs.controllers.data.Quest; public class ContainerNpcQuestReward extends Container{ public ContainerNpcQuestReward(EntityPlayer player){ diff --git a/src/main/java/noppes/npcs/containers/ContainerNpcQuestTypeItem.java b/src/main/java/noppes/npcs/containers/ContainerNpcQuestTypeItem.java index 274dc6c53..797412633 100644 --- a/src/main/java/noppes/npcs/containers/ContainerNpcQuestTypeItem.java +++ b/src/main/java/noppes/npcs/containers/ContainerNpcQuestTypeItem.java @@ -6,7 +6,7 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import noppes.npcs.NoppesUtilServer; import noppes.npcs.client.gui.global.GuiNPCManageQuest; -import noppes.npcs.controllers.Quest; +import noppes.npcs.controllers.data.Quest; import noppes.npcs.quests.QuestItem; public class ContainerNpcQuestTypeItem extends Container diff --git a/src/main/java/noppes/npcs/controllers/BankController.java b/src/main/java/noppes/npcs/controllers/BankController.java index beb5ca5ce..45c7da78c 100644 --- a/src/main/java/noppes/npcs/controllers/BankController.java +++ b/src/main/java/noppes/npcs/controllers/BankController.java @@ -1,20 +1,16 @@ package noppes.npcs.controllers; -import io.netty.buffer.ByteBufInputStream; - -import java.io.BufferedInputStream; -import java.io.DataInputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.util.HashMap; -import java.util.zip.GZIPInputStream; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcs; +import noppes.npcs.controllers.data.Bank; public class BankController { public HashMap banks; diff --git a/src/main/java/noppes/npcs/controllers/DialogController.java b/src/main/java/noppes/npcs/controllers/DialogController.java index 9791ca720..19f86659e 100644 --- a/src/main/java/noppes/npcs/controllers/DialogController.java +++ b/src/main/java/noppes/npcs/controllers/DialogController.java @@ -11,6 +11,9 @@ import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.NoppesStringUtils; import noppes.npcs.constants.EnumOptionType; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.DialogCategory; +import noppes.npcs.controllers.data.DialogOption; import noppes.npcs.scripted.interfaces.handler.IDialogHandler; import noppes.npcs.scripted.interfaces.handler.data.IDialog; import noppes.npcs.scripted.interfaces.handler.data.IDialogCategory; diff --git a/src/main/java/noppes/npcs/controllers/FactionController.java b/src/main/java/noppes/npcs/controllers/FactionController.java index 5b59d349a..d284b65a4 100644 --- a/src/main/java/noppes/npcs/controllers/FactionController.java +++ b/src/main/java/noppes/npcs/controllers/FactionController.java @@ -17,6 +17,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; +import noppes.npcs.controllers.data.Faction; import noppes.npcs.scripted.interfaces.handler.IFactionHandler; import noppes.npcs.scripted.interfaces.handler.data.IFaction; diff --git a/src/main/java/noppes/npcs/controllers/PlayerDataController.java b/src/main/java/noppes/npcs/controllers/PlayerDataController.java index 621de7d7d..e3b929502 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerDataController.java +++ b/src/main/java/noppes/npcs/controllers/PlayerDataController.java @@ -1,10 +1,7 @@ package noppes.npcs.controllers; -import java.io.EOFException; import java.io.File; import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -14,6 +11,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; +import noppes.npcs.controllers.data.Bank; +import noppes.npcs.controllers.data.PlayerBankData; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerMail; import noppes.npcs.util.NBTJsonUtil; public class PlayerDataController { diff --git a/src/main/java/noppes/npcs/controllers/PlayerQuestController.java b/src/main/java/noppes/npcs/controllers/PlayerQuestController.java index 0a4172b7c..16c63431f 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerQuestController.java +++ b/src/main/java/noppes/npcs/controllers/PlayerQuestController.java @@ -9,6 +9,10 @@ import noppes.npcs.Server; import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumQuestRepeat; import noppes.npcs.constants.EnumQuestType; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerQuestData; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.QuestData; import noppes.npcs.quests.QuestDialog; public class PlayerQuestController { @@ -35,7 +39,7 @@ public class PlayerQuestController { return; } - data.activeQuests.put(quest.id,new QuestData(quest)); + data.activeQuests.put(quest.id,new QuestData(quest)); Server.sendData((EntityPlayerMP)player, EnumPacketClient.MESSAGE, "quest.newquest", quest.title); Server.sendData((EntityPlayerMP)player, EnumPacketClient.CHAT, "quest.newquest", ": ", quest.title); } diff --git a/src/main/java/noppes/npcs/controllers/QuestController.java b/src/main/java/noppes/npcs/controllers/QuestController.java index 70a28819f..194ae3f17 100644 --- a/src/main/java/noppes/npcs/controllers/QuestController.java +++ b/src/main/java/noppes/npcs/controllers/QuestController.java @@ -10,6 +10,8 @@ import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.NoppesStringUtils; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.QuestCategory; import noppes.npcs.scripted.interfaces.handler.IQuestHandler; import noppes.npcs.scripted.interfaces.handler.data.IQuest; import noppes.npcs.scripted.interfaces.handler.data.IQuestCategory; diff --git a/src/main/java/noppes/npcs/controllers/RecipeController.java b/src/main/java/noppes/npcs/controllers/RecipeController.java index b503490fd..550e1924e 100644 --- a/src/main/java/noppes/npcs/controllers/RecipeController.java +++ b/src/main/java/noppes/npcs/controllers/RecipeController.java @@ -13,6 +13,8 @@ import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcs; +import noppes.npcs.controllers.data.RecipeCarpentry; +import noppes.npcs.controllers.data.RecipesDefault; import noppes.npcs.scripted.interfaces.handler.IRecipeHandler; import noppes.npcs.scripted.interfaces.handler.data.IRecipe; @@ -75,7 +77,7 @@ public class RecipeController implements IRecipeHandler { private void loadDefaultRecipes(int i) { if(i == version) return; - RecipesDefault.loadDefaultRecipes(i); + RecipesDefault.loadDefaultRecipes(i); saveCategories(); } diff --git a/src/main/java/noppes/npcs/controllers/SpawnController.java b/src/main/java/noppes/npcs/controllers/SpawnController.java index 825422ed8..3b25e002e 100644 --- a/src/main/java/noppes/npcs/controllers/SpawnController.java +++ b/src/main/java/noppes/npcs/controllers/SpawnController.java @@ -19,6 +19,7 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.WeightedRandom; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; +import noppes.npcs.controllers.data.SpawnData; public class SpawnController { public HashMap> biomes = new HashMap>() ; diff --git a/src/main/java/noppes/npcs/controllers/TransportController.java b/src/main/java/noppes/npcs/controllers/TransportController.java index e2beb1a20..b84371c4b 100644 --- a/src/main/java/noppes/npcs/controllers/TransportController.java +++ b/src/main/java/noppes/npcs/controllers/TransportController.java @@ -1,13 +1,10 @@ package noppes.npcs.controllers; -import java.io.BufferedInputStream; -import java.io.DataInputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.util.HashMap; -import java.util.zip.GZIPInputStream; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.CompressedStreamTools; @@ -16,6 +13,8 @@ import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.constants.EnumRoleType; +import noppes.npcs.controllers.data.TransportCategory; +import noppes.npcs.controllers.data.TransportLocation; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleTransporter; diff --git a/src/main/java/noppes/npcs/controllers/Availability.java b/src/main/java/noppes/npcs/controllers/data/Availability.java similarity index 98% rename from src/main/java/noppes/npcs/controllers/Availability.java rename to src/main/java/noppes/npcs/controllers/data/Availability.java index f20c0ed33..2e85aa7b7 100644 --- a/src/main/java/noppes/npcs/controllers/Availability.java +++ b/src/main/java/noppes/npcs/controllers/data/Availability.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; @@ -10,6 +10,9 @@ import noppes.npcs.constants.EnumAvailabilityFaction; import noppes.npcs.constants.EnumAvailabilityFactionType; import noppes.npcs.constants.EnumAvailabilityQuest; import noppes.npcs.constants.EnumDayTime; +import noppes.npcs.controllers.FactionController; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.PlayerQuestController; import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.interfaces.handler.data.IAvailability; import noppes.npcs.scripted.interfaces.entity.IPlayer; diff --git a/src/main/java/noppes/npcs/controllers/Bank.java b/src/main/java/noppes/npcs/controllers/data/Bank.java similarity index 98% rename from src/main/java/noppes/npcs/controllers/Bank.java rename to src/main/java/noppes/npcs/controllers/data/Bank.java index 0453077d2..249ac338e 100644 --- a/src/main/java/noppes/npcs/controllers/Bank.java +++ b/src/main/java/noppes/npcs/controllers/data/Bank.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import java.util.HashMap; diff --git a/src/main/java/noppes/npcs/controllers/BankData.java b/src/main/java/noppes/npcs/controllers/data/BankData.java similarity index 98% rename from src/main/java/noppes/npcs/controllers/BankData.java rename to src/main/java/noppes/npcs/controllers/data/BankData.java index ba57ee415..a135acbc9 100644 --- a/src/main/java/noppes/npcs/controllers/BankData.java +++ b/src/main/java/noppes/npcs/controllers/data/BankData.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import java.util.HashMap; @@ -15,6 +15,7 @@ import noppes.npcs.Server; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.containers.ContainerNPCBankInterface; +import noppes.npcs.controllers.BankController; import noppes.npcs.entity.EntityNPCInterface; public class BankData { diff --git a/src/main/java/noppes/npcs/controllers/Dialog.java b/src/main/java/noppes/npcs/controllers/data/Dialog.java similarity index 98% rename from src/main/java/noppes/npcs/controllers/Dialog.java rename to src/main/java/noppes/npcs/controllers/data/Dialog.java index 6632f8433..76ef188c1 100644 --- a/src/main/java/noppes/npcs/controllers/Dialog.java +++ b/src/main/java/noppes/npcs/controllers/data/Dialog.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import java.util.ArrayList; import java.util.HashMap; @@ -10,6 +10,8 @@ import net.minecraft.nbt.NBTTagList; import noppes.npcs.ICompatibilty; import noppes.npcs.VersionCompatibility; import noppes.npcs.constants.EnumOptionType; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.QuestController; import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.interfaces.handler.data.*; diff --git a/src/main/java/noppes/npcs/controllers/DialogCategory.java b/src/main/java/noppes/npcs/controllers/data/DialogCategory.java similarity index 97% rename from src/main/java/noppes/npcs/controllers/DialogCategory.java rename to src/main/java/noppes/npcs/controllers/data/DialogCategory.java index 20c1fb0b1..a6330bae6 100644 --- a/src/main/java/noppes/npcs/controllers/DialogCategory.java +++ b/src/main/java/noppes/npcs/controllers/data/DialogCategory.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/noppes/npcs/controllers/DialogOption.java b/src/main/java/noppes/npcs/controllers/data/DialogOption.java similarity index 94% rename from src/main/java/noppes/npcs/controllers/DialogOption.java rename to src/main/java/noppes/npcs/controllers/data/DialogOption.java index 30f41cede..9bacc5367 100644 --- a/src/main/java/noppes/npcs/controllers/DialogOption.java +++ b/src/main/java/noppes/npcs/controllers/data/DialogOption.java @@ -1,8 +1,9 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.constants.EnumOptionType; +import noppes.npcs.controllers.DialogController; public class DialogOption { public int dialogId = -1; diff --git a/src/main/java/noppes/npcs/controllers/Faction.java b/src/main/java/noppes/npcs/controllers/data/Faction.java similarity index 96% rename from src/main/java/noppes/npcs/controllers/Faction.java rename to src/main/java/noppes/npcs/controllers/data/Faction.java index 03a6a44d2..be902b865 100644 --- a/src/main/java/noppes/npcs/controllers/Faction.java +++ b/src/main/java/noppes/npcs/controllers/data/Faction.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import java.util.HashSet; import java.util.Iterator; @@ -6,6 +6,8 @@ import java.util.Iterator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NBTTags; +import noppes.npcs.controllers.FactionController; +import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.interfaces.handler.data.IFaction; @@ -72,7 +74,7 @@ public class Faction implements IFaction { } public boolean isFriendlyToPlayer(EntityPlayer player) { - PlayerFactionData data = PlayerDataController.instance.getPlayerData(player).factionData; + PlayerFactionData data = PlayerDataController.instance.getPlayerData(player).factionData; return data.getFactionPoints(id) >= friendlyPoints; } diff --git a/src/main/java/noppes/npcs/controllers/FactionOptions.java b/src/main/java/noppes/npcs/controllers/data/FactionOptions.java similarity index 93% rename from src/main/java/noppes/npcs/controllers/FactionOptions.java rename to src/main/java/noppes/npcs/controllers/data/FactionOptions.java index 2ab6351c5..cfa877d8f 100644 --- a/src/main/java/noppes/npcs/controllers/FactionOptions.java +++ b/src/main/java/noppes/npcs/controllers/data/FactionOptions.java @@ -1,8 +1,10 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentTranslation; +import noppes.npcs.controllers.FactionController; +import noppes.npcs.controllers.PlayerDataController; public class FactionOptions { @@ -45,7 +47,7 @@ public class FactionOptions { if(factionId < 0 && faction2Id < 0) return; - PlayerFactionData data = PlayerDataController.instance.getPlayerData(player).factionData; + PlayerFactionData data = PlayerDataController.instance.getPlayerData(player).factionData; if(factionId >= 0 && factionPoints > 0) addPoints(player, data, factionId, decreaseFactionPoints, factionPoints); if(faction2Id >= 0 && faction2Points> 0) diff --git a/src/main/java/noppes/npcs/controllers/Line.java b/src/main/java/noppes/npcs/controllers/data/Line.java similarity index 95% rename from src/main/java/noppes/npcs/controllers/Line.java rename to src/main/java/noppes/npcs/controllers/data/Line.java index 24b20b036..e9f5904fb 100644 --- a/src/main/java/noppes/npcs/controllers/Line.java +++ b/src/main/java/noppes/npcs/controllers/data/Line.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/noppes/npcs/controllers/Lines.java b/src/main/java/noppes/npcs/controllers/data/Lines.java similarity index 98% rename from src/main/java/noppes/npcs/controllers/Lines.java rename to src/main/java/noppes/npcs/controllers/data/Lines.java index 3a696558d..94e8c9559 100644 --- a/src/main/java/noppes/npcs/controllers/Lines.java +++ b/src/main/java/noppes/npcs/controllers/data/Lines.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/noppes/npcs/controllers/PlayerBankData.java b/src/main/java/noppes/npcs/controllers/data/PlayerBankData.java similarity index 94% rename from src/main/java/noppes/npcs/controllers/PlayerBankData.java rename to src/main/java/noppes/npcs/controllers/data/PlayerBankData.java index 73907a414..df1d40afd 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerBankData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerBankData.java @@ -1,9 +1,10 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import java.util.HashMap; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import noppes.npcs.controllers.BankController; public class PlayerBankData{ public HashMap banks; diff --git a/src/main/java/noppes/npcs/controllers/PlayerData.java b/src/main/java/noppes/npcs/controllers/data/PlayerData.java similarity index 98% rename from src/main/java/noppes/npcs/controllers/PlayerData.java rename to src/main/java/noppes/npcs/controllers/data/PlayerData.java index ef1647ee7..77f779db9 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerData.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -9,6 +9,7 @@ import net.minecraftforge.common.IExtendedEntityProperties; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.constants.EnumRoleType; +import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.entity.data.DataSkinOverlays; diff --git a/src/main/java/noppes/npcs/controllers/PlayerDialogData.java b/src/main/java/noppes/npcs/controllers/data/PlayerDialogData.java similarity index 96% rename from src/main/java/noppes/npcs/controllers/PlayerDialogData.java rename to src/main/java/noppes/npcs/controllers/data/PlayerDialogData.java index 386c83751..93b879f46 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerDialogData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerDialogData.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import java.util.HashSet; diff --git a/src/main/java/noppes/npcs/controllers/PlayerFactionData.java b/src/main/java/noppes/npcs/controllers/data/PlayerFactionData.java similarity index 96% rename from src/main/java/noppes/npcs/controllers/PlayerFactionData.java rename to src/main/java/noppes/npcs/controllers/data/PlayerFactionData.java index f98afc038..e19290fe9 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerFactionData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerFactionData.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import java.util.HashMap; @@ -7,6 +7,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.EventHooks; +import noppes.npcs.controllers.FactionController; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.event.FactionEvent; import noppes.npcs.scripted.interfaces.entity.IPlayer; diff --git a/src/main/java/noppes/npcs/controllers/PlayerItemGiverData.java b/src/main/java/noppes/npcs/controllers/data/PlayerItemGiverData.java similarity index 97% rename from src/main/java/noppes/npcs/controllers/PlayerItemGiverData.java rename to src/main/java/noppes/npcs/controllers/data/PlayerItemGiverData.java index d13a637cb..88bdb52f0 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerItemGiverData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerItemGiverData.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import java.util.HashMap; diff --git a/src/main/java/noppes/npcs/controllers/PlayerMail.java b/src/main/java/noppes/npcs/controllers/data/PlayerMail.java similarity index 98% rename from src/main/java/noppes/npcs/controllers/PlayerMail.java rename to src/main/java/noppes/npcs/controllers/data/PlayerMail.java index 25e87804c..35677adcd 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerMail.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerMail.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.NpcMiscInventory; +import noppes.npcs.controllers.QuestController; public class PlayerMail implements IInventory{ public String subject = ""; diff --git a/src/main/java/noppes/npcs/controllers/PlayerMailData.java b/src/main/java/noppes/npcs/controllers/data/PlayerMailData.java similarity index 96% rename from src/main/java/noppes/npcs/controllers/PlayerMailData.java rename to src/main/java/noppes/npcs/controllers/data/PlayerMailData.java index eaaaad9e1..e6e9dee62 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerMailData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerMailData.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import java.util.ArrayList; diff --git a/src/main/java/noppes/npcs/controllers/PlayerQuestData.java b/src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java similarity index 96% rename from src/main/java/noppes/npcs/controllers/PlayerQuestData.java rename to src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java index 4523f9ba0..4fdbd6b5b 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerQuestData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import java.util.HashMap; @@ -11,6 +11,8 @@ import noppes.npcs.Server; import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumQuestCompletion; import noppes.npcs.constants.EnumQuestType; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.QuestController; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.quests.QuestInterface; diff --git a/src/main/java/noppes/npcs/controllers/PlayerTransportData.java b/src/main/java/noppes/npcs/controllers/data/PlayerTransportData.java similarity index 96% rename from src/main/java/noppes/npcs/controllers/PlayerTransportData.java rename to src/main/java/noppes/npcs/controllers/data/PlayerTransportData.java index 57857f798..945243474 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerTransportData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerTransportData.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import java.util.HashSet; diff --git a/src/main/java/noppes/npcs/controllers/Quest.java b/src/main/java/noppes/npcs/controllers/data/Quest.java similarity index 98% rename from src/main/java/noppes/npcs/controllers/Quest.java rename to src/main/java/noppes/npcs/controllers/data/Quest.java index 1e079706b..9dcb7896c 100644 --- a/src/main/java/noppes/npcs/controllers/Quest.java +++ b/src/main/java/noppes/npcs/controllers/data/Quest.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -11,6 +11,7 @@ import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumQuestCompletion; import noppes.npcs.constants.EnumQuestRepeat; import noppes.npcs.constants.EnumQuestType; +import noppes.npcs.controllers.QuestController; import noppes.npcs.quests.QuestDialog; import noppes.npcs.quests.QuestInterface; import noppes.npcs.quests.QuestItem; diff --git a/src/main/java/noppes/npcs/controllers/QuestCategory.java b/src/main/java/noppes/npcs/controllers/data/QuestCategory.java similarity index 98% rename from src/main/java/noppes/npcs/controllers/QuestCategory.java rename to src/main/java/noppes/npcs/controllers/data/QuestCategory.java index 10da9533b..18fa87b56 100644 --- a/src/main/java/noppes/npcs/controllers/QuestCategory.java +++ b/src/main/java/noppes/npcs/controllers/data/QuestCategory.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/noppes/npcs/controllers/QuestData.java b/src/main/java/noppes/npcs/controllers/data/QuestData.java similarity index 93% rename from src/main/java/noppes/npcs/controllers/QuestData.java rename to src/main/java/noppes/npcs/controllers/data/QuestData.java index 1c51ae2ae..7db1bd6b8 100644 --- a/src/main/java/noppes/npcs/controllers/QuestData.java +++ b/src/main/java/noppes/npcs/controllers/data/QuestData.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/noppes/npcs/controllers/RecipeCarpentry.java b/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java similarity index 98% rename from src/main/java/noppes/npcs/controllers/RecipeCarpentry.java rename to src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java index 44ae912bc..42aee003f 100644 --- a/src/main/java/noppes/npcs/controllers/RecipeCarpentry.java +++ b/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import java.io.IOException; import java.util.HashMap; @@ -13,6 +13,7 @@ import net.minecraft.world.World; import noppes.npcs.NBTTags; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.RecipeController; import noppes.npcs.scripted.interfaces.handler.data.IRecipe; public class RecipeCarpentry extends ShapedRecipes implements IRecipe { diff --git a/src/main/java/noppes/npcs/controllers/RecipesDefault.java b/src/main/java/noppes/npcs/controllers/data/RecipesDefault.java similarity index 99% rename from src/main/java/noppes/npcs/controllers/RecipesDefault.java rename to src/main/java/noppes/npcs/controllers/data/RecipesDefault.java index 629bbfd4e..843c1cc06 100644 --- a/src/main/java/noppes/npcs/controllers/RecipesDefault.java +++ b/src/main/java/noppes/npcs/controllers/data/RecipesDefault.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import net.minecraft.block.Block; import net.minecraft.init.Blocks; @@ -7,6 +7,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import noppes.npcs.CustomItems; import noppes.npcs.CustomNpcs; +import noppes.npcs.controllers.RecipeController; + public class RecipesDefault { public static void addRecipe(String name, Object ob, boolean isGlobal, Object... recipe){ ItemStack item; diff --git a/src/main/java/noppes/npcs/controllers/SpawnData.java b/src/main/java/noppes/npcs/controllers/data/SpawnData.java similarity index 96% rename from src/main/java/noppes/npcs/controllers/SpawnData.java rename to src/main/java/noppes/npcs/controllers/data/SpawnData.java index 113937f4a..496c11678 100644 --- a/src/main/java/noppes/npcs/controllers/SpawnData.java +++ b/src/main/java/noppes/npcs/controllers/data/SpawnData.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/noppes/npcs/controllers/TransformData.java b/src/main/java/noppes/npcs/controllers/data/TransformData.java similarity index 99% rename from src/main/java/noppes/npcs/controllers/TransformData.java rename to src/main/java/noppes/npcs/controllers/data/TransformData.java index 4a41c4e37..798a3db64 100644 --- a/src/main/java/noppes/npcs/controllers/TransformData.java +++ b/src/main/java/noppes/npcs/controllers/data/TransformData.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import java.util.Set; diff --git a/src/main/java/noppes/npcs/controllers/TransportCategory.java b/src/main/java/noppes/npcs/controllers/data/TransportCategory.java similarity index 97% rename from src/main/java/noppes/npcs/controllers/TransportCategory.java rename to src/main/java/noppes/npcs/controllers/data/TransportCategory.java index 5fe2dba9c..fdfa21f86 100644 --- a/src/main/java/noppes/npcs/controllers/TransportCategory.java +++ b/src/main/java/noppes/npcs/controllers/data/TransportCategory.java @@ -1,4 +1,4 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import java.util.HashMap; import java.util.Vector; diff --git a/src/main/java/noppes/npcs/controllers/TransportLocation.java b/src/main/java/noppes/npcs/controllers/data/TransportLocation.java similarity index 93% rename from src/main/java/noppes/npcs/controllers/TransportLocation.java rename to src/main/java/noppes/npcs/controllers/data/TransportLocation.java index ae677fd1a..fc1dcb620 100644 --- a/src/main/java/noppes/npcs/controllers/TransportLocation.java +++ b/src/main/java/noppes/npcs/controllers/data/TransportLocation.java @@ -1,7 +1,6 @@ -package noppes.npcs.controllers; +package noppes.npcs.controllers.data; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.entity.EntityNPCInterface; public class TransportLocation { public int id = -1; diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java index d576c5e8e..9646d41f7 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java @@ -62,17 +62,17 @@ import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumPotionType; import noppes.npcs.constants.EnumRoleType; import noppes.npcs.constants.EnumStandingType; -import noppes.npcs.controllers.Dialog; -import noppes.npcs.controllers.DialogOption; -import noppes.npcs.controllers.Faction; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.DialogOption; +import noppes.npcs.controllers.data.Faction; import noppes.npcs.controllers.FactionController; -import noppes.npcs.controllers.Line; +import noppes.npcs.controllers.data.Line; import noppes.npcs.controllers.LinkedNpcController; import noppes.npcs.controllers.LinkedNpcController.LinkedData; import noppes.npcs.controllers.PlayerDataController; -import noppes.npcs.controllers.PlayerQuestData; -import noppes.npcs.controllers.QuestData; -import noppes.npcs.controllers.TransformData; +import noppes.npcs.controllers.data.PlayerQuestData; +import noppes.npcs.controllers.data.QuestData; +import noppes.npcs.controllers.data.TransformData; import noppes.npcs.entity.data.DataTimers; import noppes.npcs.roles.JobBard; import noppes.npcs.roles.JobFollower; @@ -80,7 +80,6 @@ import noppes.npcs.roles.JobInterface; import noppes.npcs.roles.RoleCompanion; import noppes.npcs.roles.RoleFollower; import noppes.npcs.roles.RoleInterface; -import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.entity.ScriptNpc; import noppes.npcs.scripted.event.ScriptEventAttack; import noppes.npcs.scripted.event.ScriptEventDamaged; diff --git a/src/main/java/noppes/npcs/entity/data/DataSkinOverlays.java b/src/main/java/noppes/npcs/entity/data/DataSkinOverlays.java index 819159c9f..05f3e416a 100644 --- a/src/main/java/noppes/npcs/entity/data/DataSkinOverlays.java +++ b/src/main/java/noppes/npcs/entity/data/DataSkinOverlays.java @@ -4,7 +4,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.Server; import noppes.npcs.constants.EnumPacketClient; -import noppes.npcs.controllers.PlayerData; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.data.SkinOverlay; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.interfaces.ISkinOverlay; diff --git a/src/main/java/noppes/npcs/entity/data/DataTimers.java b/src/main/java/noppes/npcs/entity/data/DataTimers.java index a8da1fb29..228e7a02b 100644 --- a/src/main/java/noppes/npcs/entity/data/DataTimers.java +++ b/src/main/java/noppes/npcs/entity/data/DataTimers.java @@ -14,7 +14,7 @@ import net.minecraft.nbt.NBTTagList; import noppes.npcs.EventHooks; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.interfaces.ITimers; -import noppes.npcs.controllers.PlayerData; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.scripted.CustomNPCsException; public class DataTimers implements ITimers { diff --git a/src/main/java/noppes/npcs/items/ItemSoulstoneFilled.java b/src/main/java/noppes/npcs/items/ItemSoulstoneFilled.java index 8a05e130e..416bb62a3 100644 --- a/src/main/java/noppes/npcs/items/ItemSoulstoneFilled.java +++ b/src/main/java/noppes/npcs/items/ItemSoulstoneFilled.java @@ -1,12 +1,9 @@ package noppes.npcs.items; -import java.text.DateFormat; -import java.util.Date; import java.util.List; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -15,9 +12,8 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import noppes.npcs.constants.EnumRoleType; -import noppes.npcs.controllers.PlayerData; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.PlayerDataController; -import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleCompanion; import noppes.npcs.roles.RoleFollower; diff --git a/src/main/java/noppes/npcs/quests/QuestDialog.java b/src/main/java/noppes/npcs/quests/QuestDialog.java index aee27eabe..b4357d233 100644 --- a/src/main/java/noppes/npcs/quests/QuestDialog.java +++ b/src/main/java/noppes/npcs/quests/QuestDialog.java @@ -9,9 +9,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NBTTags; import noppes.npcs.constants.EnumQuestType; -import noppes.npcs.controllers.Dialog; +import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.DialogController; -import noppes.npcs.controllers.PlayerData; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.interfaces.handler.data.IQuestDialog; diff --git a/src/main/java/noppes/npcs/quests/QuestInterface.java b/src/main/java/noppes/npcs/quests/QuestInterface.java index b385471fc..05188dd2e 100644 --- a/src/main/java/noppes/npcs/quests/QuestInterface.java +++ b/src/main/java/noppes/npcs/quests/QuestInterface.java @@ -4,7 +4,7 @@ import java.util.Vector; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.controllers.PlayerData; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.scripted.interfaces.handler.data.IQuestInterface; import noppes.npcs.scripted.interfaces.handler.data.IQuestObjective; diff --git a/src/main/java/noppes/npcs/quests/QuestItem.java b/src/main/java/noppes/npcs/quests/QuestItem.java index dc6be0aa6..1bd8bd7c1 100644 --- a/src/main/java/noppes/npcs/quests/QuestItem.java +++ b/src/main/java/noppes/npcs/quests/QuestItem.java @@ -8,7 +8,7 @@ import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.NoppesUtilServer; import noppes.npcs.NpcMiscInventory; -import noppes.npcs.controllers.PlayerData; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.interfaces.handler.data.IQuestItem; import noppes.npcs.scripted.interfaces.handler.data.IQuestObjective; diff --git a/src/main/java/noppes/npcs/quests/QuestKill.java b/src/main/java/noppes/npcs/quests/QuestKill.java index 08be78a53..53542f141 100644 --- a/src/main/java/noppes/npcs/quests/QuestKill.java +++ b/src/main/java/noppes/npcs/quests/QuestKill.java @@ -6,10 +6,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NBTTags; import noppes.npcs.constants.EnumQuestType; -import noppes.npcs.controllers.PlayerData; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.PlayerDataController; -import noppes.npcs.controllers.PlayerQuestData; -import noppes.npcs.controllers.QuestData; +import noppes.npcs.controllers.data.PlayerQuestData; +import noppes.npcs.controllers.data.QuestData; import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.interfaces.handler.data.IQuestKill; import noppes.npcs.scripted.interfaces.handler.data.IQuestObjective; diff --git a/src/main/java/noppes/npcs/quests/QuestLocation.java b/src/main/java/noppes/npcs/quests/QuestLocation.java index 5b9f7d84c..16d4bbdb4 100644 --- a/src/main/java/noppes/npcs/quests/QuestLocation.java +++ b/src/main/java/noppes/npcs/quests/QuestLocation.java @@ -8,10 +8,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import noppes.npcs.constants.EnumQuestType; -import noppes.npcs.controllers.PlayerData; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.PlayerDataController; -import noppes.npcs.controllers.PlayerQuestData; -import noppes.npcs.controllers.QuestData; +import noppes.npcs.controllers.data.PlayerQuestData; +import noppes.npcs.controllers.data.QuestData; import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.interfaces.handler.data.IQuestLocation; import noppes.npcs.scripted.interfaces.handler.data.IQuestObjective; diff --git a/src/main/java/noppes/npcs/roles/JobConversation.java b/src/main/java/noppes/npcs/roles/JobConversation.java index 6fe448ae2..56a99ea7c 100644 --- a/src/main/java/noppes/npcs/roles/JobConversation.java +++ b/src/main/java/noppes/npcs/roles/JobConversation.java @@ -7,10 +7,10 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import noppes.npcs.controllers.Availability; -import noppes.npcs.controllers.Line; +import noppes.npcs.controllers.data.Availability; +import noppes.npcs.controllers.data.Line; import noppes.npcs.controllers.PlayerQuestController; -import noppes.npcs.controllers.Quest; +import noppes.npcs.controllers.data.Quest; import noppes.npcs.controllers.QuestController; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/roles/JobItemGiver.java b/src/main/java/noppes/npcs/roles/JobItemGiver.java index 7d26f30aa..80c3319fb 100644 --- a/src/main/java/noppes/npcs/roles/JobItemGiver.java +++ b/src/main/java/noppes/npcs/roles/JobItemGiver.java @@ -12,11 +12,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.NBTTags; import noppes.npcs.NpcMiscInventory; -import noppes.npcs.controllers.Availability; +import noppes.npcs.controllers.data.Availability; import noppes.npcs.controllers.GlobalDataController; -import noppes.npcs.controllers.Line; +import noppes.npcs.controllers.data.Line; import noppes.npcs.controllers.PlayerDataController; -import noppes.npcs.controllers.PlayerItemGiverData; +import noppes.npcs.controllers.data.PlayerItemGiverData; import noppes.npcs.entity.EntityNPCInterface; public class JobItemGiver extends JobInterface{ diff --git a/src/main/java/noppes/npcs/roles/RoleBank.java b/src/main/java/noppes/npcs/roles/RoleBank.java index 770b33cb9..13d939d65 100644 --- a/src/main/java/noppes/npcs/roles/RoleBank.java +++ b/src/main/java/noppes/npcs/roles/RoleBank.java @@ -2,9 +2,9 @@ package noppes.npcs.roles; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.controllers.Bank; +import noppes.npcs.controllers.data.Bank; import noppes.npcs.controllers.BankController; -import noppes.npcs.controllers.BankData; +import noppes.npcs.controllers.data.BankData; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/roles/RoleCompanion.java b/src/main/java/noppes/npcs/roles/RoleCompanion.java index 853745bc1..56f41f925 100644 --- a/src/main/java/noppes/npcs/roles/RoleCompanion.java +++ b/src/main/java/noppes/npcs/roles/RoleCompanion.java @@ -1,7 +1,6 @@ package noppes.npcs.roles; import java.util.ArrayList; -import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -16,8 +15,6 @@ import cpw.mods.fml.common.ObfuscationReflectionHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.ai.attributes.BaseAttributeMap; -import net.minecraft.entity.ai.attributes.IAttributeInstance; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -33,7 +30,6 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; -import noppes.npcs.CustomNpcs; import noppes.npcs.NoppesUtilServer; import noppes.npcs.NpcMiscInventory; import noppes.npcs.constants.EnumAnimation; @@ -41,7 +37,7 @@ import noppes.npcs.constants.EnumCompanionJobs; import noppes.npcs.constants.EnumCompanionStage; import noppes.npcs.constants.EnumCompanionTalent; import noppes.npcs.constants.EnumGuiType; -import noppes.npcs.controllers.PlayerData; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/roles/RoleTransporter.java b/src/main/java/noppes/npcs/roles/RoleTransporter.java index 79a1f83fe..d6b61b391 100644 --- a/src/main/java/noppes/npcs/roles/RoleTransporter.java +++ b/src/main/java/noppes/npcs/roles/RoleTransporter.java @@ -3,17 +3,14 @@ package noppes.npcs.roles; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentTranslation; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.Server; import noppes.npcs.constants.EnumGuiType; -import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.controllers.PlayerDataController; -import noppes.npcs.controllers.PlayerTransportData; +import noppes.npcs.controllers.data.PlayerTransportData; import noppes.npcs.controllers.TransportController; -import noppes.npcs.controllers.TransportLocation; +import noppes.npcs.controllers.data.TransportLocation; import noppes.npcs.entity.EntityNPCInterface; public class RoleTransporter extends RoleInterface{ diff --git a/src/main/java/noppes/npcs/scripted/ScriptFaction.java b/src/main/java/noppes/npcs/scripted/ScriptFaction.java index 8fdcd6fba..91d633376 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptFaction.java +++ b/src/main/java/noppes/npcs/scripted/ScriptFaction.java @@ -1,7 +1,7 @@ package noppes.npcs.scripted; import net.minecraft.entity.player.EntityPlayer; -import noppes.npcs.controllers.Faction; +import noppes.npcs.controllers.data.Faction; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.interfaces.entity.ICustomNpc; import noppes.npcs.scripted.interfaces.entity.IPlayer; diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java index a2c4a846b..47fbf922c 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java @@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.CustomNpcs; import noppes.npcs.NoppesUtilServer; import noppes.npcs.constants.*; -import noppes.npcs.controllers.Line; +import noppes.npcs.controllers.data.Line; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.ScriptFaction; diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java index e199e966d..7ac0e7d42 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java @@ -5,7 +5,6 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import net.minecraft.stats.Achievement; import net.minecraft.stats.StatBase; import net.minecraft.stats.StatList; @@ -17,6 +16,7 @@ import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.containers.ContainerCustomGui; import noppes.npcs.controllers.*; +import noppes.npcs.controllers.data.*; import noppes.npcs.entity.EntityDialogNpc; import noppes.npcs.scripted.*; import noppes.npcs.scripted.constants.EntityType; @@ -134,7 +134,7 @@ public class ScriptPlayer extends ScriptLivingBase PlayerData data = PlayerDataController.instance.getPlayerData(player); if(data.questData.activeQuests.containsKey(id)) return; - QuestData questdata = new QuestData(quest); + QuestData questdata = new QuestData(quest); data.questData.activeQuests.put(id, questdata); Server.sendData((EntityPlayerMP)player, EnumPacketClient.MESSAGE, "quest.newquest", quest.title); Server.sendData((EntityPlayerMP)player, EnumPacketClient.CHAT, "quest.newquest", ": ", quest.title); diff --git a/src/main/java/noppes/npcs/scripted/event/NpcEvent.java b/src/main/java/noppes/npcs/scripted/event/NpcEvent.java index 1fe400811..e1a5c69f0 100644 --- a/src/main/java/noppes/npcs/scripted/event/NpcEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/NpcEvent.java @@ -10,8 +10,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.DamageSource; -import noppes.npcs.controllers.Dialog; -import noppes.npcs.controllers.ScriptController; +import noppes.npcs.controllers.data.Dialog; import noppes.npcs.scripted.interfaces.*; import noppes.npcs.scripted.interfaces.entity.ICustomNpc; import noppes.npcs.scripted.interfaces.entity.IEntity; diff --git a/src/main/java/noppes/npcs/scripted/event/ScriptEventDialog.java b/src/main/java/noppes/npcs/scripted/event/ScriptEventDialog.java index 436cb7027..f546ce429 100644 --- a/src/main/java/noppes/npcs/scripted/event/ScriptEventDialog.java +++ b/src/main/java/noppes/npcs/scripted/event/ScriptEventDialog.java @@ -1,8 +1,7 @@ package noppes.npcs.scripted.event; import net.minecraft.entity.player.EntityPlayer; -import noppes.npcs.controllers.Dialog; -import noppes.npcs.controllers.ScriptController; +import noppes.npcs.controllers.data.Dialog; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.interfaces.entity.IPlayer;