diff --git a/src/main/java/foxz/command/CmdNoppes.java b/src/main/java/foxz/command/CmdNoppes.java index a60d1dd8f..cd562f7e1 100644 --- a/src/main/java/foxz/command/CmdNoppes.java +++ b/src/main/java/foxz/command/CmdNoppes.java @@ -27,7 +27,12 @@ import noppes.npcs.controllers.FactionController; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityNPCInterface; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; @Command( name = "noppes", diff --git a/src/main/java/foxz/commandhelper/AbstractCommandHelper.java b/src/main/java/foxz/commandhelper/AbstractCommandHelper.java index c2d62a229..f075c2ee2 100644 --- a/src/main/java/foxz/commandhelper/AbstractCommandHelper.java +++ b/src/main/java/foxz/commandhelper/AbstractCommandHelper.java @@ -19,7 +19,11 @@ import noppes.npcs.controllers.data.PlayerData; import java.lang.reflect.Constructor; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/src/main/java/foxz/commandhelper/annotations/SubCommand.java b/src/main/java/foxz/commandhelper/annotations/SubCommand.java index 1daa73882..769f64b3c 100644 --- a/src/main/java/foxz/commandhelper/annotations/SubCommand.java +++ b/src/main/java/foxz/commandhelper/annotations/SubCommand.java @@ -1,6 +1,10 @@ package foxz.commandhelper.annotations; -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Documented @Retention(value = RetentionPolicy.RUNTIME) diff --git a/src/main/java/kamkeel/npcs/command/CloneCommand.java b/src/main/java/kamkeel/npcs/command/CloneCommand.java index ac3d29606..027ff228e 100644 --- a/src/main/java/kamkeel/npcs/command/CloneCommand.java +++ b/src/main/java/kamkeel/npcs/command/CloneCommand.java @@ -17,7 +17,9 @@ import noppes.npcs.entity.EntityNPCInterface; import java.util.List; -import static kamkeel.npcs.util.ColorUtil.*; +import static kamkeel.npcs.util.ColorUtil.sendError; +import static kamkeel.npcs.util.ColorUtil.sendMessage; +import static kamkeel.npcs.util.ColorUtil.sendResult; public class CloneCommand extends CommandKamkeelBase { diff --git a/src/main/java/kamkeel/npcs/command/CommandKamkeel.java b/src/main/java/kamkeel/npcs/command/CommandKamkeel.java index 306176669..76bc80b94 100644 --- a/src/main/java/kamkeel/npcs/command/CommandKamkeel.java +++ b/src/main/java/kamkeel/npcs/command/CommandKamkeel.java @@ -13,7 +13,11 @@ import noppes.npcs.config.ConfigMain; import noppes.npcs.scripted.CustomNPCsException; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static kamkeel.npcs.command.EffectCommand.getSortedEffectNames; diff --git a/src/main/java/kamkeel/npcs/command/EffectCommand.java b/src/main/java/kamkeel/npcs/command/EffectCommand.java index 3cca5305e..8a6a2e669 100644 --- a/src/main/java/kamkeel/npcs/command/EffectCommand.java +++ b/src/main/java/kamkeel/npcs/command/EffectCommand.java @@ -8,7 +8,12 @@ import noppes.npcs.controllers.data.CustomEffect; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.scripted.event.player.PlayerEvent.EffectEvent.ExpirationType; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static kamkeel.npcs.util.ColorUtil.sendError; import static kamkeel.npcs.util.ColorUtil.sendResult; diff --git a/src/main/java/kamkeel/npcs/command/SlayCommand.java b/src/main/java/kamkeel/npcs/command/SlayCommand.java index 260ef99c8..dd60e2099 100644 --- a/src/main/java/kamkeel/npcs/command/SlayCommand.java +++ b/src/main/java/kamkeel/npcs/command/SlayCommand.java @@ -18,7 +18,11 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.AxisAlignedBB; import noppes.npcs.entity.EntityNPCInterface; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import static kamkeel.npcs.util.ColorUtil.sendResult; diff --git a/src/main/java/kamkeel/npcs/command/profile/CommandProfileAdmin.java b/src/main/java/kamkeel/npcs/command/profile/CommandProfileAdmin.java index 94c7d4b50..9fac5f0fd 100644 --- a/src/main/java/kamkeel/npcs/command/profile/CommandProfileAdmin.java +++ b/src/main/java/kamkeel/npcs/command/profile/CommandProfileAdmin.java @@ -12,7 +12,9 @@ import java.io.File; import java.util.Map; import java.util.UUID; -import static kamkeel.npcs.util.ColorUtil.*; +import static kamkeel.npcs.util.ColorUtil.sendError; +import static kamkeel.npcs.util.ColorUtil.sendMessage; +import static kamkeel.npcs.util.ColorUtil.sendResult; public class CommandProfileAdmin extends CommandProfileBase { diff --git a/src/main/java/kamkeel/npcs/command/profile/CommandProfileRegion.java b/src/main/java/kamkeel/npcs/command/profile/CommandProfileRegion.java index 4c6e9ff1e..aa798d30b 100644 --- a/src/main/java/kamkeel/npcs/command/profile/CommandProfileRegion.java +++ b/src/main/java/kamkeel/npcs/command/profile/CommandProfileRegion.java @@ -7,7 +7,9 @@ import noppes.npcs.config.ConfigMain; import java.util.ArrayList; import java.util.List; -import static kamkeel.npcs.util.ColorUtil.*; +import static kamkeel.npcs.util.ColorUtil.sendError; +import static kamkeel.npcs.util.ColorUtil.sendMessage; +import static kamkeel.npcs.util.ColorUtil.sendResult; public class CommandProfileRegion extends CommandProfileBase { diff --git a/src/main/java/kamkeel/npcs/controllers/ProfileController.java b/src/main/java/kamkeel/npcs/controllers/ProfileController.java index f5ceed513..bf9615d60 100644 --- a/src/main/java/kamkeel/npcs/controllers/ProfileController.java +++ b/src/main/java/kamkeel/npcs/controllers/ProfileController.java @@ -1,10 +1,20 @@ package kamkeel.npcs.controllers; -import kamkeel.npcs.controllers.data.profile.*; +import kamkeel.npcs.controllers.data.profile.CNPCData; +import kamkeel.npcs.controllers.data.profile.EnumProfileOperation; +import kamkeel.npcs.controllers.data.profile.IProfileData; +import kamkeel.npcs.controllers.data.profile.Profile; +import kamkeel.npcs.controllers.data.profile.ProfileInfoEntry; +import kamkeel.npcs.controllers.data.profile.ProfileOperation; +import kamkeel.npcs.controllers.data.profile.Slot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.*; +import noppes.npcs.CustomNpcs; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.EventHooks; +import noppes.npcs.LogWriter; +import noppes.npcs.NoppesUtilServer; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.handler.IPlayerData; import noppes.npcs.api.handler.IProfileHandler; @@ -20,13 +30,27 @@ import noppes.npcs.scripted.NpcAPI; import noppes.npcs.util.CustomNPCsThreader; import noppes.npcs.util.NBTJsonUtil; -import java.io.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; -import static noppes.npcs.CustomNpcsPermissions.*; +import static noppes.npcs.CustomNpcsPermissions.PROFILE_MAX; +import static noppes.npcs.CustomNpcsPermissions.PROFILE_REGION_BYPASS; +import static noppes.npcs.CustomNpcsPermissions.hasCustomPermission; public class ProfileController implements IProfileHandler { diff --git a/src/main/java/kamkeel/npcs/controllers/SyncController.java b/src/main/java/kamkeel/npcs/controllers/SyncController.java index 8a18ebca4..02830966c 100644 --- a/src/main/java/kamkeel/npcs/controllers/SyncController.java +++ b/src/main/java/kamkeel/npcs/controllers/SyncController.java @@ -15,8 +15,25 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.client.ClientCacheHandler; -import noppes.npcs.controllers.*; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.CustomEffectController; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.FactionController; +import noppes.npcs.controllers.MagicController; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.RecipeController; +import noppes.npcs.controllers.data.CustomEffect; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.DialogCategory; +import noppes.npcs.controllers.data.EffectKey; +import noppes.npcs.controllers.data.Faction; +import noppes.npcs.controllers.data.Magic; +import noppes.npcs.controllers.data.MagicCycle; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerEffect; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.QuestCategory; +import noppes.npcs.controllers.data.RecipeAnvil; +import noppes.npcs.controllers.data.RecipeCarpentry; import java.util.HashMap; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java b/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java index e38c1561b..c23be055e 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java +++ b/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java @@ -3,8 +3,8 @@ package kamkeel.npcs.controllers.data.attribute.requirement.types; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import kamkeel.npcs.controllers.data.attribute.requirement.IRequirementChecker; import kamkeel.npcs.controllers.ProfileController; +import kamkeel.npcs.controllers.data.attribute.requirement.IRequirementChecker; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/kamkeel/npcs/network/PacketHandler.java b/src/main/java/kamkeel/npcs/network/PacketHandler.java index bcb94e80f..dfb8a39a9 100644 --- a/src/main/java/kamkeel/npcs/network/PacketHandler.java +++ b/src/main/java/kamkeel/npcs/network/PacketHandler.java @@ -8,14 +8,59 @@ import cpw.mods.fml.common.network.internal.FMLProxyPacket; import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.enums.EnumChannelType; -import kamkeel.npcs.network.packets.data.*; -import kamkeel.npcs.network.packets.data.gui.*; -import kamkeel.npcs.network.packets.data.large.*; -import kamkeel.npcs.network.packets.data.npc.*; +import kamkeel.npcs.network.packets.data.AchievementPacket; +import kamkeel.npcs.network.packets.data.ChatAlertPacket; +import kamkeel.npcs.network.packets.data.ChatBubblePacket; +import kamkeel.npcs.network.packets.data.ClonerPacket; +import kamkeel.npcs.network.packets.data.ConfigCommandPacket; +import kamkeel.npcs.network.packets.data.DisableMouseInputPacket; +import kamkeel.npcs.network.packets.data.LoginPacket; +import kamkeel.npcs.network.packets.data.MarkDataPacket; +import kamkeel.npcs.network.packets.data.OverlayQuestTrackingPacket; +import kamkeel.npcs.network.packets.data.ParticlePacket; +import kamkeel.npcs.network.packets.data.PlayerDataInfoPacket; +import kamkeel.npcs.network.packets.data.PlayerUpdateSkinOverlaysPacket; +import kamkeel.npcs.network.packets.data.QuestCompletionPacket; +import kamkeel.npcs.network.packets.data.ScrollSelectedPacket; +import kamkeel.npcs.network.packets.data.SoundManagementPacket; +import kamkeel.npcs.network.packets.data.SwingPlayerArmPacket; +import kamkeel.npcs.network.packets.data.UpdateAnimationsPacket; +import kamkeel.npcs.network.packets.data.VillagerListPacket; +import kamkeel.npcs.network.packets.data.gui.GuiClosePacket; +import kamkeel.npcs.network.packets.data.gui.GuiErrorPacket; +import kamkeel.npcs.network.packets.data.gui.GuiOpenBookPacket; +import kamkeel.npcs.network.packets.data.gui.GuiOpenPacket; +import kamkeel.npcs.network.packets.data.gui.GuiRedstonePacket; +import kamkeel.npcs.network.packets.data.gui.GuiTeleporterPacket; +import kamkeel.npcs.network.packets.data.gui.GuiWaypointPacket; +import kamkeel.npcs.network.packets.data.gui.IsGuiOpenPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import kamkeel.npcs.network.packets.data.large.PartyDataPacket; +import kamkeel.npcs.network.packets.data.large.ScrollDataPacket; +import kamkeel.npcs.network.packets.data.large.ScrollListPacket; +import kamkeel.npcs.network.packets.data.large.SyncEffectPacket; +import kamkeel.npcs.network.packets.data.large.SyncPacket; +import kamkeel.npcs.network.packets.data.npc.DeleteNpcPacket; +import kamkeel.npcs.network.packets.data.npc.DialogPacket; +import kamkeel.npcs.network.packets.data.npc.EditNpcPacket; +import kamkeel.npcs.network.packets.data.npc.RolePacket; +import kamkeel.npcs.network.packets.data.npc.UpdateNpcPacket; +import kamkeel.npcs.network.packets.data.npc.WeaponNpcPacket; import kamkeel.npcs.network.packets.data.script.ScriptOverlayClosePacket; import kamkeel.npcs.network.packets.data.script.ScriptOverlayDataPacket; import kamkeel.npcs.network.packets.data.script.ScriptedParticlePacket; -import kamkeel.npcs.network.packets.player.*; +import kamkeel.npcs.network.packets.player.BankActionPacket; +import kamkeel.npcs.network.packets.player.CheckPlayerValue; +import kamkeel.npcs.network.packets.player.CompanionActionPacket; +import kamkeel.npcs.network.packets.player.DialogSelectPacket; +import kamkeel.npcs.network.packets.player.FollowerPacket; +import kamkeel.npcs.network.packets.player.GetNPCRole; +import kamkeel.npcs.network.packets.player.InputDevicePacket; +import kamkeel.npcs.network.packets.player.MailActionPacket; +import kamkeel.npcs.network.packets.player.SaveBookPacket; +import kamkeel.npcs.network.packets.player.SaveSignPacket; +import kamkeel.npcs.network.packets.player.ScreenSizePacket; +import kamkeel.npcs.network.packets.player.TransportPacket; import kamkeel.npcs.network.packets.player.customgui.CustomGuiButtonPacket; import kamkeel.npcs.network.packets.player.customgui.CustomGuiClosePacket; import kamkeel.npcs.network.packets.player.customgui.CustomGuiUnfocusedPacket; @@ -23,8 +68,21 @@ import kamkeel.npcs.network.packets.player.customgui.CustomScrollClickPacket; import kamkeel.npcs.network.packets.player.item.GuiMagicBookPacket; import kamkeel.npcs.network.packets.player.item.GuiPaintbrushPacket; import kamkeel.npcs.network.packets.player.item.MagicCyclesPacket; -import kamkeel.npcs.network.packets.player.profile.*; -import kamkeel.npcs.network.packets.request.*; +import kamkeel.npcs.network.packets.player.profile.ProfileChangePacket; +import kamkeel.npcs.network.packets.player.profile.ProfileCreatePacket; +import kamkeel.npcs.network.packets.player.profile.ProfileGetInfoPacket; +import kamkeel.npcs.network.packets.player.profile.ProfileGetPacket; +import kamkeel.npcs.network.packets.player.profile.ProfileRemovePacket; +import kamkeel.npcs.network.packets.player.profile.ProfileRenamePacket; +import kamkeel.npcs.network.packets.request.DimensionsGetPacket; +import kamkeel.npcs.network.packets.request.GuiRequestPacket; +import kamkeel.npcs.network.packets.request.IsGuiOpenInform; +import kamkeel.npcs.network.packets.request.MailOpenSetupPacket; +import kamkeel.npcs.network.packets.request.MerchantUpdatePacket; +import kamkeel.npcs.network.packets.request.MountPacket; +import kamkeel.npcs.network.packets.request.TileEntityGetPacket; +import kamkeel.npcs.network.packets.request.TileEntitySavePacket; +import kamkeel.npcs.network.packets.request.TraderMarketSavePacket; import kamkeel.npcs.network.packets.request.animation.AnimationGetPacket; import kamkeel.npcs.network.packets.request.animation.AnimationRemovePacket; import kamkeel.npcs.network.packets.request.animation.AnimationSavePacket; @@ -33,13 +91,35 @@ import kamkeel.npcs.network.packets.request.bank.BankGetPacket; import kamkeel.npcs.network.packets.request.bank.BankRemovePacket; import kamkeel.npcs.network.packets.request.bank.BankSavePacket; import kamkeel.npcs.network.packets.request.bank.BanksGetPacket; -import kamkeel.npcs.network.packets.request.clone.*; -import kamkeel.npcs.network.packets.request.dialog.*; +import kamkeel.npcs.network.packets.request.clone.CloneAllTagsPacket; +import kamkeel.npcs.network.packets.request.clone.CloneAllTagsShortPacket; +import kamkeel.npcs.network.packets.request.clone.CloneListPacket; +import kamkeel.npcs.network.packets.request.clone.ClonePreSavePacket; +import kamkeel.npcs.network.packets.request.clone.CloneRemovePacket; +import kamkeel.npcs.network.packets.request.clone.CloneSavePacket; +import kamkeel.npcs.network.packets.request.clone.CloneTagListPacket; +import kamkeel.npcs.network.packets.request.clone.MobSpawnerPacket; +import kamkeel.npcs.network.packets.request.clone.SpawnMobPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogCategoriesGetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogCategoryGetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogCategoryRemovePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogCategorySavePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogGetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogNpcGetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogNpcRemovePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogNpcSetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogRemovePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogSavePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogsGetPacket; import kamkeel.npcs.network.packets.request.effects.EffectGetPacket; import kamkeel.npcs.network.packets.request.effects.EffectRemovePacket; import kamkeel.npcs.network.packets.request.effects.EffectSavePacket; import kamkeel.npcs.network.packets.request.effects.EffectsGetPacket; -import kamkeel.npcs.network.packets.request.faction.*; +import kamkeel.npcs.network.packets.request.faction.FactionGetPacket; +import kamkeel.npcs.network.packets.request.faction.FactionRemovePacket; +import kamkeel.npcs.network.packets.request.faction.FactionSavePacket; +import kamkeel.npcs.network.packets.request.faction.FactionSetPacket; +import kamkeel.npcs.network.packets.request.faction.FactionsGetPacket; import kamkeel.npcs.network.packets.request.feather.DimensionTeleportPacket; import kamkeel.npcs.network.packets.request.item.ColorBrushPacket; import kamkeel.npcs.network.packets.request.item.ColorSetPacket; @@ -48,19 +128,79 @@ import kamkeel.npcs.network.packets.request.jobs.JobGetPacket; import kamkeel.npcs.network.packets.request.jobs.JobSavePacket; import kamkeel.npcs.network.packets.request.jobs.JobSpawnerAddPacket; import kamkeel.npcs.network.packets.request.jobs.JobSpawnerRemovePacket; -import kamkeel.npcs.network.packets.request.linked.*; -import kamkeel.npcs.network.packets.request.magic.*; -import kamkeel.npcs.network.packets.request.mainmenu.*; +import kamkeel.npcs.network.packets.request.linked.LinkedGetAllPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedGetPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedItemBuildPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedItemRemovePacket; +import kamkeel.npcs.network.packets.request.linked.LinkedItemSavePacket; +import kamkeel.npcs.network.packets.request.linked.LinkedNPCAddPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedNPCRemovePacket; +import kamkeel.npcs.network.packets.request.linked.LinkedSetPacket; +import kamkeel.npcs.network.packets.request.magic.MagicCycleRemovePacket; +import kamkeel.npcs.network.packets.request.magic.MagicCycleSavePacket; +import kamkeel.npcs.network.packets.request.magic.MagicGetAllPacket; +import kamkeel.npcs.network.packets.request.magic.MagicGetPacket; +import kamkeel.npcs.network.packets.request.magic.MagicNpcGetPacket; +import kamkeel.npcs.network.packets.request.magic.MagicNpcSavePacket; +import kamkeel.npcs.network.packets.request.magic.MagicRemovePacket; +import kamkeel.npcs.network.packets.request.magic.MagicSavePacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAIGetPacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAISavePacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedGetPacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedMarkDataPacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedSavePacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuDisplayGetPacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuDisplaySavePacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuInvGetPacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuInvSavePacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuStatsGetPacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuStatsSavePacket; import kamkeel.npcs.network.packets.request.naturalspawns.NaturalSpawnGetAllPacket; import kamkeel.npcs.network.packets.request.naturalspawns.NaturalSpawnGetPacket; import kamkeel.npcs.network.packets.request.naturalspawns.NaturalSpawnRemovePacket; import kamkeel.npcs.network.packets.request.naturalspawns.NaturalSpawnSavePacket; -import kamkeel.npcs.network.packets.request.npc.*; -import kamkeel.npcs.network.packets.request.party.*; +import kamkeel.npcs.network.packets.request.npc.ModelDataSavePacket; +import kamkeel.npcs.network.packets.request.npc.NpcClosePacket; +import kamkeel.npcs.network.packets.request.npc.NpcDeletePacket; +import kamkeel.npcs.network.packets.request.npc.RemoteDeletePacket; +import kamkeel.npcs.network.packets.request.npc.RemoteFreezeGetPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteFreezePacket; +import kamkeel.npcs.network.packets.request.npc.RemoteGlobalMenuPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteMainMenuPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteNpcsGetPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteResetPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteTpToNpcPacket; +import kamkeel.npcs.network.packets.request.party.PartyAcceptInvitePacket; +import kamkeel.npcs.network.packets.request.party.PartyDisbandPacket; +import kamkeel.npcs.network.packets.request.party.PartyIgnoreInvitePacket; +import kamkeel.npcs.network.packets.request.party.PartyInfoPacket; +import kamkeel.npcs.network.packets.request.party.PartyInvitePacket; +import kamkeel.npcs.network.packets.request.party.PartyKickPacket; +import kamkeel.npcs.network.packets.request.party.PartyLeavePacket; +import kamkeel.npcs.network.packets.request.party.PartyLogToServerPacket; +import kamkeel.npcs.network.packets.request.party.PartySavePacket; +import kamkeel.npcs.network.packets.request.party.PartySetLeaderPacket; +import kamkeel.npcs.network.packets.request.party.PartySetQuestPacket; import kamkeel.npcs.network.packets.request.pather.MovingPathGetPacket; import kamkeel.npcs.network.packets.request.pather.MovingPathSavePacket; -import kamkeel.npcs.network.packets.request.playerdata.*; -import kamkeel.npcs.network.packets.request.quest.*; +import kamkeel.npcs.network.packets.request.playerdata.PlayerDataDeleteInfoPacket; +import kamkeel.npcs.network.packets.request.playerdata.PlayerDataGetInfoPacket; +import kamkeel.npcs.network.packets.request.playerdata.PlayerDataGetNamesPacket; +import kamkeel.npcs.network.packets.request.playerdata.PlayerDataMapRegenPacket; +import kamkeel.npcs.network.packets.request.playerdata.PlayerDataRemovePacket; +import kamkeel.npcs.network.packets.request.playerdata.PlayerDataSaveInfoPacket; +import kamkeel.npcs.network.packets.request.quest.QuestCategoriesGetPacket; +import kamkeel.npcs.network.packets.request.quest.QuestCategoryGetPacket; +import kamkeel.npcs.network.packets.request.quest.QuestCategoryRemovePacket; +import kamkeel.npcs.network.packets.request.quest.QuestCategorySavePacket; +import kamkeel.npcs.network.packets.request.quest.QuestDialogGetTitlePacket; +import kamkeel.npcs.network.packets.request.quest.QuestGetPacket; +import kamkeel.npcs.network.packets.request.quest.QuestLogToServerPacket; +import kamkeel.npcs.network.packets.request.quest.QuestOpenGuiPacket; +import kamkeel.npcs.network.packets.request.quest.QuestRemovePacket; +import kamkeel.npcs.network.packets.request.quest.QuestSavePacket; +import kamkeel.npcs.network.packets.request.quest.QuestUntrackPacket; +import kamkeel.npcs.network.packets.request.quest.QuestsGetPacket; import kamkeel.npcs.network.packets.request.recipe.RecipeGetPacket; import kamkeel.npcs.network.packets.request.recipe.RecipeRemovePacket; import kamkeel.npcs.network.packets.request.recipe.RecipeSavePacket; @@ -68,15 +208,34 @@ import kamkeel.npcs.network.packets.request.recipe.RecipesGetPacket; import kamkeel.npcs.network.packets.request.role.RoleCompanionUpdatePacket; import kamkeel.npcs.network.packets.request.role.RoleGetPacket; import kamkeel.npcs.network.packets.request.role.RoleSavePacket; -import kamkeel.npcs.network.packets.request.script.*; +import kamkeel.npcs.network.packets.request.script.BlockScriptPacket; +import kamkeel.npcs.network.packets.request.script.EffectScriptPacket; +import kamkeel.npcs.network.packets.request.script.EventScriptPacket; +import kamkeel.npcs.network.packets.request.script.ForgeScriptPacket; +import kamkeel.npcs.network.packets.request.script.GlobalNPCScriptPacket; +import kamkeel.npcs.network.packets.request.script.NPCScriptPacket; +import kamkeel.npcs.network.packets.request.script.PlayerScriptPacket; +import kamkeel.npcs.network.packets.request.script.RecipeScriptPacket; +import kamkeel.npcs.network.packets.request.script.ScriptInfoPacket; import kamkeel.npcs.network.packets.request.script.item.ItemScriptErrorPacket; import kamkeel.npcs.network.packets.request.script.item.ItemScriptPacket; import kamkeel.npcs.network.packets.request.script.item.LinkedItemScriptPacket; -import kamkeel.npcs.network.packets.request.tags.*; +import kamkeel.npcs.network.packets.request.tags.TagGetPacket; +import kamkeel.npcs.network.packets.request.tags.TagRemovePacket; +import kamkeel.npcs.network.packets.request.tags.TagSavePacket; +import kamkeel.npcs.network.packets.request.tags.TagSetPacket; +import kamkeel.npcs.network.packets.request.tags.TagsGetPacket; +import kamkeel.npcs.network.packets.request.tags.TagsNpcGetPacket; import kamkeel.npcs.network.packets.request.transform.TransformGetPacket; import kamkeel.npcs.network.packets.request.transform.TransformLoadPacket; import kamkeel.npcs.network.packets.request.transform.TransformSavePacket; -import kamkeel.npcs.network.packets.request.transport.*; +import kamkeel.npcs.network.packets.request.transport.TransportCategoriesGetPacket; +import kamkeel.npcs.network.packets.request.transport.TransportCategoryRemovePacket; +import kamkeel.npcs.network.packets.request.transport.TransportCategorySavePacket; +import kamkeel.npcs.network.packets.request.transport.TransportGetLocationPacket; +import kamkeel.npcs.network.packets.request.transport.TransportRemovePacket; +import kamkeel.npcs.network.packets.request.transport.TransportSavePacket; +import kamkeel.npcs.network.packets.request.transport.TransportsGetPacket; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java index 06440e1f2..769709c23 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java @@ -4,7 +4,11 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.LargeAbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumPlayerPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/player/customgui/CustomGuiClosePacket.java b/src/main/java/kamkeel/npcs/network/packets/player/customgui/CustomGuiClosePacket.java index a94b6c4a3..27862b15c 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/customgui/CustomGuiClosePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/customgui/CustomGuiClosePacket.java @@ -12,7 +12,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.EventHooks; import noppes.npcs.api.entity.IPlayer; -import noppes.npcs.containers.ContainerCustomGui; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.gui.ScriptGui; diff --git a/src/main/java/kamkeel/npcs/network/packets/player/item/MagicCyclesPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/item/MagicCyclesPacket.java index 2e9ec537e..bbb6a9f62 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/item/MagicCyclesPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/item/MagicCyclesPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.player.item; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumPlayerPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/MountPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/MountPacket.java index 0fa6fea87..991184cb7 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/MountPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/MountPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/MobSpawnerPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/MobSpawnerPacket.java index d5440f82e..cc4dfb3ed 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/clone/MobSpawnerPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/clone/MobSpawnerPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.clone; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/SpawnMobPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/SpawnMobPacket.java index 7af87fd07..b83fb9286 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/clone/SpawnMobPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/clone/SpawnMobPacket.java @@ -4,7 +4,11 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogGetPacket.java index 44a59246f..f3609a7ac 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogGetPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.dialog; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionGetPacket.java index d7bf394a7..c432ca47d 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionGetPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.faction; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java index 88595b60b..fa3175c0f 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.jobs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java index 3825f8c82..e05715577 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.linked; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.ScrollSelectedPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetPacket.java index 40cad7db5..c562ac8d4 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.linked; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicGetPacket.java index b2181c6ba..3498f32aa 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicGetPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.magic; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestGetPacket.java index 979f21f47..4f309c011 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestGetPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.quest; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/EffectScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/EffectScriptPacket.java index 66da65d8f..8171f085d 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/EffectScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/EffectScriptPacket.java @@ -4,7 +4,11 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/EventScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/EventScriptPacket.java index 72d3c66bc..69f660a2c 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/EventScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/EventScriptPacket.java @@ -4,7 +4,11 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/ForgeScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/ForgeScriptPacket.java index 11d625988..86584a766 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/ForgeScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/ForgeScriptPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.script; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/GlobalNPCScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/GlobalNPCScriptPacket.java index bb07fac73..ae9e44a3d 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/GlobalNPCScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/GlobalNPCScriptPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.script; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/NPCScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/NPCScriptPacket.java index c2dc13165..7d5e0d3ed 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/NPCScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/NPCScriptPacket.java @@ -4,7 +4,11 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/PlayerScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/PlayerScriptPacket.java index 93b7cc387..242e7d092 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/PlayerScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/PlayerScriptPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.script; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/RecipeScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/RecipeScriptPacket.java index 32b90e93e..3627631eb 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/RecipeScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/RecipeScriptPacket.java @@ -4,7 +4,11 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; @@ -14,7 +18,6 @@ import noppes.npcs.CustomNpcsPermissions; import noppes.npcs.config.ConfigDebug; import noppes.npcs.config.ConfigScript; import noppes.npcs.controllers.RecipeController; -import noppes.npcs.controllers.data.IScriptHandler; import noppes.npcs.controllers.data.RecipeAnvil; import noppes.npcs.controllers.data.RecipeCarpentry; import noppes.npcs.controllers.data.RecipeScript; @@ -31,7 +34,8 @@ public final class RecipeScriptPacket extends AbstractPacket { private int maxSize; private NBTTagCompound compound; - public RecipeScriptPacket() {} + public RecipeScriptPacket() { + } public RecipeScriptPacket(Action type, boolean anvil, int id, int tab, int maxSize, NBTTagCompound compound) { this.type = type; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/ScriptInfoPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/ScriptInfoPacket.java index 337522882..d0f7089c9 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/ScriptInfoPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/ScriptInfoPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.script; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/item/LinkedItemScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/item/LinkedItemScriptPacket.java index 8b5ec164f..c62a36553 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/item/LinkedItemScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/item/LinkedItemScriptPacket.java @@ -4,7 +4,11 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java b/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java index ffce538ef..f2fd8bf44 100644 --- a/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java +++ b/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java @@ -10,7 +10,11 @@ import noppes.npcs.controllers.data.MagicEntry; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityNPCInterface; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Random; +import java.util.Set; import static kamkeel.npcs.controllers.AttributeController.getTracker; diff --git a/src/main/java/kamkeel/npcs/util/AttributeItemUtil.java b/src/main/java/kamkeel/npcs/util/AttributeItemUtil.java index f896c39c7..9cc361b5d 100644 --- a/src/main/java/kamkeel/npcs/util/AttributeItemUtil.java +++ b/src/main/java/kamkeel/npcs/util/AttributeItemUtil.java @@ -19,7 +19,12 @@ import noppes.npcs.controllers.MagicController; import noppes.npcs.controllers.data.Magic; import org.lwjgl.input.Keyboard; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.regex.Pattern; /** diff --git a/src/main/java/nikedemos/markovnames/Main.java b/src/main/java/nikedemos/markovnames/Main.java index 8fa76ec7b..25ab664e4 100644 --- a/src/main/java/nikedemos/markovnames/Main.java +++ b/src/main/java/nikedemos/markovnames/Main.java @@ -1,6 +1,14 @@ package nikedemos.markovnames; -import nikedemos.markovnames.generators.*; +import nikedemos.markovnames.generators.MarkovAncientGreek; +import nikedemos.markovnames.generators.MarkovAztec; +import nikedemos.markovnames.generators.MarkovGenerator; +import nikedemos.markovnames.generators.MarkovJapanese; +import nikedemos.markovnames.generators.MarkovOldNorse; +import nikedemos.markovnames.generators.MarkovRoman; +import nikedemos.markovnames.generators.MarkovSaami; +import nikedemos.markovnames.generators.MarkovSlavic; +import nikedemos.markovnames.generators.MarkovWelsh; import java.util.HashMap; import java.util.Iterator; diff --git a/src/main/java/noppes/npcs/AnimationMixinFunctions.java b/src/main/java/noppes/npcs/AnimationMixinFunctions.java index f5f01b2dc..4a6eb1db5 100644 --- a/src/main/java/noppes/npcs/AnimationMixinFunctions.java +++ b/src/main/java/noppes/npcs/AnimationMixinFunctions.java @@ -8,7 +8,11 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureUtil; import net.minecraft.entity.Entity; diff --git a/src/main/java/noppes/npcs/CommonProxy.java b/src/main/java/noppes/npcs/CommonProxy.java index e8e879dd3..58f931ab8 100644 --- a/src/main/java/noppes/npcs/CommonProxy.java +++ b/src/main/java/noppes/npcs/CommonProxy.java @@ -14,7 +14,28 @@ import net.minecraftforge.common.util.FakePlayer; import noppes.npcs.api.IWorld; import noppes.npcs.blocks.tiles.TileNpcContainer; import noppes.npcs.constants.EnumGuiType; -import noppes.npcs.containers.*; +import noppes.npcs.containers.ContainerAnvilRepair; +import noppes.npcs.containers.ContainerCarpentryBench; +import noppes.npcs.containers.ContainerCrate; +import noppes.npcs.containers.ContainerCustomGui; +import noppes.npcs.containers.ContainerMail; +import noppes.npcs.containers.ContainerManageBanks; +import noppes.npcs.containers.ContainerManageRecipes; +import noppes.npcs.containers.ContainerMerchantAdd; +import noppes.npcs.containers.ContainerNPCBankLarge; +import noppes.npcs.containers.ContainerNPCBankSmall; +import noppes.npcs.containers.ContainerNPCBankUnlock; +import noppes.npcs.containers.ContainerNPCBankUpgrade; +import noppes.npcs.containers.ContainerNPCCompanion; +import noppes.npcs.containers.ContainerNPCFollower; +import noppes.npcs.containers.ContainerNPCFollowerHire; +import noppes.npcs.containers.ContainerNPCFollowerSetup; +import noppes.npcs.containers.ContainerNPCInv; +import noppes.npcs.containers.ContainerNPCTrader; +import noppes.npcs.containers.ContainerNPCTraderSetup; +import noppes.npcs.containers.ContainerNpcItemGiver; +import noppes.npcs.containers.ContainerNpcQuestReward; +import noppes.npcs.containers.ContainerNpcQuestTypeItem; import noppes.npcs.controllers.data.AnimationData; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/CustomItems.java b/src/main/java/noppes/npcs/CustomItems.java index 1b1bfed67..e9e481fa9 100644 --- a/src/main/java/noppes/npcs/CustomItems.java +++ b/src/main/java/noppes/npcs/CustomItems.java @@ -7,17 +7,129 @@ import net.minecraft.dispenser.BehaviorDefaultDispenseItem; import net.minecraft.dispenser.IBlockSource; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.*; +import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; +import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemArmor.ArmorMaterial; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemFlintAndSteel; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.oredict.OreDictionary; -import noppes.npcs.blocks.*; -import noppes.npcs.blocks.tiles.*; +import noppes.npcs.blocks.BlockBanner; +import noppes.npcs.blocks.BlockBarrel; +import noppes.npcs.blocks.BlockBeam; +import noppes.npcs.blocks.BlockBigSign; +import noppes.npcs.blocks.BlockBlood; +import noppes.npcs.blocks.BlockBook; +import noppes.npcs.blocks.BlockBorder; +import noppes.npcs.blocks.BlockCampfire; +import noppes.npcs.blocks.BlockCandle; +import noppes.npcs.blocks.BlockCarpentryBench; +import noppes.npcs.blocks.BlockChair; +import noppes.npcs.blocks.BlockCouchWood; +import noppes.npcs.blocks.BlockCouchWool; +import noppes.npcs.blocks.BlockCrate; +import noppes.npcs.blocks.BlockCrystal; +import noppes.npcs.blocks.BlockLantern; +import noppes.npcs.blocks.BlockMailbox; +import noppes.npcs.blocks.BlockNpcRedstone; +import noppes.npcs.blocks.BlockPedestal; +import noppes.npcs.blocks.BlockPlaceholder; +import noppes.npcs.blocks.BlockScripted; +import noppes.npcs.blocks.BlockShelf; +import noppes.npcs.blocks.BlockShortLamp; +import noppes.npcs.blocks.BlockSign; +import noppes.npcs.blocks.BlockStool; +import noppes.npcs.blocks.BlockTable; +import noppes.npcs.blocks.BlockTallLamp; +import noppes.npcs.blocks.BlockTombstone; +import noppes.npcs.blocks.BlockWallBanner; +import noppes.npcs.blocks.BlockWaypoint; +import noppes.npcs.blocks.BlockWeaponRack; +import noppes.npcs.blocks.tiles.TileBanner; +import noppes.npcs.blocks.tiles.TileBarrel; +import noppes.npcs.blocks.tiles.TileBeam; +import noppes.npcs.blocks.tiles.TileBigSign; +import noppes.npcs.blocks.tiles.TileBlockAnvil; +import noppes.npcs.blocks.tiles.TileBook; +import noppes.npcs.blocks.tiles.TileBorder; +import noppes.npcs.blocks.tiles.TileCampfire; +import noppes.npcs.blocks.tiles.TileCandle; +import noppes.npcs.blocks.tiles.TileChair; +import noppes.npcs.blocks.tiles.TileCouchWood; +import noppes.npcs.blocks.tiles.TileCouchWool; +import noppes.npcs.blocks.tiles.TileCrate; +import noppes.npcs.blocks.tiles.TileLamp; +import noppes.npcs.blocks.tiles.TileMailbox; +import noppes.npcs.blocks.tiles.TilePedestal; +import noppes.npcs.blocks.tiles.TileRedstoneBlock; +import noppes.npcs.blocks.tiles.TileScripted; +import noppes.npcs.blocks.tiles.TileShelf; +import noppes.npcs.blocks.tiles.TileShortLamp; +import noppes.npcs.blocks.tiles.TileSign; +import noppes.npcs.blocks.tiles.TileStool; +import noppes.npcs.blocks.tiles.TileTable; +import noppes.npcs.blocks.tiles.TileTallLamp; +import noppes.npcs.blocks.tiles.TileTombstone; +import noppes.npcs.blocks.tiles.TileWallBanner; +import noppes.npcs.blocks.tiles.TileWaypoint; +import noppes.npcs.blocks.tiles.TileWeaponRack; import noppes.npcs.config.ConfigItem; import noppes.npcs.constants.EnumNpcToolMaterial; -import noppes.npcs.items.*; +import noppes.npcs.items.ItemBattleAxe; +import noppes.npcs.items.ItemBroadSword; +import noppes.npcs.items.ItemBullet; +import noppes.npcs.items.ItemClaw; +import noppes.npcs.items.ItemCrossbow; +import noppes.npcs.items.ItemDagger; +import noppes.npcs.items.ItemDaggerReversed; +import noppes.npcs.items.ItemElementalStaff; +import noppes.npcs.items.ItemExcalibur; +import noppes.npcs.items.ItemGlaive; +import noppes.npcs.items.ItemGun; +import noppes.npcs.items.ItemGunChainsaw; +import noppes.npcs.items.ItemKunai; +import noppes.npcs.items.ItemKunaiReversed; +import noppes.npcs.items.ItemLeafBlade; +import noppes.npcs.items.ItemLinked; +import noppes.npcs.items.ItemMachineGun; +import noppes.npcs.items.ItemMounter; +import noppes.npcs.items.ItemMusic; +import noppes.npcs.items.ItemMusicBanjo; +import noppes.npcs.items.ItemMusicClarinet; +import noppes.npcs.items.ItemMusicOracina; +import noppes.npcs.items.ItemMusicViolin; +import noppes.npcs.items.ItemMusket; +import noppes.npcs.items.ItemNpcArmor; +import noppes.npcs.items.ItemNpcArmorColorable; +import noppes.npcs.items.ItemNpcBlock; +import noppes.npcs.items.ItemNpcCloner; +import noppes.npcs.items.ItemNpcColored; +import noppes.npcs.items.ItemNpcInterface; +import noppes.npcs.items.ItemNpcMovingPath; +import noppes.npcs.items.ItemNpcScripter; +import noppes.npcs.items.ItemNpcTool; +import noppes.npcs.items.ItemNpcWand; +import noppes.npcs.items.ItemNpcWeaponInterface; +import noppes.npcs.items.ItemOrb; +import noppes.npcs.items.ItemPlaceholder; +import noppes.npcs.items.ItemRotatedShield; +import noppes.npcs.items.ItemScripted; +import noppes.npcs.items.ItemScythe; +import noppes.npcs.items.ItemShield; +import noppes.npcs.items.ItemSkirt; +import noppes.npcs.items.ItemSlingshot; +import noppes.npcs.items.ItemSoulstoneEmpty; +import noppes.npcs.items.ItemSoulstoneFilled; +import noppes.npcs.items.ItemSpear; +import noppes.npcs.items.ItemStaff; +import noppes.npcs.items.ItemTeleporter; +import noppes.npcs.items.ItemThrowingShuriken; +import noppes.npcs.items.ItemThrowingWeapon; +import noppes.npcs.items.ItemWand; +import noppes.npcs.items.ItemWarhammer; public class CustomItems { diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index ec85394fb..5c13d0c5f 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -4,7 +4,12 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerAboutToStartEvent; +import cpw.mods.fml.common.event.FMLServerStartedEvent; +import cpw.mods.fml.common.event.FMLServerStartingEvent; +import cpw.mods.fml.common.event.FMLServerStoppedEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.relauncher.Side; @@ -27,15 +32,68 @@ import net.minecraft.entity.EntityList; import net.minecraft.server.MinecraftServer; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.MinecraftForge; -import nikedemos.markovnames.generators.*; +import nikedemos.markovnames.generators.MarkovAncientGreek; +import nikedemos.markovnames.generators.MarkovAztec; +import nikedemos.markovnames.generators.MarkovCustomNPCsClassic; +import nikedemos.markovnames.generators.MarkovGenerator; +import nikedemos.markovnames.generators.MarkovJapanese; +import nikedemos.markovnames.generators.MarkovOldNorse; +import nikedemos.markovnames.generators.MarkovRoman; +import nikedemos.markovnames.generators.MarkovSaami; +import nikedemos.markovnames.generators.MarkovSlavic; +import nikedemos.markovnames.generators.MarkovSpanish; +import nikedemos.markovnames.generators.MarkovWelsh; import noppes.npcs.compat.PixelmonHelper; import noppes.npcs.config.ConfigMain; import noppes.npcs.config.LoadConfiguration; import noppes.npcs.config.legacy.LegacyConfig; -import noppes.npcs.controllers.*; +import noppes.npcs.controllers.AnimationController; +import noppes.npcs.controllers.BankController; +import noppes.npcs.controllers.ChunkController; +import noppes.npcs.controllers.CustomEffectController; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.FactionController; +import noppes.npcs.controllers.GlobalDataController; +import noppes.npcs.controllers.LinkedItemController; +import noppes.npcs.controllers.LinkedNpcController; +import noppes.npcs.controllers.MagicController; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.RecipeController; +import noppes.npcs.controllers.ScriptController; +import noppes.npcs.controllers.ServerCloneController; +import noppes.npcs.controllers.ServerTagMapController; +import noppes.npcs.controllers.SpawnController; +import noppes.npcs.controllers.TagController; +import noppes.npcs.controllers.TransportController; import noppes.npcs.enchants.EnchantInterface; -import noppes.npcs.entity.*; -import noppes.npcs.entity.old.*; +import noppes.npcs.entity.EntityChairMount; +import noppes.npcs.entity.EntityCustomNpc; +import noppes.npcs.entity.EntityMagicProjectile; +import noppes.npcs.entity.EntityNPCGolem; +import noppes.npcs.entity.EntityNpcCrystal; +import noppes.npcs.entity.EntityNpcDragon; +import noppes.npcs.entity.EntityNpcPony; +import noppes.npcs.entity.EntityNpcSlime; +import noppes.npcs.entity.EntityProjectile; +import noppes.npcs.entity.old.EntityNPCDwarfFemale; +import noppes.npcs.entity.old.EntityNPCDwarfMale; +import noppes.npcs.entity.old.EntityNPCElfFemale; +import noppes.npcs.entity.old.EntityNPCElfMale; +import noppes.npcs.entity.old.EntityNPCEnderman; +import noppes.npcs.entity.old.EntityNPCFurryFemale; +import noppes.npcs.entity.old.EntityNPCFurryMale; +import noppes.npcs.entity.old.EntityNPCHumanFemale; +import noppes.npcs.entity.old.EntityNPCHumanMale; +import noppes.npcs.entity.old.EntityNPCOrcFemale; +import noppes.npcs.entity.old.EntityNPCOrcMale; +import noppes.npcs.entity.old.EntityNPCVillager; +import noppes.npcs.entity.old.EntityNpcEnderchibi; +import noppes.npcs.entity.old.EntityNpcMonsterFemale; +import noppes.npcs.entity.old.EntityNpcMonsterMale; +import noppes.npcs.entity.old.EntityNpcNagaFemale; +import noppes.npcs.entity.old.EntityNpcNagaMale; +import noppes.npcs.entity.old.EntityNpcSkeleton; import noppes.npcs.scripted.NpcAPI; import java.io.File; diff --git a/src/main/java/noppes/npcs/DataAI.java b/src/main/java/noppes/npcs/DataAI.java index 386807a50..8d280e557 100644 --- a/src/main/java/noppes/npcs/DataAI.java +++ b/src/main/java/noppes/npcs/DataAI.java @@ -3,7 +3,11 @@ package noppes.npcs; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; -import noppes.npcs.constants.*; +import noppes.npcs.constants.EnumAnimation; +import noppes.npcs.constants.EnumCombatPolicy; +import noppes.npcs.constants.EnumMovingType; +import noppes.npcs.constants.EnumNavType; +import noppes.npcs.constants.EnumStandingType; import noppes.npcs.entity.EntityNPCInterface; import java.util.ArrayList; diff --git a/src/main/java/noppes/npcs/DataAdvanced.java b/src/main/java/noppes/npcs/DataAdvanced.java index cc0e67f2f..cc9e08614 100644 --- a/src/main/java/noppes/npcs/DataAdvanced.java +++ b/src/main/java/noppes/npcs/DataAdvanced.java @@ -10,7 +10,20 @@ 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 noppes.npcs.roles.JobBard; +import noppes.npcs.roles.JobChunkLoader; +import noppes.npcs.roles.JobConversation; +import noppes.npcs.roles.JobFollower; +import noppes.npcs.roles.JobGuard; +import noppes.npcs.roles.JobHealer; +import noppes.npcs.roles.JobItemGiver; +import noppes.npcs.roles.JobSpawner; +import noppes.npcs.roles.RoleBank; +import noppes.npcs.roles.RoleCompanion; +import noppes.npcs.roles.RoleFollower; +import noppes.npcs.roles.RolePostman; +import noppes.npcs.roles.RoleTrader; +import noppes.npcs.roles.RoleTransporter; 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 09b45913d..c17649754 100644 --- a/src/main/java/noppes/npcs/DataDisplay.java +++ b/src/main/java/noppes/npcs/DataDisplay.java @@ -25,7 +25,11 @@ import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.entity.data.DataSkinOverlays; import noppes.npcs.util.ValueUtil; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Objects; +import java.util.Random; +import java.util.UUID; public class DataDisplay { public EntityNPCInterface npc; diff --git a/src/main/java/noppes/npcs/EventHooks.java b/src/main/java/noppes/npcs/EventHooks.java index eb54cff84..7a18879ab 100644 --- a/src/main/java/noppes/npcs/EventHooks.java +++ b/src/main/java/noppes/npcs/EventHooks.java @@ -1,6 +1,7 @@ package noppes.npcs; import cpw.mods.fml.common.eventhandler.Event; +import kamkeel.npcs.network.packets.data.AchievementPacket; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -15,11 +16,19 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.event.entity.EntityEvent; import net.minecraftforge.event.world.WorldEvent; import noppes.npcs.api.IWorld; -import noppes.npcs.api.entity.*; +import noppes.npcs.api.entity.IAnimatable; +import noppes.npcs.api.entity.ICustomNpc; +import noppes.npcs.api.entity.IEntity; +import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.api.entity.IProjectile; import noppes.npcs.api.event.IAnimationEvent; import noppes.npcs.api.gui.ICustomGui; import noppes.npcs.api.gui.IItemSlot; -import noppes.npcs.api.handler.data.*; +import noppes.npcs.api.handler.data.IAnimation; +import noppes.npcs.api.handler.data.IAnvilRecipe; +import noppes.npcs.api.handler.data.IFrame; +import noppes.npcs.api.handler.data.IPlayerEffect; +import noppes.npcs.api.handler.data.IProfile; import noppes.npcs.api.item.IItemCustomizable; import noppes.npcs.api.item.IItemLinked; import noppes.npcs.api.item.IItemStack; @@ -27,16 +36,45 @@ import noppes.npcs.constants.EnumScriptType; import noppes.npcs.controllers.CustomGuiController; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.EffectScript; +import noppes.npcs.controllers.data.ForgeDataScript; +import noppes.npcs.controllers.data.INpcScriptHandler; +import noppes.npcs.controllers.data.IScriptBlockHandler; +import noppes.npcs.controllers.data.IScriptHandler; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerDataScript; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.RecipeScript; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.entity.EntityProjectile; import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.event.*; -import noppes.npcs.scripted.event.player.*; -import noppes.npcs.scripted.event.player.PlayerEvent.*; +import noppes.npcs.scripted.event.AnimationEvent; +import noppes.npcs.scripted.event.BlockEvent; +import noppes.npcs.scripted.event.CustomNPCsEvent; +import noppes.npcs.scripted.event.ForgeEvent; +import noppes.npcs.scripted.event.ItemEvent; +import noppes.npcs.scripted.event.LinkedItemEvent; +import noppes.npcs.scripted.event.NpcEvent; +import noppes.npcs.scripted.event.PartyEvent; +import noppes.npcs.scripted.event.ProjectileEvent; +import noppes.npcs.scripted.event.RecipeScriptEvent; +import noppes.npcs.scripted.event.player.CustomGuiEvent; +import noppes.npcs.scripted.event.player.DialogEvent; +import noppes.npcs.scripted.event.player.FactionEvent; +import noppes.npcs.scripted.event.player.PlayerEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.ChatEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.ContainerOpen; +import noppes.npcs.scripted.event.player.PlayerEvent.DamagedEntityEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.DropEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.EffectEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.KeyPressedEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.LoginEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.LogoutEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.PickUpEvent; +import noppes.npcs.scripted.event.player.QuestEvent; import noppes.npcs.scripted.item.ScriptItemStack; -import kamkeel.npcs.network.packets.data.AchievementPacket; -import noppes.npcs.NoppesUtilServer; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; diff --git a/src/main/java/noppes/npcs/LogWriter.java b/src/main/java/noppes/npcs/LogWriter.java index 2c14af3a6..4aa393b4a 100644 --- a/src/main/java/noppes/npcs/LogWriter.java +++ b/src/main/java/noppes/npcs/LogWriter.java @@ -3,13 +3,23 @@ package noppes.npcs; import noppes.npcs.config.ConfigDebug; import noppes.npcs.constants.EnumScriptType; -import java.io.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; import java.text.SimpleDateFormat; import java.util.Date; import java.util.UUID; import java.util.WeakHashMap; import java.util.concurrent.TimeUnit; -import java.util.logging.*; +import java.util.logging.ConsoleHandler; +import java.util.logging.Formatter; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.Logger; +import java.util.logging.StreamHandler; public class LogWriter { private final static String name = "CustomNPCs"; diff --git a/src/main/java/noppes/npcs/NBTTags.java b/src/main/java/noppes/npcs/NBTTags.java index d8771caf5..ebf30ab94 100644 --- a/src/main/java/noppes/npcs/NBTTags.java +++ b/src/main/java/noppes/npcs/NBTTags.java @@ -1,11 +1,23 @@ package noppes.npcs; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.*; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagDouble; +import net.minecraft.nbt.NBTTagInt; +import net.minecraft.nbt.NBTTagList; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.data.IScriptHandler; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.Vector; public class NBTTags { diff --git a/src/main/java/noppes/npcs/NPCSpawning.java b/src/main/java/noppes/npcs/NPCSpawning.java index 28b8c320c..ef143024c 100644 --- a/src/main/java/noppes/npcs/NPCSpawning.java +++ b/src/main/java/noppes/npcs/NPCSpawning.java @@ -26,7 +26,12 @@ import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.event.CustomNPCsEvent; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Random; +import java.util.Set; public class NPCSpawning { private static Set eligibleChunksForSpawning = Sets.newHashSet(); diff --git a/src/main/java/noppes/npcs/NoppesStringUtils.java b/src/main/java/noppes/npcs/NoppesStringUtils.java index f0e2a76f9..cd7031ef0 100644 --- a/src/main/java/noppes/npcs/NoppesStringUtils.java +++ b/src/main/java/noppes/npcs/NoppesStringUtils.java @@ -5,7 +5,12 @@ import net.minecraft.util.StatCollector; import noppes.npcs.entity.EntityNPCInterface; import java.awt.*; -import java.awt.datatransfer.*; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.ClipboardOwner; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.StringSelection; +import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.UnsupportedFlavorException; import java.io.IOException; import java.util.Arrays; diff --git a/src/main/java/noppes/npcs/NoppesUtilPlayer.java b/src/main/java/noppes/npcs/NoppesUtilPlayer.java index bbfda9523..2c9c3b647 100644 --- a/src/main/java/noppes/npcs/NoppesUtilPlayer.java +++ b/src/main/java/noppes/npcs/NoppesUtilPlayer.java @@ -3,7 +3,11 @@ package noppes.npcs; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumSoundOperation; -import kamkeel.npcs.network.packets.data.*; +import kamkeel.npcs.network.packets.data.DisableMouseInputPacket; +import kamkeel.npcs.network.packets.data.OverlayQuestTrackingPacket; +import kamkeel.npcs.network.packets.data.QuestCompletionPacket; +import kamkeel.npcs.network.packets.data.SoundManagementPacket; +import kamkeel.npcs.network.packets.data.SwingPlayerArmPacket; import kamkeel.npcs.network.packets.data.gui.GuiClosePacket; import kamkeel.npcs.network.packets.data.gui.IsGuiOpenPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; @@ -24,12 +28,37 @@ import net.minecraftforge.oredict.OreDictionary; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.handler.data.IQuestObjective; import noppes.npcs.api.item.IItemStack; -import noppes.npcs.constants.*; +import noppes.npcs.constants.EnumOptionType; +import noppes.npcs.constants.EnumPartyExchange; +import noppes.npcs.constants.EnumPartyObjectives; +import noppes.npcs.constants.EnumQuestCompletion; +import noppes.npcs.constants.EnumQuestType; +import noppes.npcs.constants.EnumRoleType; 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.controllers.BankController; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.PartyController; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.PlayerQuestController; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.TransportController; +import noppes.npcs.controllers.data.Bank; +import noppes.npcs.controllers.data.BankData; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.DialogOption; +import noppes.npcs.controllers.data.Line; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PartyOptions; +import noppes.npcs.controllers.data.PlayerBankData; +import noppes.npcs.controllers.data.PlayerData; +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.data.QuestData; +import noppes.npcs.controllers.data.TransportLocation; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleFollower; import noppes.npcs.scripted.NpcAPI; @@ -39,7 +68,11 @@ import noppes.npcs.scripted.event.player.DialogEvent; import noppes.npcs.scripted.event.player.QuestEvent; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class NoppesUtilPlayer { diff --git a/src/main/java/noppes/npcs/NoppesUtilServer.java b/src/main/java/noppes/npcs/NoppesUtilServer.java index f538d4afd..7d06d4e52 100644 --- a/src/main/java/noppes/npcs/NoppesUtilServer.java +++ b/src/main/java/noppes/npcs/NoppesUtilServer.java @@ -48,8 +48,45 @@ import noppes.npcs.constants.EnumRoleType; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.containers.ContainerManageBanks; import noppes.npcs.containers.ContainerManageRecipes; -import noppes.npcs.controllers.*; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.AnimationController; +import noppes.npcs.controllers.BankController; +import noppes.npcs.controllers.CustomEffectController; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.FactionController; +import noppes.npcs.controllers.LinkedItemController; +import noppes.npcs.controllers.MagicController; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.PlayerQuestController; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.RecipeController; +import noppes.npcs.controllers.ServerCloneController; +import noppes.npcs.controllers.TagController; +import noppes.npcs.controllers.TransportController; +import noppes.npcs.controllers.data.Animation; +import noppes.npcs.controllers.data.Bank; +import noppes.npcs.controllers.data.CustomEffect; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.DialogCategory; +import noppes.npcs.controllers.data.DialogOption; +import noppes.npcs.controllers.data.Faction; +import noppes.npcs.controllers.data.LinkedItem; +import noppes.npcs.controllers.data.Magic; +import noppes.npcs.controllers.data.MagicCycle; +import noppes.npcs.controllers.data.MagicData; +import noppes.npcs.controllers.data.PlayerBankData; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerDialogData; +import noppes.npcs.controllers.data.PlayerFactionData; +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.data.QuestData; +import noppes.npcs.controllers.data.RecipeAnvil; +import noppes.npcs.controllers.data.RecipeCarpentry; +import noppes.npcs.controllers.data.Tag; +import noppes.npcs.controllers.data.TransportCategory; +import noppes.npcs.controllers.data.TransportLocation; import noppes.npcs.entity.EntityDialogNpc; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleTransporter; @@ -60,7 +97,11 @@ import noppes.npcs.scripted.event.player.DialogEvent; import java.io.File; import java.io.IOException; import java.text.DecimalFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; import static kamkeel.npcs.network.packets.data.large.ScrollDataPacket.sendScrollData; diff --git a/src/main/java/noppes/npcs/ScriptItemEventHandler.java b/src/main/java/noppes/npcs/ScriptItemEventHandler.java index 7aa6b8a45..ea02d2556 100644 --- a/src/main/java/noppes/npcs/ScriptItemEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptItemEventHandler.java @@ -2,8 +2,6 @@ package noppes.npcs; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; -import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.request.item.ColorBrushPacket; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -15,7 +13,11 @@ import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.event.entity.item.ItemTossEvent; import net.minecraftforge.event.entity.living.LivingEvent; -import net.minecraftforge.event.entity.player.*; +import net.minecraftforge.event.entity.player.AnvilRepairEvent; +import net.minecraftforge.event.entity.player.EntityInteractEvent; +import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.event.entity.player.PlayerUseItemEvent; import noppes.npcs.api.IWorld; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.item.IItemCustomizable; diff --git a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java index ccd8c1cfa..cb445bb7f 100644 --- a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java @@ -20,20 +20,41 @@ import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.EntityStruckByLightningEvent; import net.minecraftforge.event.entity.PlaySoundAtEntityEvent; import net.minecraftforge.event.entity.item.ItemTossEvent; -import net.minecraftforge.event.entity.living.*; -import net.minecraftforge.event.entity.player.*; +import net.minecraftforge.event.entity.living.LivingAttackEvent; +import net.minecraftforge.event.entity.living.LivingDeathEvent; +import net.minecraftforge.event.entity.living.LivingEvent; +import net.minecraftforge.event.entity.living.LivingFallEvent; +import net.minecraftforge.event.entity.living.LivingHurtEvent; +import net.minecraftforge.event.entity.player.AchievementEvent; +import net.minecraftforge.event.entity.player.ArrowLooseEvent; +import net.minecraftforge.event.entity.player.ArrowNockEvent; +import net.minecraftforge.event.entity.player.BonemealEvent; +import net.minecraftforge.event.entity.player.EntityInteractEvent; +import net.minecraftforge.event.entity.player.FillBucketEvent; +import net.minecraftforge.event.entity.player.PlayerDropsEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.event.entity.player.PlayerOpenContainerEvent; +import net.minecraftforge.event.entity.player.PlayerPickupXpEvent; +import net.minecraftforge.event.entity.player.PlayerSleepInBedEvent; +import net.minecraftforge.event.entity.player.PlayerUseItemEvent; +import net.minecraftforge.event.entity.player.PlayerWakeUpEvent; +import net.minecraftforge.event.entity.player.UseHoeEvent; import net.minecraftforge.event.world.BlockEvent; import noppes.npcs.api.IWorld; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.item.IItemCustomizable; import noppes.npcs.config.ConfigMain; +import noppes.npcs.config.ConfigScript; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.controllers.CustomEffectController; import noppes.npcs.controllers.PartyController; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.ScriptController; -import noppes.npcs.config.ConfigScript; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerDataScript; +import noppes.npcs.controllers.data.PlayerQuestData; +import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.items.ItemNpcTool; import noppes.npcs.quests.QuestItem; @@ -142,7 +163,7 @@ public class ScriptPlayerEventHandler { if (event.entityPlayer == null || event.entityPlayer.worldObj == null || event.entityPlayer.worldObj.isRemote || !(event.entityPlayer instanceof EntityPlayerMP)) return; - if(event.action == PlayerInteractEvent.Action.LEFT_CLICK_BLOCK) + if (event.action == PlayerInteractEvent.Action.LEFT_CLICK_BLOCK) return; IPlayer ip = NoppesUtilServer.getIPlayer(event.entityPlayer); @@ -152,14 +173,14 @@ public class ScriptPlayerEventHandler { return; } - if (event.action == PlayerInteractEvent.Action.RIGHT_CLICK_AIR){ + if (event.action == PlayerInteractEvent.Action.RIGHT_CLICK_AIR) { if (pd.hadInteract) { pd.hadInteract = false; return; } noppes.npcs.scripted.event.player.PlayerEvent.RightClickEvent rightClickEvent = new noppes.npcs.scripted.event.player.PlayerEvent.RightClickEvent(ip, 0, null); event.setCanceled(EventHooks.onPlayerRightClick(handler, rightClickEvent)); - } else if (event.action == PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK){ + } else if (event.action == PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) { pd.hadInteract = true; IWorld iw = (IWorld) NpcAPI.Instance().getIWorld(event.world); Object blockCtx = NpcAPI.Instance().getIBlock(iw, event.x, event.y, event.z); diff --git a/src/main/java/noppes/npcs/ServerEventsHandler.java b/src/main/java/noppes/npcs/ServerEventsHandler.java index c5b92db0a..acc72a56c 100644 --- a/src/main/java/noppes/npcs/ServerEventsHandler.java +++ b/src/main/java/noppes/npcs/ServerEventsHandler.java @@ -48,7 +48,15 @@ import noppes.npcs.constants.EnumQuestType; import noppes.npcs.constants.EnumRoleType; import noppes.npcs.controllers.PartyController; import noppes.npcs.controllers.ServerCloneController; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.Animation; +import noppes.npcs.controllers.data.AnimationData; +import noppes.npcs.controllers.data.Line; +import noppes.npcs.controllers.data.MarkData; +import noppes.npcs.controllers.data.Party; +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.entity.EntityNPCInterface; import noppes.npcs.items.ItemExcalibur; import noppes.npcs.items.ItemShield; diff --git a/src/main/java/noppes/npcs/ServerTickHandler.java b/src/main/java/noppes/npcs/ServerTickHandler.java index 2cb6d4e6d..98d3ebda0 100644 --- a/src/main/java/noppes/npcs/ServerTickHandler.java +++ b/src/main/java/noppes/npcs/ServerTickHandler.java @@ -21,7 +21,7 @@ public class ServerTickHandler { @SubscribeEvent public void onServerTick(TickEvent.ServerTickEvent event) { if (event.phase == Phase.END) { - ActionManager.GLOBAL.tick(); + ActionManager.GLOBAL.tick(); } } diff --git a/src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java b/src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java index 090986165..ebe00c28e 100644 --- a/src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java +++ b/src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java @@ -2,7 +2,12 @@ package noppes.npcs.ai.pathfinder; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockDoor; +import net.minecraft.block.BlockFence; +import net.minecraft.block.BlockFenceGate; +import net.minecraft.block.BlockRailBase; +import net.minecraft.block.BlockWall; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; diff --git a/src/main/java/noppes/npcs/blocks/BlockWallBanner.java b/src/main/java/noppes/npcs/blocks/BlockWallBanner.java index 3e4aeec6e..82d4b44fc 100644 --- a/src/main/java/noppes/npcs/blocks/BlockWallBanner.java +++ b/src/main/java/noppes/npcs/blocks/BlockWallBanner.java @@ -14,7 +14,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import noppes.npcs.NoppesUtilServer; import noppes.npcs.blocks.tiles.TileColorable; diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileScripted.java b/src/main/java/noppes/npcs/blocks/tiles/TileScripted.java index ce535cc2d..8babf8936 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileScripted.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileScripted.java @@ -16,7 +16,11 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; -import noppes.npcs.*; +import noppes.npcs.CustomItems; +import noppes.npcs.EventHooks; +import noppes.npcs.NBTTags; +import noppes.npcs.NoppesUtilPlayer; +import noppes.npcs.TextBlock; import noppes.npcs.api.IBlock; import noppes.npcs.api.block.ITextPlane; import noppes.npcs.client.renderer.blocks.BlockScriptedRenderer; @@ -28,8 +32,12 @@ import noppes.npcs.entity.data.DataTimers; import noppes.npcs.scripted.BlockScriptedWrapper; import noppes.npcs.util.ValueUtil; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.TreeMap; public class TileScripted extends TileEntity implements IScriptBlockHandler { public List scripts = new ArrayList<>(); diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileVariant.java b/src/main/java/noppes/npcs/blocks/tiles/TileVariant.java index f893a4d05..1a9e26e4f 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileVariant.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileVariant.java @@ -7,7 +7,6 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.Facing; import static noppes.npcs.items.ItemNpcTool.BRUSH_COLOR_TAG; diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java b/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java index 20f2326ff..b4f635d02 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java @@ -8,7 +8,11 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.StatCollector; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.controllers.PartyController; -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.Quest; +import noppes.npcs.controllers.data.QuestData; import noppes.npcs.quests.QuestLocation; import java.util.ArrayList; diff --git a/src/main/java/noppes/npcs/client/AssetsBrowser.java b/src/main/java/noppes/npcs/client/AssetsBrowser.java index 1fc83c868..92ce5b5de 100644 --- a/src/main/java/noppes/npcs/client/AssetsBrowser.java +++ b/src/main/java/noppes/npcs/client/AssetsBrowser.java @@ -4,7 +4,13 @@ import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.ObfuscationReflectionHelper; import net.minecraft.client.Minecraft; -import net.minecraft.client.resources.*; +import net.minecraft.client.resources.AbstractResourcePack; +import net.minecraft.client.resources.FallbackResourceManager; +import net.minecraft.client.resources.IResourceManager; +import net.minecraft.client.resources.IResourcePack; +import net.minecraft.client.resources.NPCResourceHelper; +import net.minecraft.client.resources.ResourcePackRepository; +import net.minecraft.client.resources.SimpleReloadableResourceManager; import org.apache.commons.lang3.StringUtils; import java.io.File; diff --git a/src/main/java/noppes/npcs/client/ClientEventHandler.java b/src/main/java/noppes/npcs/client/ClientEventHandler.java index 1d24d2692..deb374ab2 100644 --- a/src/main/java/noppes/npcs/client/ClientEventHandler.java +++ b/src/main/java/noppes/npcs/client/ClientEventHandler.java @@ -14,7 +14,11 @@ import net.minecraft.client.renderer.entity.RendererLivingEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.*; +import net.minecraftforge.client.event.MouseEvent; +import net.minecraftforge.client.event.RenderGameOverlayEvent; +import net.minecraftforge.client.event.RenderHandEvent; +import net.minecraftforge.client.event.RenderLivingEvent; +import net.minecraftforge.client.event.RenderPlayerEvent; import noppes.npcs.client.gui.customoverlay.OverlayCustom; import noppes.npcs.client.gui.hud.ClientHudManager; import noppes.npcs.client.gui.hud.CompassHudComponent; @@ -30,7 +34,12 @@ import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityNPCInterface; import java.lang.reflect.Field; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; public class ClientEventHandler { public static final RenderCNPCPlayer renderCNPCSelf = new RenderCNPCPlayer(); diff --git a/src/main/java/noppes/npcs/client/ClientProxy.java b/src/main/java/noppes/npcs/client/ClientProxy.java index f93153c48..9f8694663 100644 --- a/src/main/java/noppes/npcs/client/ClientProxy.java +++ b/src/main/java/noppes/npcs/client/ClientProxy.java @@ -34,41 +34,176 @@ import noppes.npcs.CustomItems; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.api.IWorld; -import noppes.npcs.blocks.tiles.*; -import noppes.npcs.client.controllers.*; +import noppes.npcs.blocks.tiles.TileBanner; +import noppes.npcs.blocks.tiles.TileBarrel; +import noppes.npcs.blocks.tiles.TileBeam; +import noppes.npcs.blocks.tiles.TileBigSign; +import noppes.npcs.blocks.tiles.TileBlockAnvil; +import noppes.npcs.blocks.tiles.TileBook; +import noppes.npcs.blocks.tiles.TileCampfire; +import noppes.npcs.blocks.tiles.TileCandle; +import noppes.npcs.blocks.tiles.TileChair; +import noppes.npcs.blocks.tiles.TileCouchWood; +import noppes.npcs.blocks.tiles.TileCouchWool; +import noppes.npcs.blocks.tiles.TileCrate; +import noppes.npcs.blocks.tiles.TileLamp; +import noppes.npcs.blocks.tiles.TileMailbox; +import noppes.npcs.blocks.tiles.TilePedestal; +import noppes.npcs.blocks.tiles.TileScripted; +import noppes.npcs.blocks.tiles.TileShelf; +import noppes.npcs.blocks.tiles.TileShortLamp; +import noppes.npcs.blocks.tiles.TileSign; +import noppes.npcs.blocks.tiles.TileStool; +import noppes.npcs.blocks.tiles.TileTable; +import noppes.npcs.blocks.tiles.TileTallLamp; +import noppes.npcs.blocks.tiles.TileTombstone; +import noppes.npcs.blocks.tiles.TileWallBanner; +import noppes.npcs.blocks.tiles.TileWeaponRack; +import noppes.npcs.client.controllers.ClientCloneController; +import noppes.npcs.client.controllers.ClientTagMapController; +import noppes.npcs.client.controllers.MusicController; +import noppes.npcs.client.controllers.PresetController; +import noppes.npcs.client.controllers.ScriptSoundController; import noppes.npcs.client.fx.EntityBigSmokeFX; import noppes.npcs.client.fx.EntityElementalStaffFX; import noppes.npcs.client.fx.EntityEnderFX; import noppes.npcs.client.fx.EntityRainbowFX; -import noppes.npcs.client.gui.*; +import noppes.npcs.client.gui.GuiBorderBlock; +import noppes.npcs.client.gui.GuiMerchantAdd; +import noppes.npcs.client.gui.GuiNpcDimension; +import noppes.npcs.client.gui.GuiNpcMobSpawner; +import noppes.npcs.client.gui.GuiNpcMobSpawnerMounter; +import noppes.npcs.client.gui.GuiNpcPather; +import noppes.npcs.client.gui.GuiNpcRedstoneBlock; +import noppes.npcs.client.gui.GuiNpcRemoteEditor; +import noppes.npcs.client.gui.GuiNpcWaypoint; +import noppes.npcs.client.gui.GuiScript; import noppes.npcs.client.gui.custom.GuiCustom; -import noppes.npcs.client.gui.global.*; +import noppes.npcs.client.gui.global.GuiNPCManageAnimations; +import noppes.npcs.client.gui.global.GuiNPCManageBanks; +import noppes.npcs.client.gui.global.GuiNPCManageDialogs; +import noppes.npcs.client.gui.global.GuiNPCManageEffects; +import noppes.npcs.client.gui.global.GuiNPCManageFactions; +import noppes.npcs.client.gui.global.GuiNPCManageLinked; +import noppes.npcs.client.gui.global.GuiNPCManageQuest; +import noppes.npcs.client.gui.global.GuiNPCManageTags; +import noppes.npcs.client.gui.global.GuiNPCManageTransporters; +import noppes.npcs.client.gui.global.GuiNpcManageMagic; +import noppes.npcs.client.gui.global.GuiNpcManageRecipes; +import noppes.npcs.client.gui.global.GuiNpcQuestReward; import noppes.npcs.client.gui.item.GuiNpcMagicBook; import noppes.npcs.client.gui.item.GuiNpcPaintbrush; -import noppes.npcs.client.gui.mainmenu.*; -import noppes.npcs.client.gui.player.*; +import noppes.npcs.client.gui.mainmenu.GuiNPCGlobalMainMenu; +import noppes.npcs.client.gui.mainmenu.GuiNPCInv; +import noppes.npcs.client.gui.mainmenu.GuiNpcAI; +import noppes.npcs.client.gui.mainmenu.GuiNpcAdvanced; +import noppes.npcs.client.gui.mainmenu.GuiNpcDisplay; +import noppes.npcs.client.gui.mainmenu.GuiNpcStats; +import noppes.npcs.client.gui.player.GuiBigSign; +import noppes.npcs.client.gui.player.GuiCrate; +import noppes.npcs.client.gui.player.GuiMailbox; +import noppes.npcs.client.gui.player.GuiMailmanWrite; +import noppes.npcs.client.gui.player.GuiNPCBankChest; +import noppes.npcs.client.gui.player.GuiNPCTrader; +import noppes.npcs.client.gui.player.GuiNpcAnvil; +import noppes.npcs.client.gui.player.GuiNpcCarpentryBench; +import noppes.npcs.client.gui.player.GuiNpcFollower; +import noppes.npcs.client.gui.player.GuiNpcFollowerHire; +import noppes.npcs.client.gui.player.GuiTransportSelection; import noppes.npcs.client.gui.player.companion.GuiNpcCompanionInv; import noppes.npcs.client.gui.player.companion.GuiNpcCompanionStats; import noppes.npcs.client.gui.player.companion.GuiNpcCompanionTalents; import noppes.npcs.client.gui.player.modern.BlurEventHandler; import noppes.npcs.client.gui.questtypes.GuiNpcQuestTypeItem; -import noppes.npcs.client.gui.roles.*; +import noppes.npcs.client.gui.roles.GuiNpcBankSetup; +import noppes.npcs.client.gui.roles.GuiNpcFollowerSetup; +import noppes.npcs.client.gui.roles.GuiNpcItemGiver; +import noppes.npcs.client.gui.roles.GuiNpcTraderSetup; +import noppes.npcs.client.gui.roles.GuiNpcTransporter; import noppes.npcs.client.gui.script.GuiScriptBlock; import noppes.npcs.client.gui.script.GuiScriptGlobal; import noppes.npcs.client.gui.script.GuiScriptItem; -import noppes.npcs.client.model.*; -import noppes.npcs.client.renderer.*; -import noppes.npcs.client.renderer.blocks.*; -import noppes.npcs.client.renderer.items.*; +import noppes.npcs.client.model.ModelNPCGolem; +import noppes.npcs.client.model.ModelNpcCrystal; +import noppes.npcs.client.model.ModelNpcDragon; +import noppes.npcs.client.model.ModelNpcSlime; +import noppes.npcs.client.model.ModelSkirtArmor; +import noppes.npcs.client.renderer.NpcItemRenderer; +import noppes.npcs.client.renderer.RenderCustomNpc; +import noppes.npcs.client.renderer.RenderNPCHumanMale; +import noppes.npcs.client.renderer.RenderNPCPony; +import noppes.npcs.client.renderer.RenderNpcCrystal; +import noppes.npcs.client.renderer.RenderNpcDragon; +import noppes.npcs.client.renderer.RenderNpcSlime; +import noppes.npcs.client.renderer.RenderProjectile; +import noppes.npcs.client.renderer.blocks.BlockBannerRenderer; +import noppes.npcs.client.renderer.blocks.BlockBarrelRenderer; +import noppes.npcs.client.renderer.blocks.BlockBeamRenderer; +import noppes.npcs.client.renderer.blocks.BlockBigSignRenderer; +import noppes.npcs.client.renderer.blocks.BlockBloodRenderer; +import noppes.npcs.client.renderer.blocks.BlockBookRenderer; +import noppes.npcs.client.renderer.blocks.BlockBorderRenderer; +import noppes.npcs.client.renderer.blocks.BlockCampfireRenderer; +import noppes.npcs.client.renderer.blocks.BlockCandleRenderer; +import noppes.npcs.client.renderer.blocks.BlockCarpentryBenchRenderer; +import noppes.npcs.client.renderer.blocks.BlockChairRenderer; +import noppes.npcs.client.renderer.blocks.BlockCouchWoodRenderer; +import noppes.npcs.client.renderer.blocks.BlockCouchWoolRenderer; +import noppes.npcs.client.renderer.blocks.BlockCrateRenderer; +import noppes.npcs.client.renderer.blocks.BlockLanternRenderer; +import noppes.npcs.client.renderer.blocks.BlockMailboxRenderer; +import noppes.npcs.client.renderer.blocks.BlockPedestalRenderer; +import noppes.npcs.client.renderer.blocks.BlockScriptedRenderer; +import noppes.npcs.client.renderer.blocks.BlockShelfRenderer; +import noppes.npcs.client.renderer.blocks.BlockShortLampRenderer; +import noppes.npcs.client.renderer.blocks.BlockSignRenderer; +import noppes.npcs.client.renderer.blocks.BlockStoolRenderer; +import noppes.npcs.client.renderer.blocks.BlockTableRenderer; +import noppes.npcs.client.renderer.blocks.BlockTallLampRenderer; +import noppes.npcs.client.renderer.blocks.BlockTombstoneRenderer; +import noppes.npcs.client.renderer.blocks.BlockWallBannerRenderer; +import noppes.npcs.client.renderer.blocks.BlockWeaponRackRenderer; +import noppes.npcs.client.renderer.items.ItemBannerRenderer; +import noppes.npcs.client.renderer.items.ItemBannerWallRenderer; +import noppes.npcs.client.renderer.items.ItemCouchWoolRenderer; +import noppes.npcs.client.renderer.items.ItemCustomRenderer; +import noppes.npcs.client.renderer.items.ItemShortLampRenderer; +import noppes.npcs.client.renderer.items.ItemTallLampRenderer; +import noppes.npcs.client.renderer.items.ItemToolRenderer; +import noppes.npcs.client.renderer.items.ScriptedBlockItemRenderer; import noppes.npcs.config.ConfigClient; import noppes.npcs.config.ConfigItem; import noppes.npcs.config.ConfigMain; import noppes.npcs.config.StringCache; import noppes.npcs.constants.EnumGuiType; -import noppes.npcs.containers.*; +import noppes.npcs.containers.ContainerAnvilRepair; +import noppes.npcs.containers.ContainerCarpentryBench; +import noppes.npcs.containers.ContainerCrate; +import noppes.npcs.containers.ContainerCustomGui; +import noppes.npcs.containers.ContainerMail; +import noppes.npcs.containers.ContainerManageBanks; +import noppes.npcs.containers.ContainerManageRecipes; +import noppes.npcs.containers.ContainerNPCBankInterface; +import noppes.npcs.containers.ContainerNPCCompanion; +import noppes.npcs.containers.ContainerNPCFollower; +import noppes.npcs.containers.ContainerNPCFollowerHire; +import noppes.npcs.containers.ContainerNPCFollowerSetup; +import noppes.npcs.containers.ContainerNPCInv; +import noppes.npcs.containers.ContainerNPCTrader; +import noppes.npcs.containers.ContainerNPCTraderSetup; +import noppes.npcs.containers.ContainerNpcItemGiver; +import noppes.npcs.containers.ContainerNpcQuestReward; +import noppes.npcs.containers.ContainerNpcQuestTypeItem; import noppes.npcs.controllers.data.AnimationData; import noppes.npcs.controllers.data.PlayerData; -import noppes.npcs.entity.*; +import noppes.npcs.entity.EntityCustomNpc; +import noppes.npcs.entity.EntityNPCGolem; +import noppes.npcs.entity.EntityNPCInterface; +import noppes.npcs.entity.EntityNpcCrystal; +import noppes.npcs.entity.EntityNpcDragon; +import noppes.npcs.entity.EntityNpcPony; +import noppes.npcs.entity.EntityNpcSlime; +import noppes.npcs.entity.EntityProjectile; import noppes.npcs.entity.data.ModelData; import noppes.npcs.entity.data.ModelPartData; import noppes.npcs.items.ItemLinked; diff --git a/src/main/java/noppes/npcs/client/ImageDownloadAlt.java b/src/main/java/noppes/npcs/client/ImageDownloadAlt.java index 611a43fe2..7d986948f 100644 --- a/src/main/java/noppes/npcs/client/ImageDownloadAlt.java +++ b/src/main/java/noppes/npcs/client/ImageDownloadAlt.java @@ -16,6 +16,7 @@ import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; diff --git a/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java b/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java index cf5549c70..cc2cc57a0 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java +++ b/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java @@ -6,7 +6,11 @@ import kamkeel.npcs.network.packets.request.TileEntitySavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.blocks.tiles.TileBorder; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface; +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; public class GuiBorderBlock extends GuiNPCInterface implements IGuiData { diff --git a/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java b/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java index 45b402e72..8b36ab4eb 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java @@ -5,7 +5,11 @@ import kamkeel.npcs.network.packets.request.faction.FactionsGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNPCStringSlot; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumScrollData; 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 e140434a0..95a1db653 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java @@ -6,7 +6,13 @@ import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.select.GuiSoundSelection; -import noppes.npcs.client.gui.util.*; +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.IGuiData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.Line; import noppes.npcs.controllers.data.Lines; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java b/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java index 309eca9b5..514f7df7a 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java @@ -7,7 +7,11 @@ import kamkeel.npcs.network.packets.request.npc.RemoteDeletePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumScrollData; import java.util.HashMap; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java index 8c07cb55a..b3670d9e8 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java @@ -1,7 +1,12 @@ package noppes.npcs.client.gui; import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.request.clone.*; +import kamkeel.npcs.network.packets.request.clone.CloneAllTagsPacket; +import kamkeel.npcs.network.packets.request.clone.CloneListPacket; +import kamkeel.npcs.network.packets.request.clone.CloneRemovePacket; +import kamkeel.npcs.network.packets.request.clone.CloneTagListPacket; +import kamkeel.npcs.network.packets.request.clone.MobSpawnerPacket; +import kamkeel.npcs.network.packets.request.clone.SpawnMobPacket; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.Entity; @@ -13,12 +18,25 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import noppes.npcs.client.controllers.ClientCloneController; import noppes.npcs.client.controllers.ClientTagMapController; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiCustomScrollCloner; +import noppes.npcs.client.gui.util.GuiMenuSideButton; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +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.controllers.data.Tag; import noppes.npcs.controllers.data.TagMap; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.UUID; public class GuiNpcMobSpawner extends GuiNPCInterface implements IGuiData { public static HashMap tags = new HashMap<>(); diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java index 3dc90d15f..d2895fc44 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java @@ -14,7 +14,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import noppes.npcs.client.controllers.ClientCloneController; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonBiDirectional; +import noppes.npcs.client.gui.util.GuiNPCInterface; +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.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.Tag; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java index 6b7ef382a..0afa7d867 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java @@ -13,7 +13,13 @@ import net.minecraft.nbt.NBTTagDouble; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; import noppes.npcs.client.controllers.ClientCloneController; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuSideButton; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; import java.lang.reflect.Modifier; import java.util.ArrayList; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java index c0b988e23..9c13af815 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java @@ -7,7 +7,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagDouble; import net.minecraft.nbt.NBTTagList; import noppes.npcs.client.controllers.ClientCloneController; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuSideButton; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.SubGuiInterface; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java b/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java index 2e92d8cce..757633c15 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java @@ -1,14 +1,26 @@ package noppes.npcs.client.gui; import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.request.npc.*; +import kamkeel.npcs.network.packets.request.npc.RemoteDeletePacket; +import kamkeel.npcs.network.packets.request.npc.RemoteFreezeGetPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteFreezePacket; +import kamkeel.npcs.network.packets.request.npc.RemoteGlobalMenuPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteMainMenuPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteNpcsGetPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteResetPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteTpToNpcPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; import net.minecraft.entity.Entity; import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface; +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.IScrollData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcSelectionInterface.java b/src/main/java/noppes/npcs/client/gui/GuiNpcSelectionInterface.java index aeb2346be..e47c18135 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcSelectionInterface.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcSelectionInterface.java @@ -5,7 +5,11 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.util.StatCollector; import noppes.npcs.client.AssetsBrowser; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +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.entity.EntityNPCInterface; import java.util.Collections; diff --git a/src/main/java/noppes/npcs/client/gui/GuiScript.java b/src/main/java/noppes/npcs/client/gui/GuiScript.java index 1786708e2..3cdde7e62 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiScript.java +++ b/src/main/java/noppes/npcs/client/gui/GuiScript.java @@ -12,13 +12,28 @@ import net.minecraft.util.StatCollector; import noppes.npcs.NoppesStringUtils; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.script.GuiNPCEventScripts; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextArea; +import noppes.npcs.client.gui.util.GuiScriptTextArea; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IJTextAreaListener; +import noppes.npcs.client.gui.util.ITextChangeListener; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; import noppes.npcs.controllers.data.DataScript; import noppes.npcs.entity.EntityNPCInterface; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCallback, ICustomScrollListener, IJTextAreaListener, ITextChangeListener { public boolean showScript = false; @@ -264,7 +279,7 @@ public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCall @Override public void save() { - if(loaded){ + if (loaded) { setScript(); NPCScriptPacket.Save(script.writeToNBT(new NBTTagCompound())); } diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiAnimationFrame.java b/src/main/java/noppes/npcs/client/gui/SubGuiAnimationFrame.java index f6b3e2b49..e5594bf52 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiAnimationFrame.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiAnimationFrame.java @@ -1,7 +1,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -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.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.Frame; public class SubGuiAnimationFrame extends SubGuiInterface implements ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java b/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java index 14f4e6e91..6621c109d 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java @@ -9,7 +9,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraft.util.StatCollector; -import noppes.npcs.client.gui.util.*; +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.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiClonerQuickTags.java b/src/main/java/noppes/npcs/client/gui/SubGuiClonerQuickTags.java index 996259b25..4344fb9ec 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiClonerQuickTags.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiClonerQuickTags.java @@ -2,10 +2,20 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.StatCollector; -import noppes.npcs.client.gui.util.*; +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.IScrollData; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.TreeSet; +import java.util.Vector; public class SubGuiClonerQuickTags extends SubGuiInterface implements IScrollData { public GuiNpcMobSpawnerAdd parent; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiCustomHitbox.java b/src/main/java/noppes/npcs/client/gui/SubGuiCustomHitbox.java index 09fc84fe1..e94817d91 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiCustomHitbox.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiCustomHitbox.java @@ -1,7 +1,12 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +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.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.HitboxData; public class SubGuiCustomHitbox extends SubGuiInterface implements ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiEffectGeneral.java b/src/main/java/noppes/npcs/client/gui/SubGuiEffectGeneral.java index dc57ed311..19903229b 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiEffectGeneral.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiEffectGeneral.java @@ -8,7 +8,13 @@ import net.minecraft.util.ResourceLocation; import noppes.npcs.client.ClientCacheHandler; import noppes.npcs.client.gui.global.GuiNPCManageEffects; import noppes.npcs.client.gui.script.GuiScriptEffect; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiScrollWindow; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.client.renderer.ImageData; import noppes.npcs.controllers.data.CustomEffect; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiMagic.java b/src/main/java/noppes/npcs/client/gui/SubGuiMagic.java index 5609d013d..96ea89d58 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiMagic.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiMagic.java @@ -5,7 +5,14 @@ import kamkeel.npcs.network.packets.request.magic.MagicSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.global.GuiNpcManageMagic; -import noppes.npcs.client.gui.util.*; +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.ICustomScrollListener; +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.EnumTextureType; import noppes.npcs.controllers.data.Magic; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiMagicCycle.java b/src/main/java/noppes/npcs/client/gui/SubGuiMagicCycle.java index ab975d3ae..b9c6ea4ca 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiMagicCycle.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiMagicCycle.java @@ -5,7 +5,14 @@ import kamkeel.npcs.network.packets.request.magic.MagicCycleSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.global.GuiNpcManageMagic; -import noppes.npcs.client.gui.util.*; +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.ICustomScrollListener; +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.EnumDiagramLayout; import noppes.npcs.controllers.data.MagicAssociation; import noppes.npcs.controllers.data.MagicCycle; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java b/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java index 849f0edad..deefee93d 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java @@ -7,7 +7,12 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.player.GuiMailmanWrite; import noppes.npcs.client.gui.select.GuiQuestSelection; -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.GuiSelectionListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.containers.ContainerMail; import noppes.npcs.controllers.data.PlayerMail; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java index 2d3cf7edf..ec1366bd2 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java @@ -4,7 +4,13 @@ import kamkeel.npcs.network.packets.request.faction.FactionGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.NoppesUtil; -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.GuiSelectionListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumAvailabilityFactionType; import noppes.npcs.constants.EnumDayTime; import noppes.npcs.controllers.data.Availability; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java index cee94a3f5..802ede067 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java @@ -4,7 +4,11 @@ import kamkeel.npcs.network.packets.request.dialog.DialogGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.select.GuiDialogSelection; -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.GuiSelectionListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumAvailabilityDialog; import noppes.npcs.controllers.data.Availability; import noppes.npcs.controllers.data.Dialog; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java index f4098c445..12d61550e 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java @@ -4,7 +4,11 @@ import kamkeel.npcs.network.packets.request.quest.QuestGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.select.GuiQuestSelection; -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.GuiSelectionListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumAvailabilityQuest; import noppes.npcs.controllers.data.Availability; import noppes.npcs.controllers.data.Quest; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java index 95c11fd27..c0189b4eb 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java @@ -9,7 +9,11 @@ import noppes.npcs.client.gui.util.GuiNpcLabel; import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.SpawnData; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; public class SubGuiNpcBiomes extends SubGuiInterface { private SpawnData data; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcCommand.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcCommand.java index 9b3c42572..1bba05cc9 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcCommand.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcCommand.java @@ -1,7 +1,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -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.client.gui.util.SubGuiInterface; public class SubGuiNpcCommand extends SubGuiInterface implements ITextfieldListener { public String command; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java index cff9e03f0..3e194f85f 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java @@ -10,7 +10,14 @@ import noppes.npcs.client.gui.global.GuiNPCManageDialogs; import noppes.npcs.client.gui.player.GuiDialogInteract; import noppes.npcs.client.gui.select.GuiQuestSelection; import noppes.npcs.client.gui.select.GuiSoundSelection; -import noppes.npcs.client.gui.util.*; +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.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.Dialog; 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 6a7accc98..3c0caa1bc 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java @@ -4,7 +4,14 @@ import kamkeel.npcs.network.packets.request.dialog.DialogGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.select.GuiDialogSelection; -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.GuiSelectionListener; +import noppes.npcs.client.gui.util.IGuiData; +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.EnumOptionType; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.DialogOption; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java index e58b90810..72481f133 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java @@ -5,7 +5,16 @@ import kamkeel.npcs.network.packets.request.dialog.DialogSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +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.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.config.ConfigMain; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.DialogColorData; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDimensions.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDimensions.java index 03f8301ab..106ae0557 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDimensions.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDimensions.java @@ -3,11 +3,19 @@ package noppes.npcs.client.gui; import kamkeel.npcs.network.PacketClient; import kamkeel.npcs.network.packets.request.DimensionsGetPacket; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +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.IScrollData; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.SpawnData; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.Vector; public class SubGuiNpcDimensions extends SubGuiInterface implements IScrollData { private final SpawnData data; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java index b2ece2a5d..d5d4ac392 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java @@ -4,7 +4,13 @@ import kamkeel.npcs.network.PacketClient; import kamkeel.npcs.network.packets.request.faction.FactionsGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.StatCollector; -import noppes.npcs.client.gui.util.*; +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.ICustomScrollListener; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.FactionOptions; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java index 074464d74..a4ce80c25 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.StatCollector; -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.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.Faction; public class SubGuiNpcFactionPoints extends SubGuiInterface implements ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcMeleeProperties.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcMeleeProperties.java index c9d451c1b..a128d3760 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcMeleeProperties.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcMeleeProperties.java @@ -2,7 +2,12 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.DataStats; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonBiDirectional; +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.EnumPotionType; public class SubGuiNpcMeleeProperties extends SubGuiInterface implements ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcMovement.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcMovement.java index 39c712771..e29b6f95f 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcMovement.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcMovement.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.DataAI; -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.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumAnimation; import noppes.npcs.constants.EnumMovingType; import noppes.npcs.constants.EnumStandingType; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcName.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcName.java index a31a4dea4..e98938c8f 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcName.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcName.java @@ -3,7 +3,12 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.DataDisplay; import noppes.npcs.client.gui.mainmenu.GuiNpcDisplay; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonBiDirectional; +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; public class SubGuiNpcName extends SubGuiInterface implements ITextfieldListener { private DataDisplay display; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcPartyOptions.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcPartyOptions.java index 3c9fbd653..10420a65d 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcPartyOptions.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcPartyOptions.java @@ -1,7 +1,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -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.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumPartyExchange; import noppes.npcs.constants.EnumPartyObjectives; import noppes.npcs.constants.EnumPartyRequirements; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcProjectiles.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcProjectiles.java index 669438ec0..8acb8fc8c 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcProjectiles.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcProjectiles.java @@ -2,7 +2,14 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.DataStats; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonBiDirectional; +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.GuiNpcTextField; +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.EnumParticleType; import noppes.npcs.constants.EnumPotionType; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcQuest.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcQuest.java index 5c56ce292..6406733be 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcQuest.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcQuest.java @@ -11,7 +11,14 @@ import noppes.npcs.client.gui.questtypes.GuiNpcQuestTypeKill; import noppes.npcs.client.gui.questtypes.GuiNpcQuestTypeLocation; import noppes.npcs.client.gui.questtypes.GuiNpcQuestTypeManual; import noppes.npcs.client.gui.select.GuiQuestSelection; -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.GuiSelectionListener; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; +import noppes.npcs.client.gui.util.SubGuiNpcCooldownPicker; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumQuestCompletion; import noppes.npcs.constants.EnumQuestRepeat; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java index 12d283e06..428e83016 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java @@ -3,7 +3,12 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.DataStats; import noppes.npcs.client.gui.select.GuiSoundSelection; -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.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; public class SubGuiNpcRangeProperties extends SubGuiInterface implements ITextfieldListener, ISubGuiListener { private DataStats stats; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java index ddcf0239b..41b725c12 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.Resistances; -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.GuiNpcSlider; +import noppes.npcs.client.gui.util.ISliderListener; +import noppes.npcs.client.gui.util.SubGuiInterface; public class SubGuiNpcResistanceProperties extends SubGuiInterface implements ISliderListener { private Resistances resistances; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRespawn.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRespawn.java index ea70f7cf2..0a0694779 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRespawn.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRespawn.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.DataStats; -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.client.gui.util.SubGuiInterface; public class SubGuiNpcRespawn extends SubGuiInterface implements ITextfieldListener { private DataStats stats; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcTint.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcTint.java index d40c3a0cb..1a3804c2b 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcTint.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcTint.java @@ -1,7 +1,13 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +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.GuiNpcTextField; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.TintData; public class SubGuiNpcTint extends SubGuiInterface implements ISubGuiListener, ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiPlayerData.java b/src/main/java/noppes/npcs/client/gui/SubGuiPlayerData.java index a91946b2a..0d39c0cd8 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiPlayerData.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiPlayerData.java @@ -8,13 +8,27 @@ import kamkeel.npcs.network.packets.request.playerdata.PlayerDataSaveInfoPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.CustomNpcResourceListener; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +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.GuiToggleButton; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IPlayerDataInfo; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumPlayerData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.MagicData; import org.lwjgl.opengl.GL11; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Vector; import static noppes.npcs.client.gui.player.inventory.GuiCNPCInventory.specialIcons; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiScriptParticle.java b/src/main/java/noppes/npcs/client/gui/SubGuiScriptParticle.java index 2cd7587e6..69c211358 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiScriptParticle.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiScriptParticle.java @@ -1,7 +1,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -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.client.gui.util.SubGuiInterface; import noppes.npcs.scripted.ScriptParticle; public class SubGuiScriptParticle extends SubGuiInterface implements ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiSpawningOptions.java b/src/main/java/noppes/npcs/client/gui/SubGuiSpawningOptions.java index 2fa94b219..c15f9162f 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiSpawningOptions.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiSpawningOptions.java @@ -1,7 +1,12 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +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.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.SpawnData; public class SubGuiSpawningOptions 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 f954e0129..ef837871b 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java @@ -5,7 +5,11 @@ import kamkeel.npcs.network.packets.request.linked.LinkedGetAllPacket; import kamkeel.npcs.network.packets.request.linked.LinkedSetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import noppes.npcs.client.gui.util.*; +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.ICustomScrollListener; +import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; 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 084c11e1a..0e2c31845 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java @@ -8,7 +8,11 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.select.GuiDialogSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.controllers.data.DialogOption; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCFactionSetup.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCFactionSetup.java index 8caecf0c7..e56f088be 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCFactionSetup.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCFactionSetup.java @@ -7,7 +7,12 @@ import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.SubGuiNpcFactionOptions; -import noppes.npcs.client.gui.util.*; +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.GuiNpcLabel; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMagic.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMagic.java index 86eb1fbb2..c235d75f5 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMagic.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMagic.java @@ -6,7 +6,15 @@ import kamkeel.npcs.network.packets.request.magic.MagicNpcGetPacket; import kamkeel.npcs.network.packets.request.magic.MagicNpcSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.client.gui.util.*; +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.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +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.ITextfieldListener; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.MagicData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMarks.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMarks.java index bc22bcde2..46cc27c47 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMarks.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMarks.java @@ -5,7 +5,11 @@ import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedMarkDataPac import net.minecraft.client.gui.GuiButton; import noppes.npcs.client.gui.SubGuiColorSelector; import noppes.npcs.client.gui.SubGuiNpcAvailability; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonBiDirectional; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.MarkType; import noppes.npcs.controllers.data.MarkData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCSoundsMenu.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCSoundsMenu.java index 44942ea4c..007c42ee7 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCSoundsMenu.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCSoundsMenu.java @@ -5,7 +5,13 @@ import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.select.GuiSoundSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +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.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.entity.EntityNPCInterface; public class GuiNPCSoundsMenu extends GuiNPCInterface2 implements ITextfieldListener, ISubGuiListener { diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCTagSetup.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCTagSetup.java index f32aeab39..dcd361e48 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCTagSetup.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCTagSetup.java @@ -9,7 +9,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraft.util.StatCollector; -import noppes.npcs.client.gui.util.*; +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.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java b/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java index de8304c75..599afebe8 100644 --- a/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java +++ b/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java @@ -25,7 +25,12 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import noppes.npcs.api.gui.ICustomGuiComponent; -import noppes.npcs.client.gui.custom.components.*; +import noppes.npcs.client.gui.custom.components.CustomGuiButton; +import noppes.npcs.client.gui.custom.components.CustomGuiLabel; +import noppes.npcs.client.gui.custom.components.CustomGuiLine; +import noppes.npcs.client.gui.custom.components.CustomGuiScrollComponent; +import noppes.npcs.client.gui.custom.components.CustomGuiTextField; +import noppes.npcs.client.gui.custom.components.CustomGuiTexturedRect; import noppes.npcs.client.gui.custom.interfaces.IClickListener; import noppes.npcs.client.gui.custom.interfaces.IDataHolder; import noppes.npcs.client.gui.custom.interfaces.IGuiComponent; @@ -33,13 +38,27 @@ import noppes.npcs.client.gui.util.GuiCustomScroll; import noppes.npcs.client.gui.util.ICustomScrollListener; import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.containers.ContainerCustomGui; -import noppes.npcs.scripted.gui.*; +import noppes.npcs.scripted.gui.ScriptGui; +import noppes.npcs.scripted.gui.ScriptGuiButton; +import noppes.npcs.scripted.gui.ScriptGuiComponent; +import noppes.npcs.scripted.gui.ScriptGuiLabel; +import noppes.npcs.scripted.gui.ScriptGuiLine; +import noppes.npcs.scripted.gui.ScriptGuiScroll; +import noppes.npcs.scripted.gui.ScriptGuiTextField; +import noppes.npcs.scripted.gui.ScriptGuiTexturedRect; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; public class GuiCustom extends GuiScreen implements ICustomScrollListener, IGuiData { ScriptGui gui; diff --git a/src/main/java/noppes/npcs/client/gui/customoverlay/OverlayCustom.java b/src/main/java/noppes/npcs/client/gui/customoverlay/OverlayCustom.java index aa36108c7..5940d134a 100644 --- a/src/main/java/noppes/npcs/client/gui/customoverlay/OverlayCustom.java +++ b/src/main/java/noppes/npcs/client/gui/customoverlay/OverlayCustom.java @@ -10,7 +10,11 @@ import noppes.npcs.client.gui.customoverlay.components.CustomOverlayLabel; import noppes.npcs.client.gui.customoverlay.components.CustomOverlayLine; import noppes.npcs.client.gui.customoverlay.components.CustomOverlayTexturedRect; import noppes.npcs.client.gui.customoverlay.interfaces.IOverlayComponent; -import noppes.npcs.scripted.overlay.*; +import noppes.npcs.scripted.overlay.ScriptOverlay; +import noppes.npcs.scripted.overlay.ScriptOverlayComponent; +import noppes.npcs.scripted.overlay.ScriptOverlayLabel; +import noppes.npcs.scripted.overlay.ScriptOverlayLine; +import noppes.npcs.scripted.overlay.ScriptOverlayTexturedRect; import org.lwjgl.opengl.GL11; import java.util.HashMap; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java index 4b5997b7f..eb7b84001 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java @@ -7,7 +7,16 @@ import net.minecraft.client.gui.GuiScreen; import noppes.npcs.client.gui.SubGuiAnimationFrame; import noppes.npcs.client.gui.SubGuiAnimationOptions; import noppes.npcs.client.gui.SubGuiColorSelector; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiModelInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcSlider; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiTexturedButton; +import noppes.npcs.client.gui.util.ISliderListener; +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.EnumAnimationPart; import noppes.npcs.controllers.data.Animation; import noppes.npcs.controllers.data.AnimationData; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java index 6ab69d319..7d1fa84be 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java @@ -11,7 +11,18 @@ import net.minecraft.client.gui.GuiYesNoCallback; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiModelInterface2; +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.GuiTexturedButton; +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.EnumScrollData; import noppes.npcs.controllers.data.Animation; import noppes.npcs.controllers.data.AnimationData; 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 ee3cf3f35..693ecbf0c 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java @@ -8,7 +8,14 @@ import kamkeel.npcs.network.packets.request.bank.BanksGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.CustomNpcResourceListener; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface2; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcTextField; +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.ITextfieldListener; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.containers.ContainerManageBanks; import noppes.npcs.controllers.data.Bank; 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 ba25d44aa..eb0ede5bf 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java @@ -1,7 +1,14 @@ package noppes.npcs.client.gui.global; import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.request.dialog.*; +import kamkeel.npcs.network.packets.request.dialog.DialogCategoriesGetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogCategoryGetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogCategoryRemovePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogCategorySavePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogGetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogRemovePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogSavePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogsGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; @@ -10,7 +17,16 @@ import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiEditText; import noppes.npcs.client.gui.SubGuiNpcDialog; -import noppes.npcs.client.gui.util.*; +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.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +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.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.DialogCategory; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageEffects.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageEffects.java index 68635ae45..a5f32da52 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageEffects.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageEffects.java @@ -16,7 +16,16 @@ import noppes.npcs.client.ClientCacheHandler; import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiEffectGeneral; -import noppes.npcs.client.gui.util.*; +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.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +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.SubGuiInterface; import noppes.npcs.client.renderer.ImageData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.CustomEffectController; 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 0a7789f1f..246e528f3 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java @@ -13,12 +13,26 @@ import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiColorSelector; import noppes.npcs.client.gui.SubGuiNpcFactionPoints; -import noppes.npcs.client.gui.util.*; +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.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +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.EnumScrollData; import noppes.npcs.controllers.data.Faction; import noppes.npcs.entity.EntityNPCInterface; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Vector; public class GuiNPCManageFactions extends GuiNPCInterface2 implements IScrollData, ICustomScrollListener, ITextfieldListener, IGuiData, ISubGuiListener, GuiYesNoCallback { private GuiCustomScroll scrollFactions; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinked.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinked.java index 5d7434794..e07d2583c 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinked.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinked.java @@ -1,7 +1,13 @@ package noppes.npcs.client.gui.global; import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.request.linked.*; +import kamkeel.npcs.network.packets.request.linked.LinkedGetAllPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedGetPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedItemBuildPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedItemRemovePacket; +import kamkeel.npcs.network.packets.request.linked.LinkedItemSavePacket; +import kamkeel.npcs.network.packets.request.linked.LinkedNPCAddPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedNPCRemovePacket; import kamkeel.npcs.util.ColorUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; @@ -20,7 +26,15 @@ import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiEditText; import noppes.npcs.client.gui.item.SubGuiLinkedItem; -import noppes.npcs.client.gui.util.*; +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.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.SubGuiInterface; import noppes.npcs.client.renderer.ImageData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.LinkedItem; 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 5a18fab75..f3d1679f2 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java @@ -1,7 +1,14 @@ package noppes.npcs.client.gui.global; import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.request.quest.*; +import kamkeel.npcs.network.packets.request.quest.QuestCategoriesGetPacket; +import kamkeel.npcs.network.packets.request.quest.QuestCategoryGetPacket; +import kamkeel.npcs.network.packets.request.quest.QuestCategoryRemovePacket; +import kamkeel.npcs.network.packets.request.quest.QuestCategorySavePacket; +import kamkeel.npcs.network.packets.request.quest.QuestGetPacket; +import kamkeel.npcs.network.packets.request.quest.QuestRemovePacket; +import kamkeel.npcs.network.packets.request.quest.QuestSavePacket; +import kamkeel.npcs.network.packets.request.quest.QuestsGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiYesNo; @@ -11,7 +18,16 @@ import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiEditText; import noppes.npcs.client.gui.SubGuiNpcQuest; -import noppes.npcs.client.gui.util.*; +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.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +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.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Quest; import noppes.npcs.controllers.data.QuestCategory; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTags.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTags.java index ec84783d2..0872c3cb5 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTags.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTags.java @@ -8,7 +8,17 @@ import kamkeel.npcs.network.packets.request.tags.TagsGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.SubGuiColorSelector; -import noppes.npcs.client.gui.util.*; +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.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +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.EnumScrollData; import noppes.npcs.controllers.data.Tag; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageMagic.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageMagic.java index fbdc8be21..76036717e 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageMagic.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageMagic.java @@ -1,13 +1,28 @@ package noppes.npcs.client.gui.global; import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.request.magic.*; +import kamkeel.npcs.network.packets.request.magic.MagicCycleRemovePacket; +import kamkeel.npcs.network.packets.request.magic.MagicCycleSavePacket; +import kamkeel.npcs.network.packets.request.magic.MagicGetAllPacket; +import kamkeel.npcs.network.packets.request.magic.MagicGetPacket; +import kamkeel.npcs.network.packets.request.magic.MagicRemovePacket; +import kamkeel.npcs.network.packets.request.magic.MagicSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.SubGuiMagic; import noppes.npcs.client.gui.SubGuiMagicCycle; import noppes.npcs.client.gui.SubGuiMagicCycleViewer; -import noppes.npcs.client.gui.util.*; +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.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiToggleButton; +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.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Magic; import noppes.npcs.controllers.data.MagicCycle; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java index a30838249..58b50de0a 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java @@ -9,7 +9,15 @@ import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; import net.minecraft.util.StatCollector; import noppes.npcs.client.gui.SubGuiPlayerData; -import noppes.npcs.client.gui.util.*; +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.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumPlayerData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; @@ -115,7 +123,7 @@ public class GuiNpcManagePlayerData extends GuiNPCInterface2 implements GuiYesNo public void confirmClicked(boolean confirm, int id) { if (confirm) { if (id == 0) { - if(selectedPlayer != null && !selectedPlayer.isEmpty()){ + if (selectedPlayer != null && !selectedPlayer.isEmpty()) { PacketClient.sendClient(new PlayerDataRemovePacket(EnumPlayerData.Players, selectedPlayer)); playerData.remove(selectedPlayer); selectedPlayer = null; 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 57b3255c5..dacdccc33 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java @@ -13,7 +13,19 @@ import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiNpcAvailability; import noppes.npcs.client.gui.script.GuiScriptRecipe; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonBiDirectional; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface2; +import noppes.npcs.client.gui.util.GuiCustomScroll; +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.GuiNpcTextField; +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.EnumGuiType; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.containers.ContainerManageRecipes; 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 aba615c0e..a5ebd6e1f 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java @@ -12,12 +12,28 @@ import noppes.npcs.client.gui.GuiNpcMobSpawnerSelector; import noppes.npcs.client.gui.SubGuiNpcBiomes; import noppes.npcs.client.gui.SubGuiNpcDimensions; import noppes.npcs.client.gui.SubGuiSpawningOptions; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiHoverText; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcSlider; +import noppes.npcs.client.gui.util.GuiNpcTextField; +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.ISliderListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.SpawnData; import noppes.npcs.entity.EntityNPCInterface; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Set; +import java.util.Vector; public class GuiNpcNaturalSpawns extends GuiNPCInterface2 implements IGuiData, IScrollData, ITextfieldListener, ICustomScrollListener, ISliderListener { private GuiCustomScroll scrollNaturalSpawns; 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 6692f5b98..28a06c515 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcQuestReward.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcQuestReward.java @@ -3,7 +3,11 @@ package noppes.npcs.client.gui.global; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface; +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.containers.ContainerNpcQuestReward; import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/item/GuiNpcMagicBook.java b/src/main/java/noppes/npcs/client/gui/item/GuiNpcMagicBook.java index 7a4f0467a..3348f059f 100644 --- a/src/main/java/noppes/npcs/client/gui/item/GuiNpcMagicBook.java +++ b/src/main/java/noppes/npcs/client/gui/item/GuiNpcMagicBook.java @@ -5,7 +5,12 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.gui.GuiMagicCycleMap; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.MagicCycle; diff --git a/src/main/java/noppes/npcs/client/gui/item/SubGuiLinkedItem.java b/src/main/java/noppes/npcs/client/gui/item/SubGuiLinkedItem.java index dd0dc1c64..9bf537a69 100644 --- a/src/main/java/noppes/npcs/client/gui/item/SubGuiLinkedItem.java +++ b/src/main/java/noppes/npcs/client/gui/item/SubGuiLinkedItem.java @@ -13,7 +13,16 @@ import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.gui.SubGuiColorSelector; import noppes.npcs.client.gui.global.GuiNPCManageLinked; import noppes.npcs.client.gui.script.GuiScriptLinkedItem; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonBiDirectional; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +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.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiScrollWindow; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.client.renderer.ImageData; import noppes.npcs.controllers.data.LinkedItem; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCGlobalMainMenu.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCGlobalMainMenu.java index 0364abe21..8295618dd 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCGlobalMainMenu.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCGlobalMainMenu.java @@ -11,7 +11,12 @@ import noppes.npcs.client.gui.util.GuiNpcSquareButton; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.entity.EntityNPCInterface; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static noppes.npcs.client.gui.player.inventory.GuiCNPCInventory.specialIcons; diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCInv.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCInv.java index 6c3669814..275eea6ff 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCInv.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCInv.java @@ -10,7 +10,12 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.inventory.Slot; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface2; +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.ITextfieldListener; import noppes.npcs.containers.ContainerNPCInv; import noppes.npcs.entity.EntityNPCInterface; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAI.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAI.java index 895866a55..538d58b59 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAI.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAI.java @@ -7,7 +7,12 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.DataAI; import noppes.npcs.client.gui.SubGuiNpcMovement; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +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.ITextfieldListener; import noppes.npcs.constants.EnumCombatPolicy; import noppes.npcs.constants.EnumNavType; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java index 2d8466d1c..d7b5ac919 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java @@ -9,8 +9,23 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NoppesStringUtils; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.advanced.*; -import noppes.npcs.client.gui.roles.*; +import noppes.npcs.client.gui.advanced.GuiNPCAdvancedLinkedNpc; +import noppes.npcs.client.gui.advanced.GuiNPCDialogNpcOptions; +import noppes.npcs.client.gui.advanced.GuiNPCFactionSetup; +import noppes.npcs.client.gui.advanced.GuiNPCLinesMenu; +import noppes.npcs.client.gui.advanced.GuiNPCMagic; +import noppes.npcs.client.gui.advanced.GuiNPCMarks; +import noppes.npcs.client.gui.advanced.GuiNPCNightSetup; +import noppes.npcs.client.gui.advanced.GuiNPCSoundsMenu; +import noppes.npcs.client.gui.advanced.GuiNPCTagSetup; +import noppes.npcs.client.gui.roles.GuiNpcBard; +import noppes.npcs.client.gui.roles.GuiNpcCompanion; +import noppes.npcs.client.gui.roles.GuiNpcConversation; +import noppes.npcs.client.gui.roles.GuiNpcFollowerJob; +import noppes.npcs.client.gui.roles.GuiNpcGuard; +import noppes.npcs.client.gui.roles.GuiNpcHealer; +import noppes.npcs.client.gui.roles.GuiNpcSpawner; +import noppes.npcs.client.gui.roles.GuiNpcTransporter; import noppes.npcs.client.gui.util.GuiNPCInterface2; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.IGuiData; diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java index a7086a36f..f81242f89 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java @@ -10,10 +10,20 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import noppes.npcs.DataDisplay; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.*; +import noppes.npcs.client.gui.GuiNpcTextureCloaks; +import noppes.npcs.client.gui.GuiNpcTextureOverlays; +import noppes.npcs.client.gui.SubGuiCustomHitbox; +import noppes.npcs.client.gui.SubGuiNpcName; +import noppes.npcs.client.gui.SubGuiNpcTint; import noppes.npcs.client.gui.model.GuiCreationScreen; import noppes.npcs.client.gui.select.GuiTextureSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +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.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.config.ConfigMain; import noppes.npcs.controllers.data.SkinOverlay; import noppes.npcs.entity.EntityCustomNpc; diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java index f3833477c..80aa0e6b6 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java @@ -8,8 +8,18 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.EnumCreatureAttribute; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.DataStats; -import noppes.npcs.client.gui.*; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.SubGuiNpcMeleeProperties; +import noppes.npcs.client.gui.SubGuiNpcProjectiles; +import noppes.npcs.client.gui.SubGuiNpcRangeProperties; +import noppes.npcs.client.gui.SubGuiNpcResistanceProperties; +import noppes.npcs.client.gui.SubGuiNpcRespawn; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +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.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.entity.EntityNPCInterface; public class GuiNpcStats extends GuiNPCInterface2 implements ITextfieldListener, IGuiData { diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java b/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java index 722d9ff86..15d33b209 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java @@ -16,13 +16,29 @@ import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagByte; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiModelInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.ICustomScrollListener; import noppes.npcs.compat.PixelmonHelper; -import noppes.npcs.entity.*; +import noppes.npcs.entity.EntityCustomNpc; +import noppes.npcs.entity.EntityFakeLiving; +import noppes.npcs.entity.EntityNPCGolem; +import noppes.npcs.entity.EntityNPCInterface; +import noppes.npcs.entity.EntityNpcCrystal; +import noppes.npcs.entity.EntityNpcDragon; +import noppes.npcs.entity.EntityNpcPony; +import noppes.npcs.entity.EntityNpcSlime; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; public class GuiCreationScreen extends GuiModelInterface implements ICustomScrollListener { diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiEntitySelection.java b/src/main/java/noppes/npcs/client/gui/model/GuiEntitySelection.java index 1689893d3..f5a05d996 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiEntitySelection.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiEntitySelection.java @@ -12,7 +12,12 @@ import noppes.npcs.client.EntityUtil; import noppes.npcs.client.gui.util.GuiNPCInterface; import noppes.npcs.client.gui.util.GuiNPCStringSlot; import noppes.npcs.client.gui.util.GuiNpcButton; -import noppes.npcs.entity.*; +import noppes.npcs.entity.EntityCustomNpc; +import noppes.npcs.entity.EntityNPCGolem; +import noppes.npcs.entity.EntityNpcCrystal; +import noppes.npcs.entity.EntityNpcDragon; +import noppes.npcs.entity.EntityNpcPony; +import noppes.npcs.entity.EntityNpcSlime; import noppes.npcs.entity.data.ModelData; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiModelRotate.java b/src/main/java/noppes/npcs/client/gui/model/GuiModelRotate.java index 743de0945..f8cafab52 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiModelRotate.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiModelRotate.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui.model; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiModelInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcSlider; +import noppes.npcs.client.gui.util.ISliderListener; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.data.ModelData; import noppes.npcs.entity.data.ModelRotatePart; diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiModelScale.java b/src/main/java/noppes/npcs/client/gui/model/GuiModelScale.java index e00af5683..4a1f2358f 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiModelScale.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiModelScale.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui.model; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiModelInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcSlider; +import noppes.npcs.client.gui.util.ISliderListener; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.data.ModelData; import noppes.npcs.entity.data.ModelScalePart; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiAnvilRecipes.java b/src/main/java/noppes/npcs/client/gui/player/GuiAnvilRecipes.java index 9b9341f48..956e30058 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiAnvilRecipes.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiAnvilRecipes.java @@ -10,7 +10,11 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import noppes.npcs.client.CustomNpcResourceListener; -import noppes.npcs.client.gui.util.*; +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.client.gui.util.GuiNpcTextField; import noppes.npcs.controllers.RecipeController; import noppes.npcs.controllers.data.RecipeAnvil; 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 babf6b3a0..e8ccec1f9 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiMailbox.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiMailbox.java @@ -7,7 +7,12 @@ import net.minecraft.client.gui.GuiYesNoCallback; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.controllers.data.PlayerMail; import noppes.npcs.controllers.data.PlayerMailData; 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 d80138a5b..d19694ba6 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java @@ -12,9 +12,20 @@ import net.minecraft.client.resources.I18n; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; -import net.minecraft.util.*; +import net.minecraft.util.ChatAllowedCharacters; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonNextPage; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface; +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.IGuiClose; +import noppes.npcs.client.gui.util.IGuiError; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.containers.ContainerMail; import noppes.npcs.controllers.data.PlayerMail; import org.lwjgl.input.Keyboard; 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 3c6f2ef70..78507813a 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiRecipes.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiRecipes.java @@ -11,7 +11,11 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import noppes.npcs.client.CustomNpcResourceListener; -import noppes.npcs.client.gui.util.*; +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.client.gui.util.GuiNpcTextField; import noppes.npcs.controllers.RecipeController; import noppes.npcs.controllers.data.RecipeCarpentry; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiTransportSelection.java b/src/main/java/noppes/npcs/client/gui/player/GuiTransportSelection.java index 3c726c33d..f266059a6 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiTransportSelection.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiTransportSelection.java @@ -5,7 +5,12 @@ import kamkeel.npcs.network.packets.player.TransportPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ITopButtonListener; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionStats.java b/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionStats.java index 591fe8f82..a7d4c953d 100644 --- a/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionStats.java +++ b/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionStats.java @@ -11,7 +11,11 @@ import net.minecraft.util.MathHelper; import noppes.npcs.CustomItems; import noppes.npcs.CustomNpcs; import noppes.npcs.NoppesStringUtils; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface; +import noppes.npcs.client.gui.util.GuiMenuTopIconButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.constants.EnumCompanionJobs; import noppes.npcs.constants.EnumCompanionTalent; import noppes.npcs.constants.EnumGuiType; diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java index 76ae5173c..3ff696952 100644 --- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java +++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java @@ -2,7 +2,17 @@ package noppes.npcs.client.gui.player.inventory; import kamkeel.npcs.network.PacketClient; import kamkeel.npcs.network.packets.player.CheckPlayerValue; -import kamkeel.npcs.network.packets.request.party.*; +import kamkeel.npcs.network.packets.request.party.PartyAcceptInvitePacket; +import kamkeel.npcs.network.packets.request.party.PartyDisbandPacket; +import kamkeel.npcs.network.packets.request.party.PartyIgnoreInvitePacket; +import kamkeel.npcs.network.packets.request.party.PartyInfoPacket; +import kamkeel.npcs.network.packets.request.party.PartyInvitePacket; +import kamkeel.npcs.network.packets.request.party.PartyKickPacket; +import kamkeel.npcs.network.packets.request.party.PartyLeavePacket; +import kamkeel.npcs.network.packets.request.party.PartyLogToServerPacket; +import kamkeel.npcs.network.packets.request.party.PartySavePacket; +import kamkeel.npcs.network.packets.request.party.PartySetLeaderPacket; +import kamkeel.npcs.network.packets.request.party.PartySetQuestPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; @@ -14,13 +24,25 @@ import net.minecraft.util.StatCollector; import noppes.npcs.QuestLogData; import noppes.npcs.client.ClientCacheHandler; import noppes.npcs.client.CustomNpcResourceListener; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonNextPage; +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.ICustomScrollListener; +import noppes.npcs.client.gui.util.IPartyData; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.controllers.data.Party; import noppes.npcs.controllers.data.Quest; import org.lwjgl.opengl.GL11; import tconstruct.client.tabs.AbstractTab; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Objects; +import java.util.UUID; +import java.util.Vector; public class GuiParty extends GuiCNPCInventory implements ITextfieldListener, ICustomScrollListener, IPartyData, GuiYesNoCallback { private final ResourceLocation resource = new ResourceLocation("customnpcs", "textures/gui/standardbg.png"); diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java index 47ec2c1ef..7ffb7aff2 100644 --- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java +++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java @@ -4,7 +4,12 @@ import kamkeel.npcs.controllers.data.profile.Profile; import kamkeel.npcs.controllers.data.profile.ProfileInfoEntry; import kamkeel.npcs.controllers.data.profile.Slot; import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.player.profile.*; +import kamkeel.npcs.network.packets.player.profile.ProfileChangePacket; +import kamkeel.npcs.network.packets.player.profile.ProfileCreatePacket; +import kamkeel.npcs.network.packets.player.profile.ProfileGetInfoPacket; +import kamkeel.npcs.network.packets.player.profile.ProfileGetPacket; +import kamkeel.npcs.network.packets.player.profile.ProfileRemovePacket; +import kamkeel.npcs.network.packets.player.profile.ProfileRenamePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; @@ -16,7 +21,12 @@ import noppes.npcs.api.handler.data.ISlot; import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiEditText; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import tconstruct.client.tabs.AbstractTab; 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 0b65ec305..e382b7c51 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 @@ -17,14 +17,27 @@ import noppes.npcs.client.ClientCacheHandler; import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.TextBlockClient; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonNextPage; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuSideButton; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IPartyData; import noppes.npcs.controllers.data.Party; import noppes.npcs.util.ValueUtil; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import tconstruct.client.tabs.AbstractTab; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.UUID; public class GuiQuestLog extends GuiCNPCInventory implements ICustomScrollListener, IGuiData, IPartyData, GuiYesNoCallback { diff --git a/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernQuestDialog.java b/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernQuestDialog.java index 0d4659ebb..f0a20373f 100644 --- a/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernQuestDialog.java +++ b/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernQuestDialog.java @@ -29,12 +29,20 @@ import noppes.npcs.client.gui.util.GuiTexturedButton; import noppes.npcs.client.gui.util.IGuiClose; import noppes.npcs.config.ConfigExperimental; import noppes.npcs.controllers.FactionController; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.DialogImage; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.QuestData; import noppes.npcs.entity.EntityNPCInterface; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class GuiModernQuestDialog extends GuiNPCInterface implements IGuiClose { private int selected = 0; 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 d57f6f12d..0d9ac099f 100644 --- a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeItem.java +++ b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeItem.java @@ -4,7 +4,12 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.global.GuiNPCManageQuest; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface; +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.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.containers.ContainerNpcQuestTypeItem; import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; 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 bf4829130..c4e7babd9 100644 --- a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeKill.java +++ b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeKill.java @@ -5,7 +5,13 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; -import noppes.npcs.client.gui.util.*; +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.ICustomScrollListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; 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 4afbc1040..9c730b7af 100644 --- a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeLocation.java +++ b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeLocation.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui.questtypes; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -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.client.gui.util.SubGuiInterface; 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/questtypes/GuiNpcQuestTypeManual.java b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeManual.java index 4c4730888..4022d2447 100644 --- a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeManual.java +++ b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeManual.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui.questtypes; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -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.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.quests.QuestManual; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java index 1a44021cc..e77496766 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java @@ -4,7 +4,12 @@ import kamkeel.npcs.network.packets.request.jobs.JobSavePacket; import net.minecraft.client.gui.GuiButton; import noppes.npcs.client.controllers.MusicController; import noppes.npcs.client.gui.select.GuiSoundSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +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.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobBard; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcCompanion.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcCompanion.java index f35532ec3..731ec85f9 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcCompanion.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcCompanion.java @@ -6,7 +6,13 @@ import kamkeel.npcs.network.packets.request.role.RoleSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.player.companion.GuiNpcCompanionTalents.GuiTalent; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcSlider; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ISliderListener; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.constants.EnumCompanionStage; import noppes.npcs.constants.EnumCompanionTalent; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java index 546125193..4a28787d0 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java @@ -4,7 +4,13 @@ import kamkeel.npcs.network.packets.request.jobs.JobSavePacket; import net.minecraft.client.gui.GuiButton; import noppes.npcs.client.gui.SubGuiNpcAvailability; import noppes.npcs.client.gui.select.GuiQuestSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +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.GuiSelectionListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobConversation; import noppes.npcs.roles.JobConversation.ConversationLine; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerJob.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerJob.java index c41b728c4..4f656f63f 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerJob.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerJob.java @@ -1,7 +1,11 @@ package noppes.npcs.client.gui.roles; import kamkeel.npcs.network.packets.request.jobs.JobSavePacket; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobFollower; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerSetup.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerSetup.java index 2f18bdbff..1a3d36546 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerSetup.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerSetup.java @@ -6,7 +6,11 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface2; +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.GuiNpcTextField; import noppes.npcs.containers.ContainerNPCFollowerSetup; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleFollower; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcSpawner.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcSpawner.java index 0901b38b2..d57dd417c 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcSpawner.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcSpawner.java @@ -8,7 +8,13 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import noppes.npcs.client.gui.GuiNpcMobSpawnerSelector; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +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.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobSpawner; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTraderSetup.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTraderSetup.java index 4d9729982..43c259da7 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTraderSetup.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTraderSetup.java @@ -7,7 +7,11 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.CustomNpcResourceListener; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +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.ContainerNPCTraderSetup; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleTrader; 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 6be4a1f75..39cf78d46 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java @@ -6,7 +6,13 @@ import kamkeel.npcs.network.packets.request.transport.TransportGetLocationPacket import kamkeel.npcs.network.packets.request.transport.TransportSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.client.gui.util.*; +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.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.EnumScrollData; import noppes.npcs.controllers.data.TransportLocation; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/roles/SubGuiNpcConversationLine.java b/src/main/java/noppes/npcs/client/gui/roles/SubGuiNpcConversationLine.java index d98457bbd..6f08ac730 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/SubGuiNpcConversationLine.java +++ b/src/main/java/noppes/npcs/client/gui/roles/SubGuiNpcConversationLine.java @@ -2,7 +2,12 @@ package noppes.npcs.client.gui.roles; import net.minecraft.client.gui.GuiButton; import noppes.npcs.client.gui.select.GuiSoundSelection; -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.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; public class SubGuiNpcConversationLine extends SubGuiInterface implements ITextfieldListener, ISubGuiListener { public String line; diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiNPCEventScripts.java b/src/main/java/noppes/npcs/client/gui/script/GuiNPCEventScripts.java index 0fe589c8f..5b4693a10 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiNPCEventScripts.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiNPCEventScripts.java @@ -39,7 +39,7 @@ public class GuiNPCEventScripts extends GuiScriptInterface { } public void setGuiData(NBTTagCompound compound) { - if(compound.hasKey("LoadComplete")){ + if (compound.hasKey("LoadComplete")) { loaded = true; return; } @@ -63,7 +63,7 @@ public class GuiNPCEventScripts extends GuiScriptInterface { } public void save() { - if(loaded) { + if (loaded) { super.save(); List containers = this.script.getScripts(); for (int i = 0; i < containers.size(); i++) { diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptAllNPCs.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptAllNPCs.java index 5ab933754..6f0927cbc 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptAllNPCs.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptAllNPCs.java @@ -35,7 +35,7 @@ public class GuiScriptAllNPCs extends GuiScriptInterface { } public void setGuiData(NBTTagCompound compound) { - if(compound.hasKey("LoadComplete")){ + if (compound.hasKey("LoadComplete")) { loaded = true; return; } @@ -59,7 +59,7 @@ public class GuiScriptAllNPCs extends GuiScriptInterface { } public void save() { - if(loaded){ + if (loaded) { super.save(); List containers = this.script.getScripts(); for (int i = 0; i < containers.size(); i++) { diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptBlock.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptBlock.java index 0f0fbc192..d5a5f3f86 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptBlock.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptBlock.java @@ -34,7 +34,7 @@ public class GuiScriptBlock extends GuiScriptInterface { } public void save() { - if(loaded) { + if (loaded) { super.save(); BlockScriptPacket.Save(tileScripted.xCoord, tileScripted.yCoord, tileScripted.zCoord, this.tileScripted.getNBT(new NBTTagCompound())); } diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java index 5348a6958..33582ad88 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java @@ -11,12 +11,29 @@ import net.minecraft.util.StatCollector; import noppes.npcs.NBTTags; import noppes.npcs.NoppesStringUtils; import noppes.npcs.client.gui.global.GuiNPCManageEffects; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextArea; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiScriptTextArea; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IJTextAreaListener; +import noppes.npcs.client.gui.util.ITextChangeListener; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.data.CustomEffect; import noppes.npcs.controllers.data.EffectScript; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class GuiScriptEffect extends GuiNPCInterface implements GuiYesNoCallback, IGuiData, ITextChangeListener, ICustomScrollListener, IJTextAreaListener, ITextfieldListener { @@ -315,7 +332,7 @@ public class GuiScriptEffect extends GuiNPCInterface implements GuiYesNoCallback } public void setGuiData(NBTTagCompound compound) { - if(compound.hasKey("LoadComplete")){ + if (compound.hasKey("LoadComplete")) { loaded = true; return; } @@ -354,7 +371,7 @@ public class GuiScriptEffect extends GuiNPCInterface implements GuiYesNoCallback } public void save() { - if(loaded) { + if (loaded) { this.setScript(); List containers = this.scriptHandler.getScripts(); diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptForge.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptForge.java index e8460a6ce..aea39d1a5 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptForge.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptForge.java @@ -65,7 +65,7 @@ public class GuiScriptForge extends GuiScriptInterface { } public void setGuiData(NBTTagCompound compound) { - if(compound.hasKey("LoadComplete")){ + if (compound.hasKey("LoadComplete")) { loaded = true; return; } @@ -89,7 +89,7 @@ public class GuiScriptForge extends GuiScriptInterface { } public void save() { - if(loaded) { + if (loaded) { super.save(); List containers = this.script.getScripts(); for (int i = 0; i < containers.size(); i++) { diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java index 5de8a7ba2..f68d5bfa0 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java @@ -9,14 +9,31 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.StatCollector; import noppes.npcs.NoppesStringUtils; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextArea; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiScriptTextArea; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IJTextAreaListener; +import noppes.npcs.client.gui.util.ITextChangeListener; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; import noppes.npcs.controllers.data.ForgeDataScript; import noppes.npcs.controllers.data.IScriptHandler; import noppes.npcs.scripted.item.ScriptCustomItem; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallback, IGuiData, ITextChangeListener, ICustomScrollListener, IJTextAreaListener, ITextfieldListener { @@ -339,7 +356,7 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb } public void save() { - if(loaded) + if (loaded) this.setScript(); } diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptItem.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptItem.java index 9b12d2bb6..23a29b90c 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptItem.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptItem.java @@ -49,7 +49,7 @@ public class GuiScriptItem extends GuiScriptInterface { } public void save() { - if(loaded) { + if (loaded) { super.save(); ItemScriptPacket.Save(this.item.getMCNbt()); } diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java index 4d2727de6..664c08d1f 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java @@ -11,13 +11,30 @@ import net.minecraft.util.StatCollector; import noppes.npcs.NBTTags; import noppes.npcs.NoppesStringUtils; import noppes.npcs.client.gui.global.GuiNPCManageLinked; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextArea; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiScriptTextArea; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IJTextAreaListener; +import noppes.npcs.client.gui.util.ITextChangeListener; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.constants.EnumScriptType; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.data.LinkedItem; import noppes.npcs.controllers.data.LinkedItemScript; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class GuiScriptLinkedItem extends GuiNPCInterface implements GuiYesNoCallback, IGuiData, ITextChangeListener, ICustomScrollListener, IJTextAreaListener, ITextfieldListener { @@ -327,7 +344,7 @@ public class GuiScriptLinkedItem extends GuiNPCInterface implements GuiYesNoCall } public void setGuiData(NBTTagCompound compound) { - if(compound.hasKey("LoadComplete")){ + if (compound.hasKey("LoadComplete")) { loaded = true; return; } @@ -367,7 +384,7 @@ public class GuiScriptLinkedItem extends GuiNPCInterface implements GuiYesNoCall } public void save() { - if(loaded) { + if (loaded) { this.setScript(); List containers = this.scriptHandler.getScripts(); diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java index 6948ce89f..501e348d1 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java @@ -91,7 +91,7 @@ public class GuiScriptPlayers extends GuiScriptInterface { } public void setGuiData(NBTTagCompound compound) { - if(compound.hasKey("LoadComplete")){ + if (compound.hasKey("LoadComplete")) { loaded = true; return; } @@ -115,7 +115,7 @@ public class GuiScriptPlayers extends GuiScriptInterface { } public void save() { - if(loaded) { + if (loaded) { super.save(); List containers = this.script.getScripts(); for (int i = 0; i < containers.size(); i++) { diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java index 428bb0ee8..bb93052d7 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java @@ -1,6 +1,5 @@ package noppes.npcs.client.gui.script; -import kamkeel.npcs.network.packets.request.script.EffectScriptPacket; import kamkeel.npcs.network.packets.request.script.RecipeScriptPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiConfirmOpenLink; @@ -11,13 +10,31 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.StatCollector; import noppes.npcs.NBTTags; import noppes.npcs.NoppesStringUtils; -import noppes.npcs.client.gui.global.GuiNPCManageEffects; import noppes.npcs.client.gui.global.GuiNpcManageRecipes; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextArea; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiScriptTextArea; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IJTextAreaListener; +import noppes.npcs.client.gui.util.ITextChangeListener; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.controllers.ScriptContainer; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.RecipeAnvil; +import noppes.npcs.controllers.data.RecipeCarpentry; +import noppes.npcs.controllers.data.RecipeScript; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class GuiScriptRecipe extends GuiNPCInterface implements GuiYesNoCallback, IGuiData, ITextChangeListener, ICustomScrollListener, IJTextAreaListener, ITextfieldListener { private int activeTab = 0; @@ -335,7 +352,7 @@ public class GuiScriptRecipe extends GuiNPCInterface implements GuiYesNoCallback } public void setGuiData(NBTTagCompound compound) { - if(compound.hasKey("LoadComplete")){ + if (compound.hasKey("LoadComplete")) { loaded = true; return; } @@ -374,7 +391,7 @@ public class GuiScriptRecipe extends GuiNPCInterface implements GuiYesNoCallback } public void save() { - if(loaded) { + if (loaded) { this.setScript(); List containers = this.scriptHandler.getScripts(); diff --git a/src/main/java/noppes/npcs/client/gui/select/GuiDialogSelection.java b/src/main/java/noppes/npcs/client/gui/select/GuiDialogSelection.java index a98a80f4d..bfe59e467 100644 --- a/src/main/java/noppes/npcs/client/gui/select/GuiDialogSelection.java +++ b/src/main/java/noppes/npcs/client/gui/select/GuiDialogSelection.java @@ -2,7 +2,13 @@ package noppes.npcs.client.gui.select; import com.google.common.collect.Lists; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +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.GuiSelectionListener; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.DialogController; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.DialogCategory; diff --git a/src/main/java/noppes/npcs/client/gui/select/GuiQuestSelection.java b/src/main/java/noppes/npcs/client/gui/select/GuiQuestSelection.java index 58548069c..72a1da482 100644 --- a/src/main/java/noppes/npcs/client/gui/select/GuiQuestSelection.java +++ b/src/main/java/noppes/npcs/client/gui/select/GuiQuestSelection.java @@ -2,7 +2,13 @@ package noppes.npcs.client.gui.select; import com.google.common.collect.Lists; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +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.GuiSelectionListener; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.QuestController; import noppes.npcs.controllers.data.Quest; import noppes.npcs.controllers.data.QuestCategory; diff --git a/src/main/java/noppes/npcs/client/gui/select/GuiSoundSelection.java b/src/main/java/noppes/npcs/client/gui/select/GuiSoundSelection.java index e50630526..341b3cc48 100644 --- a/src/main/java/noppes/npcs/client/gui/select/GuiSoundSelection.java +++ b/src/main/java/noppes/npcs/client/gui/select/GuiSoundSelection.java @@ -8,7 +8,11 @@ import net.minecraft.client.audio.SoundRegistry; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.controllers.MusicController; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/noppes/npcs/client/gui/select/GuiTextureSelection.java b/src/main/java/noppes/npcs/client/gui/select/GuiTextureSelection.java index c258c8b24..eb8af18d0 100644 --- a/src/main/java/noppes/npcs/client/gui/select/GuiTextureSelection.java +++ b/src/main/java/noppes/npcs/client/gui/select/GuiTextureSelection.java @@ -6,7 +6,13 @@ import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.ObfuscationReflectionHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.resources.*; +import net.minecraft.client.resources.AbstractResourcePack; +import net.minecraft.client.resources.DefaultResourcePack; +import net.minecraft.client.resources.FallbackResourceManager; +import net.minecraft.client.resources.IResourcePack; +import net.minecraft.client.resources.NPCResourceHelper; +import net.minecraft.client.resources.ResourcePackRepository; +import net.minecraft.client.resources.SimpleReloadableResourceManager; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -23,7 +29,12 @@ import java.io.UnsupportedEncodingException; import java.net.URL; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java b/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java index e8f5d804f..0bf481ffb 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java @@ -7,7 +7,11 @@ import net.minecraft.util.StatCollector; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; import static noppes.npcs.client.gui.util.GuiNPCInterface.resizingActive; diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java b/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java index 83a8a7c01..07822888c 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java @@ -10,9 +10,19 @@ import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import java.awt.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; import java.util.List; +import java.util.Map; import java.util.Queue; -import java.util.*; +import java.util.Random; +import java.util.Set; +import java.util.TreeMap; /** * Abstract GUI class for drawing diagrams with icons (nodes) and connections (arrows). diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiHoverText.java b/src/main/java/noppes/npcs/client/gui/util/GuiHoverText.java index 2471ef0a6..14f083b01 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiHoverText.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiHoverText.java @@ -6,8 +6,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; public class GuiHoverText extends GuiScreen { diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNPCStringSlot.java b/src/main/java/noppes/npcs/client/gui/util/GuiNPCStringSlot.java index b0434d542..629fa6b92 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiNPCStringSlot.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiNPCStringSlot.java @@ -4,7 +4,11 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiSlot; import net.minecraft.client.renderer.Tessellator; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; public class GuiNPCStringSlot extends GuiSlot { diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java b/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java index 5b8fe32c7..95708326b 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java @@ -92,7 +92,7 @@ public class GuiScriptTextArea extends GuiNpcTextField { } int startBracket = 0, endBracket = 0; if (startSelection >= 0 && startSelection < text.length() && - (endSelection - startSelection == 1 || startSelection == endSelection)) { + (endSelection - startSelection == 1 || startSelection == endSelection)) { char c = text.charAt(startSelection); int found = 0; if (c == '{') { diff --git a/src/main/java/noppes/npcs/client/model/ModelMPM.java b/src/main/java/noppes/npcs/client/model/ModelMPM.java index f4d92a8dd..6c6cc623d 100644 --- a/src/main/java/noppes/npcs/client/model/ModelMPM.java +++ b/src/main/java/noppes/npcs/client/model/ModelMPM.java @@ -13,13 +13,32 @@ import noppes.npcs.api.ISkinOverlay; import noppes.npcs.client.ClientCacheHandler; import noppes.npcs.client.model.animation.AniCrawling; import noppes.npcs.client.model.animation.AniHug; -import noppes.npcs.client.model.part.*; +import noppes.npcs.client.model.part.ModelBeard; +import noppes.npcs.client.model.part.ModelBodywear; +import noppes.npcs.client.model.part.ModelBreasts; +import noppes.npcs.client.model.part.ModelClaws; +import noppes.npcs.client.model.part.ModelEars; +import noppes.npcs.client.model.part.ModelFin; +import noppes.npcs.client.model.part.ModelHair; +import noppes.npcs.client.model.part.ModelHeadwear; +import noppes.npcs.client.model.part.ModelHorns; +import noppes.npcs.client.model.part.ModelLegs; +import noppes.npcs.client.model.part.ModelLimbWear; +import noppes.npcs.client.model.part.ModelMohawk; +import noppes.npcs.client.model.part.ModelSkirt; +import noppes.npcs.client.model.part.ModelSnout; +import noppes.npcs.client.model.part.ModelTail; +import noppes.npcs.client.model.part.ModelWings; import noppes.npcs.client.model.util.ModelPartInterface; import noppes.npcs.client.model.util.ModelScaleRenderer; import noppes.npcs.client.renderer.ImageData; import noppes.npcs.constants.EnumAnimation; import noppes.npcs.constants.EnumAnimationPart; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.Animation; +import noppes.npcs.controllers.data.AnimationData; +import noppes.npcs.controllers.data.Frame; +import noppes.npcs.controllers.data.FramePart; +import noppes.npcs.controllers.data.SkinOverlay; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.data.ModelPartData; import noppes.npcs.entity.data.ModelScalePart; diff --git a/src/main/java/noppes/npcs/client/model/ModelPony.java b/src/main/java/noppes/npcs/client/model/ModelPony.java index 0babe5f74..b0d23b40a 100644 --- a/src/main/java/noppes/npcs/client/model/ModelPony.java +++ b/src/main/java/noppes/npcs/client/model/ModelPony.java @@ -20,6 +20,7 @@ import javax.imageio.ImageIO; import java.awt.*; import java.awt.image.BufferedImage; import java.io.IOException; +import java.io.InputStream; public class ModelPony extends ModelBase { @@ -762,23 +763,23 @@ public class ModelPony extends ModelBase { pony.isPegasus = false; pony.isUnicorn = false; Color color = new Color(bufferedimage.getRGB(0, 0), true); - Color color1 = new Color(249, 177, 49, 255); - Color color2 = new Color(136, 202, 240, 255); - Color color3 = new Color(209, 159, 228, 255); - Color color4 = new Color(254, 249, 252, 255); - if (color.equals(color1)) { - } - if (color.equals(color2)) { - pony.isPegasus = true; - } - if (color.equals(color3)) { - pony.isUnicorn = true; - } - if (color.equals(color4)) { - pony.isPegasus = true; - pony.isUnicorn = true; - } - pony.checked = pony.textureLocation; + Color color1 = new Color(249, 177, 49, 255); + Color color2 = new Color(136, 202, 240, 255); + Color color3 = new Color(209, 159, 228, 255); + Color color4 = new Color(254, 249, 252, 255); + if (color.equals(color1)) { + } + if (color.equals(color2)) { + pony.isPegasus = true; + } + if (color.equals(color3)) { + pony.isUnicorn = true; + } + if (color.equals(color4)) { + pony.isPegasus = true; + pony.isUnicorn = true; + } + pony.checked = pony.textureLocation; } } catch (IOException e) { diff --git a/src/main/java/noppes/npcs/client/model/part/ModelTail.java b/src/main/java/noppes/npcs/client/model/part/ModelTail.java index d49eb565f..8b555e190 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelTail.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelTail.java @@ -7,7 +7,13 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.ClientProxy; import noppes.npcs.client.model.ModelMPM; -import noppes.npcs.client.model.part.tails.*; +import noppes.npcs.client.model.part.tails.ModelCanineTail; +import noppes.npcs.client.model.part.tails.ModelDragonTail; +import noppes.npcs.client.model.part.tails.ModelFeatherTail; +import noppes.npcs.client.model.part.tails.ModelMonkeyTail; +import noppes.npcs.client.model.part.tails.ModelRodentTail; +import noppes.npcs.client.model.part.tails.ModelSquirrelTail; +import noppes.npcs.client.model.part.tails.ModelTailFin; import noppes.npcs.client.model.util.ModelScaleRenderer; import noppes.npcs.constants.EnumAnimation; import noppes.npcs.controllers.data.TintData; diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java index dcd19ce2d..452627bad 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java @@ -8,7 +8,11 @@ import net.minecraft.client.renderer.entity.RenderBiped; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemBow; +import net.minecraft.item.ItemStack; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.client.MinecraftForgeClient; diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java index ab847d0e5..a82ba93a8 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java @@ -11,8 +11,12 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Items; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemArmor.ArmorMaterial; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemBow; +import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.model.ModelPony; import noppes.npcs.client.model.ModelPonyArmor; @@ -99,23 +103,23 @@ public class RenderNPCPony extends RenderNPCInterface { pony.isPegasus = false; pony.isUnicorn = false; - Color color = new Color(bufferedimage.getRGB(0, 0), true); - Color color1 = new Color(249, 177, 49, 255); - Color color2 = new Color(136, 202, 240, 255); - Color color3 = new Color(209, 159, 228, 255); - Color color4 = new Color(254, 249, 252, 255); - if (color.equals(color1)) { - } - if (color.equals(color2)) { - pony.isPegasus = true; - } - if (color.equals(color3)) { - pony.isUnicorn = true; - } - if (color.equals(color4)) { - pony.isPegasus = true; - pony.isUnicorn = true; - } + Color color = new Color(bufferedimage.getRGB(0, 0), true); + Color color1 = new Color(249, 177, 49, 255); + Color color2 = new Color(136, 202, 240, 255); + Color color3 = new Color(209, 159, 228, 255); + Color color4 = new Color(254, 249, 252, 255); + if (color.equals(color1)) { + } + if (color.equals(color2)) { + pony.isPegasus = true; + } + if (color.equals(color3)) { + pony.isUnicorn = true; + } + if (color.equals(color4)) { + pony.isPegasus = true; + pony.isUnicorn = true; + } pony.checked = loc; } } catch (IOException e) { diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java index 9933d47d7..5bff9a1cb 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java @@ -12,8 +12,19 @@ import net.minecraft.util.ResourceLocation; import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockCouchWool; import noppes.npcs.blocks.tiles.TileCouchWool; -import noppes.npcs.client.model.blocks.couch.*; -import noppes.npcs.client.model.blocks.legacy.couch.*; +import noppes.npcs.client.model.blocks.couch.ModelCouchCorner; +import noppes.npcs.client.model.blocks.couch.ModelCouchLeft; +import noppes.npcs.client.model.blocks.couch.ModelCouchMiddle; +import noppes.npcs.client.model.blocks.couch.ModelCouchRight; +import noppes.npcs.client.model.blocks.couch.ModelCouchSingle; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchCorner; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchCornerWool; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchLeft; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchLeftWool; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchMiddle; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchMiddleWool; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchRight; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchRightWool; import noppes.npcs.config.ConfigClient; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -119,13 +130,12 @@ public class BlockCouchWoolRenderer extends BlockRendererInterface { float[] color = ColorUtil.hexToRGB(tile.color); GL11.glColor3f(color[0], color[1], color[2]); - if (tile.hasCornerLeft){ + if (tile.hasCornerLeft) { GL11.glPushMatrix(); GL11.glRotatef(270, 0, 1, 0); modelCouchCorner.Cussion.render(0.0625F); GL11.glPopMatrix(); - } - else if (tile.hasCornerRight) + } else if (tile.hasCornerRight) modelCouchCorner.Cussion.render(0.0625F); else if (tile.hasLeft && tile.hasRight) modelCouch.Cussion.render(0.0625F); diff --git a/src/main/java/noppes/npcs/config/ConfigScript.java b/src/main/java/noppes/npcs/config/ConfigScript.java index 91d65ec41..15c2b9ca0 100644 --- a/src/main/java/noppes/npcs/config/ConfigScript.java +++ b/src/main/java/noppes/npcs/config/ConfigScript.java @@ -161,7 +161,7 @@ public class ConfigScript { if (ExpandedScriptLimit < 0) ExpandedScriptLimit = 0; - if(ActionManagerTickDefault < 0){ + if (ActionManagerTickDefault < 0) { ActionManagerTickDefault = 1; } diff --git a/src/main/java/noppes/npcs/config/GlyphCache.java b/src/main/java/noppes/npcs/config/GlyphCache.java index a62e4154d..98474c493 100644 --- a/src/main/java/noppes/npcs/config/GlyphCache.java +++ b/src/main/java/noppes/npcs/config/GlyphCache.java @@ -14,8 +14,11 @@ import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.IntBuffer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; -import java.util.*; /** * @author https://github.com/secretdataz/BetterFonts diff --git a/src/main/java/noppes/npcs/config/legacy/LegacyLoader.java b/src/main/java/noppes/npcs/config/legacy/LegacyLoader.java index 608824c08..8c1995b8a 100644 --- a/src/main/java/noppes/npcs/config/legacy/LegacyLoader.java +++ b/src/main/java/noppes/npcs/config/legacy/LegacyLoader.java @@ -2,7 +2,12 @@ package noppes.npcs.config.legacy; import noppes.npcs.LogWriter; -import java.io.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; import java.lang.reflect.Field; import java.util.HashMap; import java.util.LinkedList; diff --git a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java index 49f284b12..dc7026a06 100644 --- a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java +++ b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java @@ -3,7 +3,12 @@ package noppes.npcs.containers; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.*; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.InventoryCraftResult; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import noppes.npcs.EventHooks; diff --git a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java index 59e6a720d..898bbfdc4 100644 --- a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java +++ b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java @@ -3,15 +3,21 @@ package noppes.npcs.containers; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.*; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.InventoryCraftResult; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.inventory.Slot; +import net.minecraft.inventory.SlotCrafting; import net.minecraft.item.ItemStack; import net.minecraft.network.play.server.S2FPacketSetSlot; import net.minecraft.world.World; import noppes.npcs.CustomItems; import noppes.npcs.EventHooks; -import noppes.npcs.scripted.event.RecipeScriptEvent; import noppes.npcs.controllers.RecipeController; import noppes.npcs.controllers.data.RecipeCarpentry; +import noppes.npcs.scripted.event.RecipeScriptEvent; public class ContainerCarpentryBench extends Container { public InventoryCrafting craftMatrix = new InventoryCrafting(this, 4, 4); diff --git a/src/main/java/noppes/npcs/controllers/AnimationController.java b/src/main/java/noppes/npcs/controllers/AnimationController.java index a25947cfe..65adfcd3d 100644 --- a/src/main/java/noppes/npcs/controllers/AnimationController.java +++ b/src/main/java/noppes/npcs/controllers/AnimationController.java @@ -10,7 +10,12 @@ import noppes.npcs.api.handler.data.IAnimation; import noppes.npcs.controllers.data.Animation; import noppes.npcs.util.NBTJsonUtil; -import java.io.*; +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.ArrayList; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/noppes/npcs/controllers/CustomEffectController.java b/src/main/java/noppes/npcs/controllers/CustomEffectController.java index 167af222a..d1036dc70 100644 --- a/src/main/java/noppes/npcs/controllers/CustomEffectController.java +++ b/src/main/java/noppes/npcs/controllers/CustomEffectController.java @@ -18,7 +18,12 @@ import noppes.npcs.controllers.data.EffectScript; import noppes.npcs.controllers.data.PlayerEffect; import noppes.npcs.util.NBTJsonUtil; -import java.io.*; +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.Iterator; import java.util.Map; diff --git a/src/main/java/noppes/npcs/controllers/DialogController.java b/src/main/java/noppes/npcs/controllers/DialogController.java index 456f74335..3490735f3 100644 --- a/src/main/java/noppes/npcs/controllers/DialogController.java +++ b/src/main/java/noppes/npcs/controllers/DialogController.java @@ -19,7 +19,11 @@ import noppes.npcs.util.NBTJsonUtil; import java.io.File; import java.io.FileInputStream; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class DialogController implements IDialogHandler { public HashMap categoriesSync = new HashMap(); diff --git a/src/main/java/noppes/npcs/controllers/FactionController.java b/src/main/java/noppes/npcs/controllers/FactionController.java index 995fddd13..9ddf860ea 100644 --- a/src/main/java/noppes/npcs/controllers/FactionController.java +++ b/src/main/java/noppes/npcs/controllers/FactionController.java @@ -11,7 +11,12 @@ import noppes.npcs.api.handler.IFactionHandler; import noppes.npcs.api.handler.data.IFaction; import noppes.npcs.controllers.data.Faction; -import java.io.*; +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.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/noppes/npcs/controllers/LinkedItemController.java b/src/main/java/noppes/npcs/controllers/LinkedItemController.java index d97948b49..c2bc19044 100644 --- a/src/main/java/noppes/npcs/controllers/LinkedItemController.java +++ b/src/main/java/noppes/npcs/controllers/LinkedItemController.java @@ -12,7 +12,12 @@ import noppes.npcs.controllers.data.LinkedItem; import noppes.npcs.controllers.data.LinkedItemScript; import noppes.npcs.util.NBTJsonUtil; -import java.io.*; +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; diff --git a/src/main/java/noppes/npcs/controllers/MagicController.java b/src/main/java/noppes/npcs/controllers/MagicController.java index b18b9de70..40febf172 100644 --- a/src/main/java/noppes/npcs/controllers/MagicController.java +++ b/src/main/java/noppes/npcs/controllers/MagicController.java @@ -15,7 +15,12 @@ import noppes.npcs.controllers.data.Magic; import noppes.npcs.controllers.data.MagicAssociation; import noppes.npcs.controllers.data.MagicCycle; -import java.io.*; +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; diff --git a/src/main/java/noppes/npcs/controllers/PlayerDataController.java b/src/main/java/noppes/npcs/controllers/PlayerDataController.java index c779b8a95..c8964b31d 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerDataController.java +++ b/src/main/java/noppes/npcs/controllers/PlayerDataController.java @@ -12,11 +12,20 @@ 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.PlayerDataScript; +import noppes.npcs.controllers.data.PlayerMail; import noppes.npcs.util.CacheHashMap; import noppes.npcs.util.NBTJsonUtil; -import java.io.*; +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.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/noppes/npcs/controllers/QuestController.java b/src/main/java/noppes/npcs/controllers/QuestController.java index 8fd507ac7..72688b7e5 100644 --- a/src/main/java/noppes/npcs/controllers/QuestController.java +++ b/src/main/java/noppes/npcs/controllers/QuestController.java @@ -18,7 +18,11 @@ import noppes.npcs.util.NBTJsonUtil; import java.io.File; import java.io.FileInputStream; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class QuestController implements IQuestHandler { public HashMap categoriesSync = new HashMap(); diff --git a/src/main/java/noppes/npcs/controllers/RecipeController.java b/src/main/java/noppes/npcs/controllers/RecipeController.java index 28b67ddeb..7fccdec93 100644 --- a/src/main/java/noppes/npcs/controllers/RecipeController.java +++ b/src/main/java/noppes/npcs/controllers/RecipeController.java @@ -11,13 +11,20 @@ import noppes.npcs.CustomNpcs; import noppes.npcs.api.handler.IRecipeHandler; import noppes.npcs.api.handler.data.IAnvilRecipe; import noppes.npcs.api.handler.data.IRecipe; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.RecipeAnvil; +import noppes.npcs.controllers.data.RecipeCarpentry; +import noppes.npcs.controllers.data.RecipeScript; +import noppes.npcs.controllers.data.RecipesDefault; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; public class RecipeController implements IRecipeHandler { private static Collection prevRecipes; @@ -278,7 +285,7 @@ public class RecipeController implements IRecipeHandler { SyncController.syncAllWorkbenchRecipes(); RecipeCarpentry carpentry = carpentryRecipes.remove(recipe.id); - if (carpentry != null){ + if (carpentry != null) { carpentryScripts.remove(recipe.id); SyncController.syncAllCarpentryRecipes(); } diff --git a/src/main/java/noppes/npcs/controllers/ScriptContainer.java b/src/main/java/noppes/npcs/controllers/ScriptContainer.java index 523ad8ba9..3ea46b6a7 100644 --- a/src/main/java/noppes/npcs/controllers/ScriptContainer.java +++ b/src/main/java/noppes/npcs/controllers/ScriptContainer.java @@ -9,11 +9,20 @@ import noppes.npcs.constants.EnumScriptType; import noppes.npcs.controllers.data.IScriptHandler; import noppes.npcs.scripted.NpcAPI; -import javax.script.*; +import javax.script.Compilable; +import javax.script.CompiledScript; +import javax.script.ScriptContext; +import javax.script.ScriptEngine; import java.io.PrintWriter; import java.io.StringWriter; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.TreeMap; public class ScriptContainer { private static final String lock = "lock"; diff --git a/src/main/java/noppes/npcs/controllers/ScriptController.java b/src/main/java/noppes/npcs/controllers/ScriptController.java index 86cd950b9..d4246440b 100644 --- a/src/main/java/noppes/npcs/controllers/ScriptController.java +++ b/src/main/java/noppes/npcs/controllers/ScriptController.java @@ -30,7 +30,12 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static noppes.npcs.util.CustomNPCsThreader.customNPCThread; diff --git a/src/main/java/noppes/npcs/controllers/ServerCloneController.java b/src/main/java/noppes/npcs/controllers/ServerCloneController.java index da58101cc..ea61a0112 100644 --- a/src/main/java/noppes/npcs/controllers/ServerCloneController.java +++ b/src/main/java/noppes/npcs/controllers/ServerCloneController.java @@ -22,7 +22,14 @@ import noppes.npcs.util.NBTJsonUtil; import java.io.File; import java.io.FileInputStream; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.UUID; public class ServerCloneController implements ICloneHandler { public static ServerCloneController Instance; diff --git a/src/main/java/noppes/npcs/controllers/ServerTagMapController.java b/src/main/java/noppes/npcs/controllers/ServerTagMapController.java index 886fdfcfe..0221481e3 100644 --- a/src/main/java/noppes/npcs/controllers/ServerTagMapController.java +++ b/src/main/java/noppes/npcs/controllers/ServerTagMapController.java @@ -6,7 +6,12 @@ import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.controllers.data.TagMap; -import java.io.*; +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.zip.GZIPInputStream; public class ServerTagMapController { diff --git a/src/main/java/noppes/npcs/controllers/SpawnController.java b/src/main/java/noppes/npcs/controllers/SpawnController.java index 1608825f5..7a04d788d 100644 --- a/src/main/java/noppes/npcs/controllers/SpawnController.java +++ b/src/main/java/noppes/npcs/controllers/SpawnController.java @@ -10,8 +10,17 @@ import noppes.npcs.api.handler.INaturalSpawnsHandler; import noppes.npcs.api.handler.data.INaturalSpawn; import noppes.npcs.controllers.data.SpawnData; -import java.io.*; -import java.util.*; +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.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; import java.util.zip.GZIPInputStream; public class SpawnController implements INaturalSpawnsHandler { diff --git a/src/main/java/noppes/npcs/controllers/TagController.java b/src/main/java/noppes/npcs/controllers/TagController.java index 14fd6b066..cbd2ed006 100644 --- a/src/main/java/noppes/npcs/controllers/TagController.java +++ b/src/main/java/noppes/npcs/controllers/TagController.java @@ -9,8 +9,18 @@ import noppes.npcs.api.handler.ITagHandler; import noppes.npcs.api.handler.data.ITag; import noppes.npcs.controllers.data.Tag; -import java.io.*; -import java.util.*; +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.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.UUID; import java.util.zip.GZIPInputStream; public class TagController implements ITagHandler { diff --git a/src/main/java/noppes/npcs/controllers/data/Availability.java b/src/main/java/noppes/npcs/controllers/data/Availability.java index ffc59bd3f..dcf5dacd6 100644 --- a/src/main/java/noppes/npcs/controllers/data/Availability.java +++ b/src/main/java/noppes/npcs/controllers/data/Availability.java @@ -10,7 +10,11 @@ import noppes.npcs.ICompatibilty; import noppes.npcs.VersionCompatibility; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.handler.data.IAvailability; -import noppes.npcs.constants.*; +import noppes.npcs.constants.EnumAvailabilityDialog; +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.PlayerQuestController; import noppes.npcs.controllers.QuestController; diff --git a/src/main/java/noppes/npcs/controllers/data/DataScript.java b/src/main/java/noppes/npcs/controllers/data/DataScript.java index 514da2dac..bf4327d38 100644 --- a/src/main/java/noppes/npcs/controllers/data/DataScript.java +++ b/src/main/java/noppes/npcs/controllers/data/DataScript.java @@ -27,7 +27,13 @@ import noppes.npcs.scripted.constants.RoleType; import noppes.npcs.scripted.entity.ScriptNpc; import javax.script.ScriptEngine; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; public class DataScript implements INpcScriptHandler { public List eventScripts = new ArrayList<>(); diff --git a/src/main/java/noppes/npcs/controllers/data/Dialog.java b/src/main/java/noppes/npcs/controllers/data/Dialog.java index 884822098..e68fe717e 100644 --- a/src/main/java/noppes/npcs/controllers/data/Dialog.java +++ b/src/main/java/noppes/npcs/controllers/data/Dialog.java @@ -5,7 +5,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.ICompatibilty; import noppes.npcs.VersionCompatibility; -import noppes.npcs.api.handler.data.*; +import noppes.npcs.api.handler.data.IAvailability; +import noppes.npcs.api.handler.data.IDialog; +import noppes.npcs.api.handler.data.IDialogCategory; +import noppes.npcs.api.handler.data.IDialogImage; +import noppes.npcs.api.handler.data.IDialogOption; +import noppes.npcs.api.handler.data.IQuest; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumOptionType; import noppes.npcs.controllers.DialogController; diff --git a/src/main/java/noppes/npcs/controllers/data/EffectScript.java b/src/main/java/noppes/npcs/controllers/data/EffectScript.java index a6e66bec8..bd2b75dae 100644 --- a/src/main/java/noppes/npcs/controllers/data/EffectScript.java +++ b/src/main/java/noppes/npcs/controllers/data/EffectScript.java @@ -13,7 +13,12 @@ import noppes.npcs.controllers.ScriptController; import noppes.npcs.scripted.event.player.PlayerEvent; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; public class EffectScript implements INpcScriptHandler { public ScriptContainer container; diff --git a/src/main/java/noppes/npcs/controllers/data/GlobalNPCDataScript.java b/src/main/java/noppes/npcs/controllers/data/GlobalNPCDataScript.java index c1a468279..335256e0f 100644 --- a/src/main/java/noppes/npcs/controllers/data/GlobalNPCDataScript.java +++ b/src/main/java/noppes/npcs/controllers/data/GlobalNPCDataScript.java @@ -15,7 +15,16 @@ import noppes.npcs.scripted.NpcAPI; import javax.annotation.CheckForNull; import java.lang.reflect.Array; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.OptionalDouble; +import java.util.OptionalInt; +import java.util.OptionalLong; +import java.util.TreeMap; public class GlobalNPCDataScript implements INpcScriptHandler { public List scripts = new ArrayList(); diff --git a/src/main/java/noppes/npcs/controllers/data/LinkedItemScript.java b/src/main/java/noppes/npcs/controllers/data/LinkedItemScript.java index 64c3dd7ff..cce8df255 100644 --- a/src/main/java/noppes/npcs/controllers/data/LinkedItemScript.java +++ b/src/main/java/noppes/npcs/controllers/data/LinkedItemScript.java @@ -12,7 +12,12 @@ import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; public class LinkedItemScript implements INpcScriptHandler { public ScriptContainer container; diff --git a/src/main/java/noppes/npcs/controllers/data/Party.java b/src/main/java/noppes/npcs/controllers/data/Party.java index 66988a104..0fa6449ff 100644 --- a/src/main/java/noppes/npcs/controllers/data/Party.java +++ b/src/main/java/noppes/npcs/controllers/data/Party.java @@ -23,7 +23,11 @@ import noppes.npcs.controllers.QuestController; import java.io.BufferedReader; import java.io.InputStreamReader; import java.net.URL; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.UUID; public class Party implements IParty { private final UUID partyUUID; diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerData.java b/src/main/java/noppes/npcs/controllers/data/PlayerData.java index 07cc91a1d..5f6a5e00d 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerData.java @@ -16,7 +16,14 @@ import net.minecraftforge.common.IExtendedEntityProperties; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.api.entity.ICustomNpc; -import noppes.npcs.api.handler.*; +import noppes.npcs.api.handler.IPlayerBankData; +import noppes.npcs.api.handler.IPlayerData; +import noppes.npcs.api.handler.IPlayerDialogData; +import noppes.npcs.api.handler.IPlayerFactionData; +import noppes.npcs.api.handler.IPlayerItemGiverData; +import noppes.npcs.api.handler.IPlayerMailData; +import noppes.npcs.api.handler.IPlayerQuestData; +import noppes.npcs.api.handler.IPlayerTransportData; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumRoleType; import noppes.npcs.controllers.CustomEffectController; diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java b/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java index 2a8efced4..a425bdcd4 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java @@ -17,8 +17,18 @@ import noppes.npcs.scripted.event.player.PlayerEvent; import javax.annotation.CheckForNull; import java.lang.reflect.Array; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Objects; +import java.util.Optional; +import java.util.OptionalDouble; +import java.util.OptionalInt; +import java.util.OptionalLong; +import java.util.TreeMap; public class PlayerDataScript implements INpcScriptHandler { public List scripts = new ArrayList(); diff --git a/src/main/java/noppes/npcs/controllers/data/Quest.java b/src/main/java/noppes/npcs/controllers/data/Quest.java index 02f3e3f87..1f9097d8a 100644 --- a/src/main/java/noppes/npcs/controllers/data/Quest.java +++ b/src/main/java/noppes/npcs/controllers/data/Quest.java @@ -6,19 +6,34 @@ import kamkeel.npcs.network.packets.data.QuestCompletionPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.*; +import noppes.npcs.ICompatibilty; +import noppes.npcs.NoppesUtilPlayer; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.NpcMiscInventory; +import noppes.npcs.VersionCompatibility; import noppes.npcs.api.IContainer; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.handler.IPlayerData; import noppes.npcs.api.handler.IPlayerQuestData; -import noppes.npcs.api.handler.data.*; +import noppes.npcs.api.handler.data.IPartyOptions; +import noppes.npcs.api.handler.data.IProfileOptions; +import noppes.npcs.api.handler.data.IQuest; +import noppes.npcs.api.handler.data.IQuestCategory; +import noppes.npcs.api.handler.data.IQuestInterface; +import noppes.npcs.api.handler.data.IQuestObjective; +import noppes.npcs.api.handler.data.ISlot; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumProfileSync; import noppes.npcs.constants.EnumQuestCompletion; import noppes.npcs.constants.EnumQuestRepeat; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.controllers.QuestController; -import noppes.npcs.quests.*; +import noppes.npcs.quests.QuestDialog; +import noppes.npcs.quests.QuestInterface; +import noppes.npcs.quests.QuestItem; +import noppes.npcs.quests.QuestKill; +import noppes.npcs.quests.QuestLocation; +import noppes.npcs.quests.QuestManual; import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.NpcAPI; diff --git a/src/main/java/noppes/npcs/controllers/data/RecipeAnvil.java b/src/main/java/noppes/npcs/controllers/data/RecipeAnvil.java index 7809f63a7..f2bd33807 100644 --- a/src/main/java/noppes/npcs/controllers/data/RecipeAnvil.java +++ b/src/main/java/noppes/npcs/controllers/data/RecipeAnvil.java @@ -164,6 +164,7 @@ public class RecipeAnvil implements IAnvilRecipe { this.repairPercentage = recipe.repairPercentage; this.xpCost = recipe.xpCost; } + public RecipeScript getScriptHandler() { return RecipeController.Instance.anvilScripts.get(this.id); } diff --git a/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java b/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java index ff574f133..5821b99a6 100644 --- a/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java +++ b/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java @@ -47,7 +47,7 @@ public class RecipeCarpentry extends ShapedRecipes implements IRecipe { this.ignoreNBT = compound.getBoolean("IgnoreNBT"); this.isGlobal = compound.getBoolean("Global"); - if(!isGlobal){ + if (!isGlobal) { if (compound.hasKey("ScriptData", Constants.NBT.TAG_COMPOUND)) { RecipeScript handler = new RecipeScript(); handler.readFromNBT(compound.getCompoundTag("ScriptData")); diff --git a/src/main/java/noppes/npcs/controllers/data/RecipeScript.java b/src/main/java/noppes/npcs/controllers/data/RecipeScript.java index 7095b02a5..b94acfbc6 100644 --- a/src/main/java/noppes/npcs/controllers/data/RecipeScript.java +++ b/src/main/java/noppes/npcs/controllers/data/RecipeScript.java @@ -12,7 +12,11 @@ import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; public class RecipeScript implements INpcScriptHandler { public ScriptContainer container; @@ -147,6 +151,7 @@ public class RecipeScript implements INpcScriptHandler { PRE("pre"), POST("post"); public final String function; + ScriptType(String functionName) { this.function = functionName; } diff --git a/src/main/java/noppes/npcs/controllers/data/SpawnData.java b/src/main/java/noppes/npcs/controllers/data/SpawnData.java index 821a0e3aa..f82d9b225 100644 --- a/src/main/java/noppes/npcs/controllers/data/SpawnData.java +++ b/src/main/java/noppes/npcs/controllers/data/SpawnData.java @@ -12,7 +12,13 @@ import noppes.npcs.api.handler.data.INaturalSpawn; import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.NpcAPI; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; public class SpawnData extends WeightedRandom.Item implements INaturalSpawn { public List biomes = new ArrayList<>(); diff --git a/src/main/java/noppes/npcs/controllers/data/TagMap.java b/src/main/java/noppes/npcs/controllers/data/TagMap.java index 073439d50..e4c0ad57f 100644 --- a/src/main/java/noppes/npcs/controllers/data/TagMap.java +++ b/src/main/java/noppes/npcs/controllers/data/TagMap.java @@ -4,7 +4,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.UUID; public class TagMap { public int cloneTab; diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index aa24e6710..729603019 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -2,7 +2,6 @@ package noppes.npcs.controllers.data.action; import noppes.npcs.api.handler.IActionManager; import noppes.npcs.api.handler.data.IAction; -import noppes.npcs.api.handler.data.IActionListener; import noppes.npcs.api.handler.data.IActionQueue; import noppes.npcs.api.handler.data.actions.IConditionalAction; import noppes.npcs.controllers.ScriptContainer; @@ -505,6 +504,7 @@ public class Action implements IAction { } return null; } + @Override public IAction after(IAction after) { if (after instanceof IConditionalAction) @@ -637,6 +637,7 @@ public class Action implements IAction { for (Consumer task : tasks) parallel(task); } + @Override public IAction parallel(int delay, Consumer task) { return parallel(manager.create(delay, task)); diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionList.java b/src/main/java/noppes/npcs/controllers/data/action/ActionList.java index 8cee13544..68a44ad43 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionList.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionList.java @@ -1,6 +1,5 @@ package noppes.npcs.controllers.data.action; -import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.IActionQueue; import java.util.LinkedList; diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionListener.java b/src/main/java/noppes/npcs/controllers/data/action/ActionListener.java index c249a6b2c..01b557a5e 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionListener.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionListener.java @@ -4,7 +4,8 @@ import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.IActionListener; import noppes.npcs.api.handler.data.IActionQueue; -import java.util.*; +import java.util.Iterator; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class ActionListener implements IActionListener { @@ -38,17 +39,17 @@ public class ActionListener implements IActionListener { return object; } -// @Override + // @Override public Hook getOrCreateHook(String hookName) { return hooks.computeIfAbsent(hookName, Hook::new); } -// @Override + // @Override public Hook getHook(String hookName) { return hooks.get(hookName); } -// @Override + // @Override public boolean fire(String hookName) { Hook hook = hooks.get(hookName); if (hook != null) { diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java b/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java index 11a9b3344..753419970 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java @@ -4,11 +4,15 @@ import noppes.npcs.LogWriter; import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.IActionQueue; import noppes.npcs.config.ConfigDebug; -import noppes.npcs.config.ConfigScript; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; -import java.util.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Date; +import java.util.Deque; +import java.util.List; +import java.util.ListIterator; public class ActionLogger { // private final Map> snapshot = new HashMap<>(); @@ -138,7 +142,7 @@ public class ActionLogger { private static final String ANSI_RESET = "\u001B[0m"; public void println(String str) { - if(ConfigDebug.LogActionManager) + if (ConfigDebug.LogActionManager) System.out.printf("[%tT] %s[%s]:%s %s%s%n", new Date(), ANSI_CYAN, Thread.currentThread().getName(), ANSI_GOLD, str, ANSI_RESET); } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index 0b62ddce0..7f4e8412e 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -9,7 +9,11 @@ import noppes.npcs.api.handler.data.actions.IConditionalAction; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.data.action.action.ConditionalAction; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; import java.util.function.Function; @@ -38,7 +42,8 @@ public class ActionManager implements IActionManager { protected boolean debug = false; protected ScriptContainer reportTo; - public ActionManager() {} + public ActionManager() { + } public ActionManager(String name) { this.name = name; @@ -130,6 +135,7 @@ public class ActionManager implements IActionManager { public IAction create(int maxDuration, int delay, Consumer task) { return new Action(this, maxDuration, delay, task); } + @Override public IAction create(String name, int maxDuration, int delay, Consumer task) { return new Action(this, name, maxDuration, delay, task); @@ -151,32 +157,32 @@ public class ActionManager implements IActionManager { } @Override - public IConditionalAction create(Function condition, Consumer task) { + public IConditionalAction create(Function condition, Consumer task) { return new ConditionalAction(this, condition, task); } @Override - public IConditionalAction create(String name,Function condition, Consumer task) { + public IConditionalAction create(String name, Function condition, Consumer task) { return new ConditionalAction(this, name, condition, task); } @Override - public IConditionalAction create(Function condition, Consumer task,Function terminateWhen) { + public IConditionalAction create(Function condition, Consumer task, Function terminateWhen) { return new ConditionalAction(this, condition, task, terminateWhen); } @Override - public IConditionalAction create(String name,Function condition, Consumer task,Function terminateWhen) { + public IConditionalAction create(String name, Function condition, Consumer task, Function terminateWhen) { return new ConditionalAction(this, name, condition, task, terminateWhen); } @Override - public IConditionalAction create(Function condition, Consumer task,Function terminateWhen, Consumer onTermination) { + public IConditionalAction create(Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { return new ConditionalAction(this, condition, task, terminateWhen, onTermination); } @Override - public IConditionalAction create(String name,Function condition, Consumer task,Function terminateWhen, Consumer onTermination) { + public IConditionalAction create(String name, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { return new ConditionalAction(this, name, condition, task, terminateWhen, onTermination); } @@ -277,6 +283,7 @@ public class ActionManager implements IActionManager { public IAction schedule(String name, Consumer task) { return sequentialQueue.schedule(name, task); } + @Override public IAction schedule(String name, int delay, Consumer task) { return sequentialQueue.schedule(name, delay, task); @@ -335,6 +342,7 @@ public class ActionManager implements IActionManager { public IAction scheduleParallel(String name, Consumer task) { return parallelQueue.schedule(name, task); } + @Override public IAction scheduleParallel(String name, int delay, Consumer task) { return parallelQueue.schedule(delay, task); @@ -365,33 +373,33 @@ public class ActionManager implements IActionManager { } @Override - public IConditionalAction schedule(Function condition, Consumer task) { + public IConditionalAction schedule(Function condition, Consumer task) { return schedule(new ConditionalAction(this, condition, task)); } @Override - public IConditionalAction schedule(Function condition, Consumer task, Function terminateWhen) { + public IConditionalAction schedule(Function condition, Consumer task, Function terminateWhen) { return schedule(new ConditionalAction(this, condition, task, terminateWhen)); } @Override - public IConditionalAction schedule(Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { + public IConditionalAction schedule(Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { return schedule(new ConditionalAction(this, condition, task, terminateWhen, onTermination)); } @Override - public IConditionalAction schedule(String name, Function condition, Consumer task) { + public IConditionalAction schedule(String name, Function condition, Consumer task) { return schedule(new ConditionalAction(this, name, condition, task)); } @Override - public IConditionalAction schedule(String name, Function condition, Consumer task, Function terminateWhen) { + public IConditionalAction schedule(String name, Function condition, Consumer task, Function terminateWhen) { return schedule(new ConditionalAction(this, name, condition, task, terminateWhen)); } @Override - public IConditionalAction schedule(String name, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { + public IConditionalAction schedule(String name, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { return schedule(new ConditionalAction(this, name, condition, task, terminateWhen, onTermination)); } @@ -415,6 +423,7 @@ public class ActionManager implements IActionManager { public boolean hasActiveTasks() { return Arrays.stream(getAllQueues()).anyMatch(queue -> queue.hasActiveTasks()); } + @Override public boolean hasAny(String name) { return getAny(name) != null; @@ -503,7 +512,7 @@ public class ActionManager implements IActionManager { // } if (debug && active) - LOGGER.finish("Finished Tick Cycle",this); + LOGGER.finish("Finished Tick Cycle", this); } @Override diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index 0a20f4a5a..0b3d0b483 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -6,7 +6,11 @@ import noppes.npcs.api.handler.data.IActionChain; import noppes.npcs.api.handler.data.IActionQueue; import noppes.npcs.controllers.data.action.chain.ActionChain; -import java.util.*; +import java.util.ArrayList; +import java.util.Deque; +import java.util.Iterator; +import java.util.List; +import java.util.Queue; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.function.Consumer; @@ -47,6 +51,7 @@ public class ActionQueue implements IActionQueue { isWorking = false; return this; } + @Override public IActionManager getManager() { return manager; @@ -289,6 +294,7 @@ public class ActionQueue implements IActionQueue { return false; } + protected boolean tick(Action a) { if (a == null) return false; @@ -315,7 +321,7 @@ public class ActionQueue implements IActionQueue { if (!isParallel) { if (tick((Action) getCurrentAction())) - queue.pollFirst(); + queue.pollFirst(); } else { Iterator pit = queue.iterator(); while (pit.hasNext()) diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java index 813efd476..37e06c982 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java @@ -4,7 +4,11 @@ import noppes.npcs.api.handler.data.IAction; import java.util.Queue; import java.util.Set; -import java.util.concurrent.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java index 77f78bda6..bc35d2038 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java @@ -21,9 +21,24 @@ import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.command.ICommandSender; import net.minecraft.command.IEntitySelector; -import net.minecraft.entity.*; -import net.minecraft.entity.ai.*; +import net.minecraft.entity.DataWatcher; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityCreature; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.EnumCreatureAttribute; +import net.minecraft.entity.IRangedAttackMob; +import net.minecraft.entity.NPCEntityHelper; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.EntityAIAttackOnCollide; +import net.minecraft.entity.ai.EntityAIBase; +import net.minecraft.entity.ai.EntityAIHurtByTarget; +import net.minecraft.entity.ai.EntityAILeapAtTarget; +import net.minecraft.entity.ai.EntityAIOpenDoor; +import net.minecraft.entity.ai.EntityAIRestrictSun; +import net.minecraft.entity.ai.EntityAISwimming; +import net.minecraft.entity.ai.EntityAITasks; import net.minecraft.entity.ai.EntityAITasks.EntityAITaskEntry; +import net.minecraft.entity.ai.EntityMoveHelper; import net.minecraft.entity.boss.IBossDisplayData; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityMob; @@ -42,18 +57,60 @@ import net.minecraft.network.play.server.S0BPacketAnimation; import net.minecraft.pathfinding.PathNavigate; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.DamageSource; +import net.minecraft.util.IChatComponent; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.ServerChatEvent; -import noppes.npcs.*; +import noppes.npcs.CustomItems; +import noppes.npcs.CustomNpcs; +import noppes.npcs.DataAI; +import noppes.npcs.DataAdvanced; +import noppes.npcs.DataDisplay; +import noppes.npcs.DataInventory; +import noppes.npcs.DataStats; +import noppes.npcs.EventHooks; +import noppes.npcs.IChatMessages; +import noppes.npcs.NBTTags; +import noppes.npcs.NoppesUtilPlayer; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.NpcDamageSource; +import noppes.npcs.VersionCompatibility; +import noppes.npcs.ai.CombatHandler; +import noppes.npcs.ai.EntityAIAmbushTarget; +import noppes.npcs.ai.EntityAIAnimation; +import noppes.npcs.ai.EntityAIAttackTarget; +import noppes.npcs.ai.EntityAIAvoidTarget; +import noppes.npcs.ai.EntityAIBustDoor; +import noppes.npcs.ai.EntityAIDodgeShoot; +import noppes.npcs.ai.EntityAIFindShade; +import noppes.npcs.ai.EntityAIFollow; +import noppes.npcs.ai.EntityAIJob; +import noppes.npcs.ai.EntityAILook; import noppes.npcs.ai.EntityAIMoveIndoors; +import noppes.npcs.ai.EntityAIMovingPath; +import noppes.npcs.ai.EntityAIOrbitTarget; import noppes.npcs.ai.EntityAIPanic; +import noppes.npcs.ai.EntityAIPounceTarget; +import noppes.npcs.ai.EntityAIRangedAttack; +import noppes.npcs.ai.EntityAIReturn; +import noppes.npcs.ai.EntityAIRole; +import noppes.npcs.ai.EntityAISprintToTarget; +import noppes.npcs.ai.EntityAIStalkTarget; +import noppes.npcs.ai.EntityAITransform; import noppes.npcs.ai.EntityAIWander; import noppes.npcs.ai.EntityAIWatchClosest; -import noppes.npcs.ai.*; +import noppes.npcs.ai.EntityAIWaterNav; +import noppes.npcs.ai.EntityAIWorldLines; +import noppes.npcs.ai.EntityAIZigZagTarget; import noppes.npcs.ai.pathfinder.FlyingMoveHelper; import noppes.npcs.ai.pathfinder.PathNavigateFlying; import noppes.npcs.ai.selector.NPCAttackSelector; @@ -67,21 +124,46 @@ import noppes.npcs.api.item.IItemStack; import noppes.npcs.client.EntityUtil; import noppes.npcs.config.ConfigMain; import noppes.npcs.config.ConfigScript; -import noppes.npcs.constants.*; +import noppes.npcs.constants.EnumAnimation; +import noppes.npcs.constants.EnumCombatPolicy; +import noppes.npcs.constants.EnumJobType; +import noppes.npcs.constants.EnumMovingType; +import noppes.npcs.constants.EnumNavType; +import noppes.npcs.constants.EnumPotionType; +import noppes.npcs.constants.EnumRoleType; +import noppes.npcs.constants.EnumStandingType; import noppes.npcs.controllers.FactionController; import noppes.npcs.controllers.LinkedNpcController; import noppes.npcs.controllers.LinkedNpcController.LinkedData; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.DataScript; +import noppes.npcs.controllers.data.DataTransform; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.DialogOption; +import noppes.npcs.controllers.data.Faction; +import noppes.npcs.controllers.data.Line; +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.controllers.data.action.ActionManager; import noppes.npcs.entity.data.DataTimers; -import noppes.npcs.roles.*; +import noppes.npcs.roles.JobBard; +import noppes.npcs.roles.JobFollower; +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.NpcEvent; import noppes.npcs.util.GameProfileAlt; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.ConcurrentModificationException; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; public abstract class EntityNPCInterface extends EntityCreature implements IEntityAdditionalSpawnData, ICommandSender, IRangedAttackMob, IBossDisplayData { public ICustomNpc wrappedNPC; diff --git a/src/main/java/noppes/npcs/entity/EntityProjectile.java b/src/main/java/noppes/npcs/entity/EntityProjectile.java index 412d4813c..5391ff487 100644 --- a/src/main/java/noppes/npcs/entity/EntityProjectile.java +++ b/src/main/java/noppes/npcs/entity/EntityProjectile.java @@ -23,8 +23,14 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.network.play.server.S27PacketExplosion; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.DamageSource; +import net.minecraft.util.IChatComponent; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition.MovingObjectType; +import net.minecraft.util.Vec3; import net.minecraft.world.Explosion; import net.minecraft.world.World; import noppes.npcs.DataStats; diff --git a/src/main/java/noppes/npcs/items/ItemNpcTool.java b/src/main/java/noppes/npcs/items/ItemNpcTool.java index 3243fdc29..82d528eb2 100644 --- a/src/main/java/noppes/npcs/items/ItemNpcTool.java +++ b/src/main/java/noppes/npcs/items/ItemNpcTool.java @@ -144,39 +144,39 @@ public class ItemNpcTool extends Item { } public static boolean isPaintbrush(ItemStack itemStack) { - if(itemStack == null) + if (itemStack == null) return false; - if(itemStack.getItem() == null) + if (itemStack.getItem() == null) return false; - if(!(itemStack.getItem() instanceof ItemNpcTool)) + if (!(itemStack.getItem() instanceof ItemNpcTool)) return false; return itemStack.getItemDamage() == 1; } public static boolean isHammer(ItemStack itemStack) { - if(itemStack == null) + if (itemStack == null) return false; - if(itemStack.getItem() == null) + if (itemStack.getItem() == null) return false; - if(!(itemStack.getItem() instanceof ItemNpcTool)) + if (!(itemStack.getItem() instanceof ItemNpcTool)) return false; return itemStack.getItemDamage() == 0; } public static boolean isMagicBook(ItemStack itemStack) { - if(itemStack == null) + if (itemStack == null) return false; - if(itemStack.getItem() == null) + if (itemStack.getItem() == null) return false; - if(!(itemStack.getItem() instanceof ItemNpcTool)) + if (!(itemStack.getItem() instanceof ItemNpcTool)) return false; return itemStack.getItemDamage() == 2; diff --git a/src/main/java/noppes/npcs/quests/QuestDialog.java b/src/main/java/noppes/npcs/quests/QuestDialog.java index ea6bf3e73..6bcedde91 100644 --- a/src/main/java/noppes/npcs/quests/QuestDialog.java +++ b/src/main/java/noppes/npcs/quests/QuestDialog.java @@ -16,7 +16,13 @@ import noppes.npcs.controllers.data.Party; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.scripted.CustomNPCsException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; +import java.util.Vector; public class QuestDialog extends QuestInterface implements IQuestDialog { diff --git a/src/main/java/noppes/npcs/quests/QuestItem.java b/src/main/java/noppes/npcs/quests/QuestItem.java index a9302ff66..1e320258d 100644 --- a/src/main/java/noppes/npcs/quests/QuestItem.java +++ b/src/main/java/noppes/npcs/quests/QuestItem.java @@ -14,7 +14,13 @@ import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.util.ValueUtil; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.Vector; public class QuestItem extends QuestInterface implements IQuestItem { public NpcMiscInventory items = new NpcMiscInventory(3); diff --git a/src/main/java/noppes/npcs/quests/QuestKill.java b/src/main/java/noppes/npcs/quests/QuestKill.java index 70f283938..c83a95209 100644 --- a/src/main/java/noppes/npcs/quests/QuestKill.java +++ b/src/main/java/noppes/npcs/quests/QuestKill.java @@ -15,7 +15,13 @@ import noppes.npcs.controllers.data.PlayerQuestData; import noppes.npcs.controllers.data.QuestData; import noppes.npcs.scripted.CustomNPCsException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.Vector; public class QuestKill extends QuestInterface implements IQuestKill { public TreeMap targets = new TreeMap(); diff --git a/src/main/java/noppes/npcs/quests/QuestManual.java b/src/main/java/noppes/npcs/quests/QuestManual.java index 80a59709e..c9b14a165 100644 --- a/src/main/java/noppes/npcs/quests/QuestManual.java +++ b/src/main/java/noppes/npcs/quests/QuestManual.java @@ -14,8 +14,12 @@ import noppes.npcs.controllers.data.PlayerQuestData; import noppes.npcs.controllers.data.QuestData; import noppes.npcs.scripted.CustomNPCsException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; import java.util.Map.Entry; +import java.util.TreeMap; +import java.util.Vector; public class QuestManual extends QuestInterface { public TreeMap manuals = new TreeMap(); diff --git a/src/main/java/noppes/npcs/roles/JobSpawner.java b/src/main/java/noppes/npcs/roles/JobSpawner.java index a533a7625..42a509e5a 100644 --- a/src/main/java/noppes/npcs/roles/JobSpawner.java +++ b/src/main/java/noppes/npcs/roles/JobSpawner.java @@ -11,7 +11,11 @@ import noppes.npcs.compat.PixelmonHelper; import noppes.npcs.entity.EntityNPCInterface; import org.apache.commons.lang3.RandomStringUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; public class JobSpawner extends JobInterface { diff --git a/src/main/java/noppes/npcs/roles/RoleCompanion.java b/src/main/java/noppes/npcs/roles/RoleCompanion.java index 39209c238..93fdd9723 100644 --- a/src/main/java/noppes/npcs/roles/RoleCompanion.java +++ b/src/main/java/noppes/npcs/roles/RoleCompanion.java @@ -8,8 +8,13 @@ import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemArmor.ArmorMaterial; +import net.minecraft.item.ItemBow; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.DamageSource; @@ -17,14 +22,28 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; import noppes.npcs.NoppesUtilServer; import noppes.npcs.NpcMiscInventory; -import noppes.npcs.constants.*; +import noppes.npcs.constants.EnumAnimation; +import noppes.npcs.constants.EnumCompanionJobs; +import noppes.npcs.constants.EnumCompanionStage; +import noppes.npcs.constants.EnumCompanionTalent; +import noppes.npcs.constants.EnumGuiType; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.roles.companion.*; +import noppes.npcs.roles.companion.CompanionFarmer; +import noppes.npcs.roles.companion.CompanionFoodStats; +import noppes.npcs.roles.companion.CompanionGuard; +import noppes.npcs.roles.companion.CompanionJobInterface; +import noppes.npcs.roles.companion.CompanionTrader; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Random; +import java.util.TreeMap; +import java.util.UUID; public class RoleCompanion extends RoleInterface { public NpcMiscInventory inventory; diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java index 45f6b4644..79a6c2fa6 100644 --- a/src/main/java/noppes/npcs/scripted/NpcAPI.java +++ b/src/main/java/noppes/npcs/scripted/NpcAPI.java @@ -23,7 +23,12 @@ import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Items; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemEditableBook; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemWritableBook; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagString; @@ -39,12 +44,35 @@ import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.BiomeDictionary.Type; import noppes.npcs.CustomNpcs; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.api.*; +import noppes.npcs.api.AbstractNpcAPI; +import noppes.npcs.api.IBlock; +import noppes.npcs.api.ICommand; +import noppes.npcs.api.IContainer; +import noppes.npcs.api.IDamageSource; +import noppes.npcs.api.INbt; +import noppes.npcs.api.IParticle; +import noppes.npcs.api.IPos; +import noppes.npcs.api.ISkinOverlay; +import noppes.npcs.api.ITileEntity; +import noppes.npcs.api.IWorld; import noppes.npcs.api.entity.ICustomNpc; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.gui.ICustomGui; -import noppes.npcs.api.handler.*; +import noppes.npcs.api.handler.IActionManager; +import noppes.npcs.api.handler.IAnimationHandler; +import noppes.npcs.api.handler.IAttributeHandler; +import noppes.npcs.api.handler.ICloneHandler; +import noppes.npcs.api.handler.ICustomEffectHandler; +import noppes.npcs.api.handler.IDialogHandler; +import noppes.npcs.api.handler.IFactionHandler; +import noppes.npcs.api.handler.IMagicHandler; +import noppes.npcs.api.handler.INaturalSpawnsHandler; +import noppes.npcs.api.handler.IPartyHandler; +import noppes.npcs.api.handler.IProfileHandler; +import noppes.npcs.api.handler.IQuestHandler; +import noppes.npcs.api.handler.IRecipeHandler; +import noppes.npcs.api.handler.ITransportHandler; import noppes.npcs.api.handler.data.IAnimation; import noppes.npcs.api.handler.data.IFrame; import noppes.npcs.api.handler.data.IFramePart; @@ -55,24 +83,74 @@ import noppes.npcs.compat.PixelmonHelper; import noppes.npcs.config.ConfigScript; import noppes.npcs.constants.EnumAnimationPart; import noppes.npcs.containers.ContainerNpcInterface; -import noppes.npcs.controllers.*; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.AnimationController; +import noppes.npcs.controllers.ChunkController; +import noppes.npcs.controllers.CustomEffectController; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.FactionController; +import noppes.npcs.controllers.MagicController; +import noppes.npcs.controllers.PartyController; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.RecipeController; +import noppes.npcs.controllers.ScriptController; +import noppes.npcs.controllers.ScriptEntityData; +import noppes.npcs.controllers.ServerCloneController; +import noppes.npcs.controllers.SpawnController; +import noppes.npcs.controllers.TransportController; +import noppes.npcs.controllers.data.Animation; +import noppes.npcs.controllers.data.Frame; +import noppes.npcs.controllers.data.FramePart; +import noppes.npcs.controllers.data.SkinOverlay; import noppes.npcs.controllers.data.action.ActionManager; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.entity.EntityProjectile; import noppes.npcs.items.ItemLinked; import noppes.npcs.items.ItemScripted; -import noppes.npcs.scripted.entity.*; +import noppes.npcs.scripted.entity.ScriptAnimal; +import noppes.npcs.scripted.entity.ScriptArrow; +import noppes.npcs.scripted.entity.ScriptDBCPlayer; +import noppes.npcs.scripted.entity.ScriptEntity; +import noppes.npcs.scripted.entity.ScriptEntityItem; +import noppes.npcs.scripted.entity.ScriptFishHook; +import noppes.npcs.scripted.entity.ScriptLiving; +import noppes.npcs.scripted.entity.ScriptLivingBase; +import noppes.npcs.scripted.entity.ScriptMonster; +import noppes.npcs.scripted.entity.ScriptPixelmon; +import noppes.npcs.scripted.entity.ScriptPlayer; +import noppes.npcs.scripted.entity.ScriptProjectile; +import noppes.npcs.scripted.entity.ScriptThrowable; +import noppes.npcs.scripted.entity.ScriptVillager; import noppes.npcs.scripted.gui.ScriptGui; -import noppes.npcs.scripted.item.*; +import noppes.npcs.scripted.item.ScriptCustomItem; +import noppes.npcs.scripted.item.ScriptItemArmor; +import noppes.npcs.scripted.item.ScriptItemBlock; +import noppes.npcs.scripted.item.ScriptItemBook; +import noppes.npcs.scripted.item.ScriptItemStack; +import noppes.npcs.scripted.item.ScriptLinkedItem; import noppes.npcs.scripted.overlay.ScriptOverlay; -import noppes.npcs.util.*; +import noppes.npcs.util.CacheHashMap; +import noppes.npcs.util.JsonException; +import noppes.npcs.util.LRUHashMap; +import noppes.npcs.util.NBTJsonUtil; +import noppes.npcs.util.SizeOfObjectUtil; -import java.io.*; +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/src/main/java/noppes/npcs/scripted/ScriptBlock.java b/src/main/java/noppes/npcs/scripted/ScriptBlock.java index 074ba4269..5d50d4543 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptBlock.java +++ b/src/main/java/noppes/npcs/scripted/ScriptBlock.java @@ -8,7 +8,12 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import noppes.npcs.api.*; +import noppes.npcs.api.IBlock; +import noppes.npcs.api.IContainer; +import noppes.npcs.api.INbt; +import noppes.npcs.api.IPos; +import noppes.npcs.api.ITileEntity; +import noppes.npcs.api.IWorld; public class ScriptBlock implements IBlock { protected IWorld world; diff --git a/src/main/java/noppes/npcs/scripted/ScriptNbt.java b/src/main/java/noppes/npcs/scripted/ScriptNbt.java index 88471dc94..fcc26ac7f 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptNbt.java +++ b/src/main/java/noppes/npcs/scripted/ScriptNbt.java @@ -1,6 +1,13 @@ package noppes.npcs.scripted; -import net.minecraft.nbt.*; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagDouble; +import net.minecraft.nbt.NBTTagFloat; +import net.minecraft.nbt.NBTTagInt; +import net.minecraft.nbt.NBTTagIntArray; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.NBTTagString; import noppes.npcs.api.INbt; import noppes.npcs.util.NBTJsonUtil; diff --git a/src/main/java/noppes/npcs/scripted/ScriptParticle.java b/src/main/java/noppes/npcs/scripted/ScriptParticle.java index 11f8676be..9fb6689d1 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptParticle.java +++ b/src/main/java/noppes/npcs/scripted/ScriptParticle.java @@ -1,6 +1,11 @@ package noppes.npcs.scripted; -import net.minecraft.nbt.*; +import net.minecraft.nbt.NBTTagByte; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagDouble; +import net.minecraft.nbt.NBTTagFloat; +import net.minecraft.nbt.NBTTagInt; +import net.minecraft.nbt.NBTTagString; import noppes.npcs.NoppesUtilServer; import noppes.npcs.api.IParticle; import noppes.npcs.api.IPos; diff --git a/src/main/java/noppes/npcs/scripted/ScriptSound.java b/src/main/java/noppes/npcs/scripted/ScriptSound.java index 6afbb494f..b849ab2f6 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptSound.java +++ b/src/main/java/noppes/npcs/scripted/ScriptSound.java @@ -1,6 +1,11 @@ package noppes.npcs.scripted; -import net.minecraft.nbt.*; +import net.minecraft.nbt.NBTTagByte; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagDouble; +import net.minecraft.nbt.NBTTagFloat; +import net.minecraft.nbt.NBTTagInt; +import net.minecraft.nbt.NBTTagString; import noppes.npcs.api.IPos; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.handler.data.ISound; diff --git a/src/main/java/noppes/npcs/scripted/ScriptTileEntity.java b/src/main/java/noppes/npcs/scripted/ScriptTileEntity.java index 89dbbd2e3..a5293d251 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptTileEntity.java +++ b/src/main/java/noppes/npcs/scripted/ScriptTileEntity.java @@ -2,7 +2,11 @@ package noppes.npcs.scripted; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import noppes.npcs.api.*; +import noppes.npcs.api.IBlock; +import noppes.npcs.api.INbt; +import noppes.npcs.api.IPos; +import noppes.npcs.api.ITileEntity; +import noppes.npcs.api.IWorld; public class ScriptTileEntity implements ITileEntity { protected T tileEntity; diff --git a/src/main/java/noppes/npcs/scripted/ScriptWorld.java b/src/main/java/noppes/npcs/scripted/ScriptWorld.java index e2396e1bb..c9b806ca9 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptWorld.java +++ b/src/main/java/noppes/npcs/scripted/ScriptWorld.java @@ -11,7 +11,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntitySign; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; import net.minecraft.world.WorldServer; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.BlockSnapshot; @@ -19,7 +23,11 @@ import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.world.BlockEvent; import noppes.npcs.CustomNpcs; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.api.*; +import noppes.npcs.api.IBlock; +import noppes.npcs.api.IParticle; +import noppes.npcs.api.IPos; +import noppes.npcs.api.ITileEntity; +import noppes.npcs.api.IWorld; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.handler.data.ISound; @@ -30,7 +38,12 @@ import noppes.npcs.controllers.ServerCloneController; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.scoreboard.ScriptScoreboard; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; public class ScriptWorld implements IWorld { public WorldServer world; diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptArrow.java b/src/main/java/noppes/npcs/scripted/entity/ScriptArrow.java index 4e745a168..d5d5433c7 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptArrow.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptArrow.java @@ -14,7 +14,7 @@ public class ScriptArrow extends ScriptEntity implemen @Override public IEntity getShooter() { - if(entity.shootingEntity != null) + if (entity.shootingEntity != null) return NpcAPI.Instance().getIEntity(entity.shootingEntity); return null; } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java b/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java index cee7a89a4..caac8d87d 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java @@ -30,7 +30,12 @@ import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.ScriptParticle; import noppes.npcs.scripted.constants.EntityType; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; public class ScriptEntity implements IEntity { protected T entity; diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptFishHook.java b/src/main/java/noppes/npcs/scripted/entity/ScriptFishHook.java index 0455fa43b..56d97f4e0 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptFishHook.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptFishHook.java @@ -14,7 +14,7 @@ public class ScriptFishHook extends ScriptEntity im @Override public IPlayer getCaster() { - if(entity.field_146042_b != null) + if (entity.field_146042_b != null) return (IPlayer) NpcAPI.Instance().getIEntity(entity.field_146042_b); return null; } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java index 356d3bf5a..66a0c1c1b 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java @@ -11,12 +11,22 @@ import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.entity.data.IModelData; import noppes.npcs.api.handler.IActionManager; import noppes.npcs.api.handler.IOverlayHandler; -import noppes.npcs.api.handler.data.*; +import noppes.npcs.api.handler.data.IAnimationData; +import noppes.npcs.api.handler.data.IDialog; +import noppes.npcs.api.handler.data.IFaction; +import noppes.npcs.api.handler.data.ILines; +import noppes.npcs.api.handler.data.IMagicData; import noppes.npcs.api.item.IItemStack; import noppes.npcs.api.jobs.IJob; import noppes.npcs.api.roles.IRole; import noppes.npcs.config.ConfigMain; -import noppes.npcs.constants.*; +import noppes.npcs.constants.EnumAnimation; +import noppes.npcs.constants.EnumCombatPolicy; +import noppes.npcs.constants.EnumJobType; +import noppes.npcs.constants.EnumMovingType; +import noppes.npcs.constants.EnumNavType; +import noppes.npcs.constants.EnumRoleType; +import noppes.npcs.constants.EnumStandingType; import noppes.npcs.controllers.FactionController; import noppes.npcs.controllers.data.DialogOption; import noppes.npcs.controllers.data.Line; @@ -25,7 +35,21 @@ import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.constants.AnimationType; import noppes.npcs.scripted.constants.EntityType; -import noppes.npcs.scripted.roles.*; +import noppes.npcs.scripted.roles.ScriptJobBard; +import noppes.npcs.scripted.roles.ScriptJobConversation; +import noppes.npcs.scripted.roles.ScriptJobFollower; +import noppes.npcs.scripted.roles.ScriptJobGuard; +import noppes.npcs.scripted.roles.ScriptJobHealer; +import noppes.npcs.scripted.roles.ScriptJobInterface; +import noppes.npcs.scripted.roles.ScriptJobItemGiver; +import noppes.npcs.scripted.roles.ScriptJobSpawner; +import noppes.npcs.scripted.roles.ScriptRoleBank; +import noppes.npcs.scripted.roles.ScriptRoleCompanion; +import noppes.npcs.scripted.roles.ScriptRoleFollower; +import noppes.npcs.scripted.roles.ScriptRoleInterface; +import noppes.npcs.scripted.roles.ScriptRoleMailman; +import noppes.npcs.scripted.roles.ScriptRoleTrader; +import noppes.npcs.scripted.roles.ScriptRoleTransporter; import noppes.npcs.util.ValueUtil; import java.util.ArrayList; diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java index 68ce55aff..aa7152528 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java @@ -23,21 +23,43 @@ import noppes.npcs.CustomNpcsPermissions; import noppes.npcs.NoppesStringUtils; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.api.*; +import noppes.npcs.api.IBlock; +import noppes.npcs.api.IContainer; +import noppes.npcs.api.IParticle; +import noppes.npcs.api.IPixelmonPlayerData; +import noppes.npcs.api.IPos; +import noppes.npcs.api.IScreenSize; +import noppes.npcs.api.ITimers; +import noppes.npcs.api.IWorld; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.gui.ICustomGui; import noppes.npcs.api.handler.IActionManager; import noppes.npcs.api.handler.IOverlayHandler; -import noppes.npcs.api.handler.data.*; +import noppes.npcs.api.handler.data.IAnimationData; +import noppes.npcs.api.handler.data.IDialog; +import noppes.npcs.api.handler.data.IMagicData; +import noppes.npcs.api.handler.data.IPlayerAttributes; +import noppes.npcs.api.handler.data.IQuest; +import noppes.npcs.api.handler.data.ISound; import noppes.npcs.api.item.IItemStack; import noppes.npcs.api.overlay.ICustomOverlay; import noppes.npcs.compat.PixelmonHelper; import noppes.npcs.config.ConfigScript; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.containers.ContainerCustomGui; -import noppes.npcs.controllers.*; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.CustomGuiController; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.PartyController; +import noppes.npcs.controllers.PlayerQuestController; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerDialogData; +import noppes.npcs.controllers.data.PlayerQuestData; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.QuestData; import noppes.npcs.entity.EntityDialogNpc; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.ScriptPixelmonPlayerData; diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptThrowable.java b/src/main/java/noppes/npcs/scripted/entity/ScriptThrowable.java index 53d639335..1c8400d47 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptThrowable.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptThrowable.java @@ -1,7 +1,8 @@ package noppes.npcs.scripted.entity; import net.minecraft.entity.projectile.EntityThrowable; -import noppes.npcs.api.entity.*; +import noppes.npcs.api.entity.IEntityLivingBase; +import noppes.npcs.api.entity.IThrowable; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.constants.EntityType; @@ -13,7 +14,7 @@ public class ScriptThrowable extends ScriptEntity @Override public IEntityLivingBase getThrower() { - if(entity.getThrower() != null) + if (entity.getThrower() != null) return (IEntityLivingBase) NpcAPI.Instance().getIEntity(entity.getThrower()); return null; } diff --git a/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java b/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java index 950af113f..1ebc173f6 100644 --- a/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java @@ -1,12 +1,9 @@ package noppes.npcs.scripted.event; import cpw.mods.fml.common.eventhandler.Cancelable; -import noppes.npcs.api.handler.data.IRecipe; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.item.IItemStack; -import noppes.npcs.constants.EnumScriptType; import noppes.npcs.controllers.data.RecipeScript; -import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.event.player.PlayerEvent; public class RecipeScriptEvent extends PlayerEvent { diff --git a/src/main/java/noppes/npcs/scripted/event/player/PlayerEvent.java b/src/main/java/noppes/npcs/scripted/event/player/PlayerEvent.java index bf2225176..e6a303234 100644 --- a/src/main/java/noppes/npcs/scripted/event/player/PlayerEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/player/PlayerEvent.java @@ -13,16 +13,13 @@ import noppes.npcs.api.IDamageSource; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.entity.IEntityLivingBase; import noppes.npcs.api.entity.IPlayer; -import noppes.npcs.api.event.IItemEvent; import noppes.npcs.api.event.IPlayerEvent; import noppes.npcs.api.handler.data.IPlayerEffect; import noppes.npcs.api.handler.data.IProfile; -import noppes.npcs.api.item.IItemCustomizable; import noppes.npcs.api.item.IItemStack; import noppes.npcs.constants.EnumScriptType; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.event.CustomNPCsEvent; -import noppes.npcs.scripted.event.ItemEvent; public class PlayerEvent extends CustomNPCsEvent implements IPlayerEvent { public final IPlayer player; diff --git a/src/main/java/noppes/npcs/scripted/gui/ScriptGui.java b/src/main/java/noppes/npcs/scripted/gui/ScriptGui.java index a3d5a62be..0a6535182 100644 --- a/src/main/java/noppes/npcs/scripted/gui/ScriptGui.java +++ b/src/main/java/noppes/npcs/scripted/gui/ScriptGui.java @@ -5,7 +5,15 @@ import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.api.entity.IPlayer; -import noppes.npcs.api.gui.*; +import noppes.npcs.api.gui.IButton; +import noppes.npcs.api.gui.ICustomGui; +import noppes.npcs.api.gui.ICustomGuiComponent; +import noppes.npcs.api.gui.IItemSlot; +import noppes.npcs.api.gui.ILabel; +import noppes.npcs.api.gui.ILine; +import noppes.npcs.api.gui.IScroll; +import noppes.npcs.api.gui.ITextField; +import noppes.npcs.api.gui.ITexturedRect; import noppes.npcs.api.item.IItemStack; import noppes.npcs.controllers.CustomGuiController; import noppes.npcs.controllers.ScriptController; diff --git a/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java b/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java index 7a3e2fdbf..0103a9af2 100644 --- a/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java +++ b/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java @@ -12,7 +12,11 @@ import noppes.npcs.controllers.ScriptController; import noppes.npcs.controllers.data.INpcScriptHandler; import noppes.npcs.scripted.CustomNPCsException; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.TreeMap; public class ScriptCustomItem extends ScriptCustomizableItem implements IItemCustom, INpcScriptHandler { public List scripts = new ArrayList(); diff --git a/src/main/java/noppes/npcs/scripted/item/ScriptItemStack.java b/src/main/java/noppes/npcs/scripted/item/ScriptItemStack.java index 8e80f3eb6..6736369b9 100644 --- a/src/main/java/noppes/npcs/scripted/item/ScriptItemStack.java +++ b/src/main/java/noppes/npcs/scripted/item/ScriptItemStack.java @@ -9,7 +9,14 @@ import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemEditableBook; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; +import net.minecraft.item.ItemWritableBook; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTBase.NBTPrimitive; import net.minecraft.nbt.NBTTagCompound; @@ -25,7 +32,11 @@ import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.ScriptNbt; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; public class ScriptItemStack implements IItemStack { public ItemStack item; diff --git a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlay.java b/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlay.java index 7da5ade14..23ae8a89c 100644 --- a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlay.java +++ b/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlay.java @@ -4,7 +4,11 @@ import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.api.entity.IPlayer; -import noppes.npcs.api.overlay.*; +import noppes.npcs.api.overlay.ICustomOverlay; +import noppes.npcs.api.overlay.ICustomOverlayComponent; +import noppes.npcs.api.overlay.IOverlayLabel; +import noppes.npcs.api.overlay.IOverlayLine; +import noppes.npcs.api.overlay.IOverlayTexturedRect; import noppes.npcs.controllers.CustomGuiController; import java.util.ArrayList; diff --git a/src/main/java/noppes/npcs/scripted/scoreboard/ScriptScoreboard.java b/src/main/java/noppes/npcs/scripted/scoreboard/ScriptScoreboard.java index 8ab5de0b1..08582cb03 100644 --- a/src/main/java/noppes/npcs/scripted/scoreboard/ScriptScoreboard.java +++ b/src/main/java/noppes/npcs/scripted/scoreboard/ScriptScoreboard.java @@ -1,6 +1,10 @@ package noppes.npcs.scripted.scoreboard; -import net.minecraft.scoreboard.*; +import net.minecraft.scoreboard.IScoreObjectiveCriteria; +import net.minecraft.scoreboard.Score; +import net.minecraft.scoreboard.ScoreObjective; +import net.minecraft.scoreboard.ScorePlayerTeam; +import net.minecraft.scoreboard.Scoreboard; import net.minecraft.server.MinecraftServer; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.scoreboard.IScoreboard; diff --git a/src/main/java/noppes/npcs/util/NBTJsonUtil.java b/src/main/java/noppes/npcs/util/NBTJsonUtil.java index 94f8756e2..fb2974f19 100644 --- a/src/main/java/noppes/npcs/util/NBTJsonUtil.java +++ b/src/main/java/noppes/npcs/util/NBTJsonUtil.java @@ -2,11 +2,27 @@ package noppes.npcs.util; import com.google.common.io.Files; import cpw.mods.fml.common.ObfuscationReflectionHelper; -import net.minecraft.nbt.*; +import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagByte; +import net.minecraft.nbt.NBTTagByteArray; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagDouble; +import net.minecraft.nbt.NBTTagFloat; +import net.minecraft.nbt.NBTTagInt; +import net.minecraft.nbt.NBTTagIntArray; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.NBTTagLong; +import net.minecraft.nbt.NBTTagShort; +import net.minecraft.nbt.NBTTagString; import noppes.npcs.LogWriter; import org.apache.commons.io.Charsets; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/tconstruct/client/tabs/InventoryTabCustomNpc.java b/src/main/java/tconstruct/client/tabs/InventoryTabCustomNpc.java index e6e63b402..e52742812 100644 --- a/src/main/java/tconstruct/client/tabs/InventoryTabCustomNpc.java +++ b/src/main/java/tconstruct/client/tabs/InventoryTabCustomNpc.java @@ -4,7 +4,12 @@ import net.minecraft.client.Minecraft; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import noppes.npcs.CustomItems; -import noppes.npcs.client.gui.player.inventory.*; +import noppes.npcs.client.gui.player.inventory.GuiCNPCInventory; +import noppes.npcs.client.gui.player.inventory.GuiFaction; +import noppes.npcs.client.gui.player.inventory.GuiParty; +import noppes.npcs.client.gui.player.inventory.GuiProfiles; +import noppes.npcs.client.gui.player.inventory.GuiQuestLog; +import noppes.npcs.client.gui.player.inventory.GuiSettings; public class InventoryTabCustomNpc extends AbstractTab { public InventoryTabCustomNpc() {