From 82e54b5982e3cebfaa713dcef106636cdf15fedd Mon Sep 17 00:00:00 2001 From: Kam Date: Sun, 17 Mar 2024 23:15:11 -0400 Subject: [PATCH] Optimize Imports --- src/main/java/foxz/command/CmdQuest.java | 1 - src/main/java/kamkeel/command/DialogCommand.java | 1 - src/main/java/noppes/npcs/DataAdvanced.java | 2 -- src/main/java/noppes/npcs/DataDisplay.java | 2 +- src/main/java/noppes/npcs/EventHooks.java | 1 - src/main/java/noppes/npcs/NoppesUtilServer.java | 2 -- src/main/java/noppes/npcs/PacketHandlerPlayer.java | 2 -- src/main/java/noppes/npcs/PacketHandlerServer.java | 1 - src/main/java/noppes/npcs/QuestLogData.java | 1 - src/main/java/noppes/npcs/ScriptItemEventHandler.java | 1 - src/main/java/noppes/npcs/client/NoppesUtil.java | 1 - src/main/java/noppes/npcs/client/PacketHandlerClient.java | 3 --- .../noppes/npcs/client/controllers/MusicController.java | 2 -- src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java | 1 - .../java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java | 1 - .../noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java | 1 - src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java | 5 ----- .../java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java | 1 - .../noppes/npcs/client/gui/SubGuiNpcRangeProperties.java | 1 - .../npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java | 3 --- .../noppes/npcs/client/gui/player/GuiDialogInteract.java | 2 -- .../npcs/client/gui/player/inventory/GuiCNPCInventory.java | 4 ---- .../noppes/npcs/client/gui/player/inventory/GuiFaction.java | 2 -- .../npcs/client/gui/player/inventory/GuiQuestLog.java | 3 --- .../npcs/client/gui/player/inventory/GuiSettings.java | 6 ++++-- .../java/noppes/npcs/client/gui/util/GuiMenuSideButton.java | 1 - .../java/noppes/npcs/client/gui/util/GuiNPCInterface.java | 3 --- src/main/java/noppes/npcs/client/gui/util/GuiNpcButton.java | 3 --- src/main/java/noppes/npcs/client/renderer/MarkRenderer.java | 1 - .../noppes/npcs/client/renderer/RenderNPCInterface.java | 2 +- src/main/java/noppes/npcs/config/ConfigClient.java | 1 - .../java/noppes/npcs/controllers/GlobalDataController.java | 5 ----- src/main/java/noppes/npcs/controllers/PartyController.java | 2 -- .../java/noppes/npcs/controllers/PlayerDataController.java | 5 ++++- .../java/noppes/npcs/controllers/PlayerQuestController.java | 5 ++++- src/main/java/noppes/npcs/controllers/RecipeController.java | 3 --- src/main/java/noppes/npcs/controllers/SyncController.java | 1 - src/main/java/noppes/npcs/controllers/data/MarkData.java | 4 ---- .../java/noppes/npcs/controllers/data/PartyOptions.java | 4 ---- .../noppes/npcs/controllers/data/PlayerItemGiverData.java | 3 --- .../java/noppes/npcs/controllers/data/PlayerQuestData.java | 5 ++++- src/main/java/noppes/npcs/items/ItemNpcCloner.java | 3 --- src/main/java/noppes/npcs/items/ItemTeleporter.java | 3 --- src/main/java/noppes/npcs/mixin/MixinModelRenderer.java | 2 +- src/main/java/noppes/npcs/quests/QuestDialog.java | 5 ----- src/main/java/noppes/npcs/quests/QuestLocation.java | 5 ++++- src/main/java/noppes/npcs/scripted/event/PartyEvent.java | 2 -- src/main/java/noppes/npcs/util/CustomNPCsThreader.java | 1 - src/main/java/noppes/npcs/util/SizeOfObjectUtil.java | 1 - 49 files changed, 23 insertions(+), 97 deletions(-) diff --git a/src/main/java/foxz/command/CmdQuest.java b/src/main/java/foxz/command/CmdQuest.java index b2d508e97..e0500f3e1 100644 --- a/src/main/java/foxz/command/CmdQuest.java +++ b/src/main/java/foxz/command/CmdQuest.java @@ -8,7 +8,6 @@ import foxz.commandhelper.permissions.ParamCheck; import net.minecraft.entity.player.EntityPlayerMP; import noppes.npcs.Server; import noppes.npcs.constants.EnumPacketClient; -import noppes.npcs.controllers.DialogController; import noppes.npcs.controllers.QuestController; import noppes.npcs.controllers.SyncController; import noppes.npcs.controllers.data.PlayerData; diff --git a/src/main/java/kamkeel/command/DialogCommand.java b/src/main/java/kamkeel/command/DialogCommand.java index 52a6bd022..ac9ecd543 100644 --- a/src/main/java/kamkeel/command/DialogCommand.java +++ b/src/main/java/kamkeel/command/DialogCommand.java @@ -4,7 +4,6 @@ import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.server.MinecraftServer; import noppes.npcs.NoppesUtilServer; import noppes.npcs.client.EntityUtil; import noppes.npcs.constants.EnumAvailabilityDialog; diff --git a/src/main/java/noppes/npcs/DataAdvanced.java b/src/main/java/noppes/npcs/DataAdvanced.java index e90867dcb..764317d0e 100644 --- a/src/main/java/noppes/npcs/DataAdvanced.java +++ b/src/main/java/noppes/npcs/DataAdvanced.java @@ -5,14 +5,12 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import noppes.npcs.constants.EnumJobType; import noppes.npcs.constants.EnumRoleType; -import noppes.npcs.controllers.GlobalDataController; 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.*; -import org.lwjgl.Sys; import java.util.HashMap; import java.util.HashSet; diff --git a/src/main/java/noppes/npcs/DataDisplay.java b/src/main/java/noppes/npcs/DataDisplay.java index a3bea8bc2..0bc50badd 100644 --- a/src/main/java/noppes/npcs/DataDisplay.java +++ b/src/main/java/noppes/npcs/DataDisplay.java @@ -12,8 +12,8 @@ import net.minecraft.util.StringUtils; import noppes.npcs.config.ConfigMain; import noppes.npcs.controllers.data.AnimationData; import noppes.npcs.controllers.data.HitboxData; -import noppes.npcs.controllers.data.TintData; import noppes.npcs.controllers.data.SkinOverlay; +import noppes.npcs.controllers.data.TintData; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.entity.data.DataSkinOverlays; import noppes.npcs.util.ValueUtil; diff --git a/src/main/java/noppes/npcs/EventHooks.java b/src/main/java/noppes/npcs/EventHooks.java index f0fc474cc..79c6e98d1 100644 --- a/src/main/java/noppes/npcs/EventHooks.java +++ b/src/main/java/noppes/npcs/EventHooks.java @@ -23,7 +23,6 @@ import noppes.npcs.api.IWorld; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.entity.IProjectile; -import noppes.npcs.api.event.IPartyEvent; import noppes.npcs.api.gui.ICustomGui; import noppes.npcs.api.gui.IItemSlot; import noppes.npcs.api.item.IItemCustom; diff --git a/src/main/java/noppes/npcs/NoppesUtilServer.java b/src/main/java/noppes/npcs/NoppesUtilServer.java index e6795de13..f027b4f15 100644 --- a/src/main/java/noppes/npcs/NoppesUtilServer.java +++ b/src/main/java/noppes/npcs/NoppesUtilServer.java @@ -23,7 +23,6 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import net.minecraft.world.WorldServer; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumGuiType; @@ -41,7 +40,6 @@ import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.ScriptSound; import noppes.npcs.scripted.event.DialogEvent; -import javax.annotation.Nullable; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.io.File; diff --git a/src/main/java/noppes/npcs/PacketHandlerPlayer.java b/src/main/java/noppes/npcs/PacketHandlerPlayer.java index 55feeae1f..7d57b2184 100644 --- a/src/main/java/noppes/npcs/PacketHandlerPlayer.java +++ b/src/main/java/noppes/npcs/PacketHandlerPlayer.java @@ -4,8 +4,6 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent; import io.netty.buffer.ByteBuf; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Items; import net.minecraft.item.ItemEditableBook; diff --git a/src/main/java/noppes/npcs/PacketHandlerServer.java b/src/main/java/noppes/npcs/PacketHandlerServer.java index 322c31edc..6a4a150ca 100644 --- a/src/main/java/noppes/npcs/PacketHandlerServer.java +++ b/src/main/java/noppes/npcs/PacketHandlerServer.java @@ -45,7 +45,6 @@ import noppes.npcs.roles.RoleTrader; import noppes.npcs.roles.RoleTransporter; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.event.PartyEvent; -import noppes.npcs.scripted.event.QuestEvent; import noppes.npcs.scripted.gui.ScriptGui; import noppes.npcs.scripted.item.ScriptCustomItem; diff --git a/src/main/java/noppes/npcs/QuestLogData.java b/src/main/java/noppes/npcs/QuestLogData.java index e70cfde6a..575c0ede8 100644 --- a/src/main/java/noppes/npcs/QuestLogData.java +++ b/src/main/java/noppes/npcs/QuestLogData.java @@ -11,7 +11,6 @@ import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.data.Quest; import java.util.HashMap; -import java.util.HashSet; import java.util.Vector; public class QuestLogData { diff --git a/src/main/java/noppes/npcs/ScriptItemEventHandler.java b/src/main/java/noppes/npcs/ScriptItemEventHandler.java index 6cb678225..f260b7ba8 100644 --- a/src/main/java/noppes/npcs/ScriptItemEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptItemEventHandler.java @@ -18,7 +18,6 @@ import noppes.npcs.api.item.IItemCustom; import noppes.npcs.api.item.IItemStack; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.PlayerData; -import noppes.npcs.controllers.data.PlayerDataScript; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.items.ItemScripted; import noppes.npcs.scripted.NpcAPI; diff --git a/src/main/java/noppes/npcs/client/NoppesUtil.java b/src/main/java/noppes/npcs/client/NoppesUtil.java index 3a5814a9b..3a9eb87dd 100644 --- a/src/main/java/noppes/npcs/client/NoppesUtil.java +++ b/src/main/java/noppes/npcs/client/NoppesUtil.java @@ -23,7 +23,6 @@ import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.client.gui.util.IScrollGroup; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.DialogController; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.Quest; import noppes.npcs.controllers.data.SkinOverlay; diff --git a/src/main/java/noppes/npcs/client/PacketHandlerClient.java b/src/main/java/noppes/npcs/client/PacketHandlerClient.java index a58e65aca..b989406cb 100644 --- a/src/main/java/noppes/npcs/client/PacketHandlerClient.java +++ b/src/main/java/noppes/npcs/client/PacketHandlerClient.java @@ -8,7 +8,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.achievement.GuiAchievement; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -42,11 +41,9 @@ import noppes.npcs.controllers.data.MarkData; import noppes.npcs.controllers.data.RecipeCarpentry; import noppes.npcs.entity.EntityDialogNpc; import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.items.ItemScripted; import java.io.IOException; import java.util.HashMap; -import java.util.Map; public class PacketHandlerClient extends PacketHandlerServer{ diff --git a/src/main/java/noppes/npcs/client/controllers/MusicController.java b/src/main/java/noppes/npcs/client/controllers/MusicController.java index c3b7f146c..e23e77b2a 100644 --- a/src/main/java/noppes/npcs/client/controllers/MusicController.java +++ b/src/main/java/noppes/npcs/client/controllers/MusicController.java @@ -1,9 +1,7 @@ package noppes.npcs.client.controllers; import net.minecraft.client.Minecraft; -import net.minecraft.client.audio.ISound; import net.minecraft.client.audio.PositionedSoundRecord; -import net.minecraft.client.audio.SoundCategory; import net.minecraft.client.audio.SoundHandler; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java b/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java index aeb594147..dbd63a655 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java @@ -3,7 +3,6 @@ package noppes.npcs.client.gui; 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.select.GuiSoundSelection; import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java b/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java index c51d2db9a..e466b0ea4 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java @@ -7,7 +7,6 @@ import net.minecraft.entity.Entity; import net.minecraft.util.StatCollector; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.mainmenu.GuiNPCGlobalMainMenu; import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java index f8910438b..86ada3742 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java @@ -3,7 +3,6 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; - import noppes.npcs.client.gui.select.GuiQuestSelection; import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumAvailabilityQuest; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java index cb625cbbb..e98aaf32a 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java @@ -1,11 +1,7 @@ package noppes.npcs.client.gui; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.CustomNpcs; -import noppes.npcs.NoppesUtilServer; -import noppes.npcs.Server; import noppes.npcs.client.Client; import noppes.npcs.client.EntityUtil; import noppes.npcs.client.NoppesUtil; @@ -16,7 +12,6 @@ import noppes.npcs.client.gui.select.GuiSoundSelection; import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.controllers.data.Dialog; -import noppes.npcs.controllers.data.DialogOption; import noppes.npcs.controllers.data.PlayerMail; import noppes.npcs.entity.EntityDialogNpc; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java index f5d325102..55193a0de 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java @@ -3,7 +3,6 @@ package noppes.npcs.client.gui; 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.select.GuiDialogSelection; import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumOptionType; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java index 3e0b73c0d..34325d357 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java @@ -2,7 +2,6 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.DataStats; -import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.select.GuiSoundSelection; import noppes.npcs.client.gui.util.*; 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 b0a0a865b..02a4f83e9 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java @@ -4,12 +4,9 @@ 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.SubGuiColorSelector; import noppes.npcs.client.gui.select.GuiDialogSelection; import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.DialogOption; import noppes.npcs.entity.EntityNPCInterface; 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 5c1186d23..c2546fa82 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java @@ -19,10 +19,8 @@ import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.TextBlockClient; import noppes.npcs.client.controllers.MusicController; import noppes.npcs.client.gui.util.GuiNPCInterface; -import noppes.npcs.client.gui.util.GuiSelectionListener; import noppes.npcs.client.gui.util.IGuiClose; import noppes.npcs.config.ConfigClient; -import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumOptionType; import noppes.npcs.constants.EnumPlayerPacket; import noppes.npcs.controllers.data.Dialog; diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiCNPCInventory.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiCNPCInventory.java index 4a8a6489c..9771961d8 100644 --- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiCNPCInventory.java +++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiCNPCInventory.java @@ -2,11 +2,7 @@ package noppes.npcs.client.gui.player.inventory; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import noppes.npcs.CustomItems; -import noppes.npcs.client.gui.util.GuiButtonNextPage; import noppes.npcs.client.gui.util.GuiMenuSideButton; import noppes.npcs.client.gui.util.GuiNPCInterface; import noppes.npcs.config.ConfigClient; diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiFaction.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiFaction.java index 24dce869a..41ff92a08 100644 --- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiFaction.java +++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiFaction.java @@ -1,6 +1,5 @@ package noppes.npcs.client.gui.player.inventory; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -9,7 +8,6 @@ import net.minecraft.util.StatCollector; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.gui.util.GuiButtonNextPage; -import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.constants.EnumPlayerPacket; import noppes.npcs.controllers.data.Faction; diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java index 9d3af5650..a146612db 100644 --- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java +++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java @@ -1,6 +1,5 @@ package noppes.npcs.client.gui.player.inventory; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; @@ -20,8 +19,6 @@ import noppes.npcs.util.ValueUtil; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import tconstruct.client.tabs.AbstractTab; -import tconstruct.client.tabs.InventoryTabCustomNpc; -import tconstruct.client.tabs.TabRegistry; import java.util.*; diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiSettings.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiSettings.java index 42e2f209d..ef529ed57 100644 --- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiSettings.java +++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiSettings.java @@ -1,6 +1,5 @@ package noppes.npcs.client.gui.player.inventory; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; @@ -8,7 +7,10 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import noppes.npcs.client.Client; import noppes.npcs.client.ClientCacheHandler; -import noppes.npcs.client.gui.util.*; +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.config.ConfigClient; import noppes.npcs.constants.EnumPacketServer; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiMenuSideButton.java b/src/main/java/noppes/npcs/client/gui/util/GuiMenuSideButton.java index 866d763d7..3359f2880 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiMenuSideButton.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiMenuSideButton.java @@ -6,7 +6,6 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import noppes.npcs.client.gui.player.inventory.GuiCNPCInventory; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java index e076451c1..a2144bc81 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java @@ -12,16 +12,13 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import noppes.npcs.client.CustomNpcResourceListener; -import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.TextBlockClient; import noppes.npcs.entity.EntityNPCInterface; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.Display; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import java.awt.*; import java.net.URI; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNpcButton.java b/src/main/java/noppes/npcs/client/gui/util/GuiNpcButton.java index ed654b742..836c25ab1 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiNpcButton.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiNpcButton.java @@ -2,10 +2,7 @@ package noppes.npcs.client.gui.util; import kamkeel.util.TextSplitter; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/renderer/MarkRenderer.java b/src/main/java/noppes/npcs/client/renderer/MarkRenderer.java index 50c5db0f3..0655f6da8 100644 --- a/src/main/java/noppes/npcs/client/renderer/MarkRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/MarkRenderer.java @@ -2,7 +2,6 @@ package noppes.npcs.client.renderer; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GLAllocation; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.model.util.Model2DRenderer; diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java index 689b17206..f7bdc6305 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java @@ -28,8 +28,8 @@ import noppes.npcs.client.ImageDownloadAlt; import noppes.npcs.client.model.ModelMPM; import noppes.npcs.constants.EnumAnimation; import noppes.npcs.constants.EnumStandingType; -import noppes.npcs.controllers.data.TintData; import noppes.npcs.controllers.data.SkinOverlay; +import noppes.npcs.controllers.data.TintData; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/config/ConfigClient.java b/src/main/java/noppes/npcs/config/ConfigClient.java index fd89c2915..644a3f73e 100644 --- a/src/main/java/noppes/npcs/config/ConfigClient.java +++ b/src/main/java/noppes/npcs/config/ConfigClient.java @@ -6,7 +6,6 @@ import net.minecraftforge.common.config.Property; import noppes.npcs.CustomNpcs; import noppes.npcs.config.legacy.LegacyConfig; import org.apache.logging.log4j.Level; -import tv.twitch.chat.Chat; import java.io.File; diff --git a/src/main/java/noppes/npcs/controllers/GlobalDataController.java b/src/main/java/noppes/npcs/controllers/GlobalDataController.java index 7cc1b5b9a..efb1e0417 100644 --- a/src/main/java/noppes/npcs/controllers/GlobalDataController.java +++ b/src/main/java/noppes/npcs/controllers/GlobalDataController.java @@ -2,16 +2,11 @@ package noppes.npcs.controllers; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcs; -import noppes.npcs.config.ConfigMain; -import noppes.npcs.roles.JobItemGiver; -import noppes.npcs.util.NBTJsonUtil; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.util.HashMap; import static noppes.npcs.util.CustomNPCsThreader.customNPCThread; diff --git a/src/main/java/noppes/npcs/controllers/PartyController.java b/src/main/java/noppes/npcs/controllers/PartyController.java index 34f4f6870..1ceb2440d 100644 --- a/src/main/java/noppes/npcs/controllers/PartyController.java +++ b/src/main/java/noppes/npcs/controllers/PartyController.java @@ -9,7 +9,6 @@ import noppes.npcs.EventHooks; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.NoppesUtilServer; import noppes.npcs.Server; -import noppes.npcs.api.entity.IPlayer; import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumQuestCompletion; import noppes.npcs.constants.EnumQuestType; @@ -19,7 +18,6 @@ import noppes.npcs.controllers.data.Quest; import noppes.npcs.controllers.data.QuestData; import noppes.npcs.quests.QuestInterface; import noppes.npcs.quests.QuestItem; -import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.event.PartyEvent; import java.util.HashMap; diff --git a/src/main/java/noppes/npcs/controllers/PlayerDataController.java b/src/main/java/noppes/npcs/controllers/PlayerDataController.java index 8e1f93545..3c666cff6 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerDataController.java +++ b/src/main/java/noppes/npcs/controllers/PlayerDataController.java @@ -12,7 +12,10 @@ import net.minecraft.util.ChatComponentText; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.config.ConfigMain; -import noppes.npcs.controllers.data.*; +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.CacheHashMap; import noppes.npcs.util.NBTJsonUtil; diff --git a/src/main/java/noppes/npcs/controllers/PlayerQuestController.java b/src/main/java/noppes/npcs/controllers/PlayerQuestController.java index f7e80707f..73e568d22 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerQuestController.java +++ b/src/main/java/noppes/npcs/controllers/PlayerQuestController.java @@ -10,7 +10,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.*; +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; import java.util.Vector; diff --git a/src/main/java/noppes/npcs/controllers/RecipeController.java b/src/main/java/noppes/npcs/controllers/RecipeController.java index 639c746ce..bd129f508 100644 --- a/src/main/java/noppes/npcs/controllers/RecipeController.java +++ b/src/main/java/noppes/npcs/controllers/RecipeController.java @@ -7,11 +7,8 @@ import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcs; -import noppes.npcs.Server; import noppes.npcs.api.handler.IRecipeHandler; import noppes.npcs.api.handler.data.IRecipe; -import noppes.npcs.constants.EnumPacketClient; -import noppes.npcs.constants.SyncType; import noppes.npcs.controllers.data.RecipeCarpentry; import noppes.npcs.controllers.data.RecipesDefault; diff --git a/src/main/java/noppes/npcs/controllers/SyncController.java b/src/main/java/noppes/npcs/controllers/SyncController.java index cc1752a81..e47ebbcbe 100644 --- a/src/main/java/noppes/npcs/controllers/SyncController.java +++ b/src/main/java/noppes/npcs/controllers/SyncController.java @@ -5,7 +5,6 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.Server; -import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.SyncType; import noppes.npcs.controllers.data.*; diff --git a/src/main/java/noppes/npcs/controllers/data/MarkData.java b/src/main/java/noppes/npcs/controllers/data/MarkData.java index 2cd4edfc6..27a9923f4 100644 --- a/src/main/java/noppes/npcs/controllers/data/MarkData.java +++ b/src/main/java/noppes/npcs/controllers/data/MarkData.java @@ -1,13 +1,9 @@ package noppes.npcs.controllers.data; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.IExtendedEntityProperties; import noppes.npcs.Server; diff --git a/src/main/java/noppes/npcs/controllers/data/PartyOptions.java b/src/main/java/noppes/npcs/controllers/data/PartyOptions.java index 7730519d1..18e44c83b 100644 --- a/src/main/java/noppes/npcs/controllers/data/PartyOptions.java +++ b/src/main/java/noppes/npcs/controllers/data/PartyOptions.java @@ -1,15 +1,11 @@ package noppes.npcs.controllers.data; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.StatCollector; import noppes.npcs.api.handler.data.IPartyOptions; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumPartyExchange; import noppes.npcs.constants.EnumPartyObjectives; import noppes.npcs.constants.EnumPartyRequirements; -import noppes.npcs.controllers.DialogController; -import noppes.npcs.controllers.PlayerDataController; import java.util.Vector; diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerItemGiverData.java b/src/main/java/noppes/npcs/controllers/data/PlayerItemGiverData.java index 22777cb22..7fe97102e 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerItemGiverData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerItemGiverData.java @@ -4,11 +4,8 @@ import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NBTTags; import noppes.npcs.api.handler.IPlayerItemGiverData; import noppes.npcs.api.jobs.IJobItemGiver; -import noppes.npcs.controllers.GlobalDataController; import noppes.npcs.roles.JobItemGiver; -import noppes.npcs.scripted.roles.ScriptJobItemGiver; -import java.util.ArrayList; import java.util.HashMap; public class PlayerItemGiverData implements IPlayerItemGiverData { diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java b/src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java index 73edd5d52..3acf88cd6 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java @@ -10,7 +10,10 @@ import noppes.npcs.Server; import noppes.npcs.api.handler.IPlayerQuestData; import noppes.npcs.api.handler.data.IParty; import noppes.npcs.api.handler.data.IQuest; -import noppes.npcs.constants.*; +import noppes.npcs.constants.EnumPacketClient; +import noppes.npcs.constants.EnumQuestCompletion; +import noppes.npcs.constants.EnumQuestRepeat; +import noppes.npcs.constants.EnumQuestType; import noppes.npcs.controllers.PartyController; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.QuestController; diff --git a/src/main/java/noppes/npcs/items/ItemNpcCloner.java b/src/main/java/noppes/npcs/items/ItemNpcCloner.java index dd2d3b96a..8fcf1d50c 100644 --- a/src/main/java/noppes/npcs/items/ItemNpcCloner.java +++ b/src/main/java/noppes/npcs/items/ItemNpcCloner.java @@ -9,13 +9,10 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.world.World; import noppes.npcs.CustomItems; -import noppes.npcs.CustomNpcs; import noppes.npcs.CustomNpcsPermissions; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.constants.EnumGuiType; public class ItemNpcCloner extends Item{ diff --git a/src/main/java/noppes/npcs/items/ItemTeleporter.java b/src/main/java/noppes/npcs/items/ItemTeleporter.java index ac30fc2b2..339680845 100644 --- a/src/main/java/noppes/npcs/items/ItemTeleporter.java +++ b/src/main/java/noppes/npcs/items/ItemTeleporter.java @@ -18,11 +18,8 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; import noppes.npcs.CustomItems; -import noppes.npcs.CustomNpcs; import noppes.npcs.CustomNpcsPermissions; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.constants.EnumGuiType; -import noppes.npcs.entity.EntityNPCInterface; import java.util.List; diff --git a/src/main/java/noppes/npcs/mixin/MixinModelRenderer.java b/src/main/java/noppes/npcs/mixin/MixinModelRenderer.java index cc3984779..22661239b 100644 --- a/src/main/java/noppes/npcs/mixin/MixinModelRenderer.java +++ b/src/main/java/noppes/npcs/mixin/MixinModelRenderer.java @@ -5,10 +5,10 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; -import noppes.npcs.controllers.data.AnimationData; import noppes.npcs.client.ClientCacheHandler; import noppes.npcs.client.ClientEventHandler; import noppes.npcs.constants.EnumAnimationPart; +import noppes.npcs.controllers.data.AnimationData; import noppes.npcs.controllers.data.Frame; import noppes.npcs.controllers.data.FramePart; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/quests/QuestDialog.java b/src/main/java/noppes/npcs/quests/QuestDialog.java index a4e73b5a6..30e9805ee 100644 --- a/src/main/java/noppes/npcs/quests/QuestDialog.java +++ b/src/main/java/noppes/npcs/quests/QuestDialog.java @@ -1,14 +1,11 @@ package noppes.npcs.quests; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NBTTags; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.Server; import noppes.npcs.api.handler.data.IQuestDialog; import noppes.npcs.api.handler.data.IQuestObjective; -import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumPartyObjectives; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.controllers.DialogController; @@ -21,8 +18,6 @@ import noppes.npcs.scripted.CustomNPCsException; import java.util.*; -import static noppes.npcs.PacketHandlerServer.sendInviteData; - public class QuestDialog extends QuestInterface implements IQuestDialog { public HashMap dialogs = new HashMap(); diff --git a/src/main/java/noppes/npcs/quests/QuestLocation.java b/src/main/java/noppes/npcs/quests/QuestLocation.java index 44bb59dcf..14b895855 100644 --- a/src/main/java/noppes/npcs/quests/QuestLocation.java +++ b/src/main/java/noppes/npcs/quests/QuestLocation.java @@ -10,7 +10,10 @@ import noppes.npcs.constants.EnumPartyObjectives; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.controllers.PartyController; import noppes.npcs.controllers.PlayerDataController; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerQuestData; +import noppes.npcs.controllers.data.QuestData; import noppes.npcs.scripted.CustomNPCsException; import java.util.ArrayList; diff --git a/src/main/java/noppes/npcs/scripted/event/PartyEvent.java b/src/main/java/noppes/npcs/scripted/event/PartyEvent.java index a9de4b20d..d1df03e8d 100644 --- a/src/main/java/noppes/npcs/scripted/event/PartyEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/PartyEvent.java @@ -3,10 +3,8 @@ package noppes.npcs.scripted.event; import cpw.mods.fml.common.eventhandler.Cancelable; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.event.IPartyEvent; -import noppes.npcs.api.event.IQuestEvent; import noppes.npcs.api.handler.data.IParty; import noppes.npcs.api.handler.data.IQuest; -import noppes.npcs.api.item.IItemStack; import noppes.npcs.constants.EnumScriptType; public class PartyEvent extends CustomNPCsEvent implements IPartyEvent { diff --git a/src/main/java/noppes/npcs/util/CustomNPCsThreader.java b/src/main/java/noppes/npcs/util/CustomNPCsThreader.java index cdc040112..b63b5fbf1 100644 --- a/src/main/java/noppes/npcs/util/CustomNPCsThreader.java +++ b/src/main/java/noppes/npcs/util/CustomNPCsThreader.java @@ -2,7 +2,6 @@ package noppes.npcs.util; import java.util.concurrent.Executor; import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; public class CustomNPCsThreader { public static final Executor customNPCThread = Executors.newSingleThreadExecutor(); diff --git a/src/main/java/noppes/npcs/util/SizeOfObjectUtil.java b/src/main/java/noppes/npcs/util/SizeOfObjectUtil.java index 55984b480..06f676584 100644 --- a/src/main/java/noppes/npcs/util/SizeOfObjectUtil.java +++ b/src/main/java/noppes/npcs/util/SizeOfObjectUtil.java @@ -1,6 +1,5 @@ package noppes.npcs.util; -import java.lang.instrument.Instrumentation; import java.lang.reflect.Field; public class SizeOfObjectUtil {