diff --git a/src/main/java/noppes/npcs/CommonProxy.java b/src/main/java/noppes/npcs/CommonProxy.java index 280785d26..067e2f1b3 100644 --- a/src/main/java/noppes/npcs/CommonProxy.java +++ b/src/main/java/noppes/npcs/CommonProxy.java @@ -1,5 +1,6 @@ package noppes.npcs; +import cpw.mods.fml.common.network.IGuiHandler; import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -9,13 +10,12 @@ import net.minecraft.item.Item; import net.minecraft.stats.Achievement; import net.minecraft.world.World; 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.controllers.data.PlayerData; import noppes.npcs.entity.EntityNPCInterface; -import cpw.mods.fml.common.network.IGuiHandler; -import noppes.npcs.api.IWorld; public class CommonProxy implements IGuiHandler { diff --git a/src/main/java/noppes/npcs/CustomItems.java b/src/main/java/noppes/npcs/CustomItems.java index ebf237c6b..105d1bbc9 100644 --- a/src/main/java/noppes/npcs/CustomItems.java +++ b/src/main/java/noppes/npcs/CustomItems.java @@ -1,80 +1,23 @@ package noppes.npcs; +import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.BehaviorDefaultDispenseItem; import net.minecraft.dispenser.IBlockSource; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.Item; +import net.minecraft.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.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.BlockLamp; -import noppes.npcs.blocks.BlockMailbox; -import noppes.npcs.blocks.BlockNpcRedstone; -import noppes.npcs.blocks.BlockPedestal; -import noppes.npcs.blocks.BlockPlaceholder; -import noppes.npcs.blocks.BlockShelf; -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.TileShelf; -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.blocks.*; +import noppes.npcs.blocks.tiles.*; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumNpcToolMaterial; import noppes.npcs.items.*; -import cpw.mods.fml.common.registry.GameRegistry; public class CustomItems { diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index ac847550b..cc7ea3699 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -20,8 +20,8 @@ import net.minecraft.server.MinecraftServer; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.MinecraftForge; import nikedemos.markovnames.generators.*; -import noppes.npcs.config.LoadConfiguration; import noppes.npcs.config.ConfigMain; +import noppes.npcs.config.LoadConfiguration; import noppes.npcs.config.legacy.LegacyConfig; import noppes.npcs.controllers.*; import noppes.npcs.enchants.EnchantInterface; diff --git a/src/main/java/noppes/npcs/CustomNpcsPermissions.java b/src/main/java/noppes/npcs/CustomNpcsPermissions.java index 25abbd4ec..5f18f2afe 100644 --- a/src/main/java/noppes/npcs/CustomNpcsPermissions.java +++ b/src/main/java/noppes/npcs/CustomNpcsPermissions.java @@ -1,19 +1,14 @@ package noppes.npcs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import org.apache.logging.log4j.LogManager; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.List; -import java.util.logging.Logger; - -import org.apache.logging.log4j.LogManager; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import noppes.npcs.CustomNpcsPermissions.Permission; -import noppes.npcs.constants.EnumPacketServer; public class CustomNpcsPermissions{ diff --git a/src/main/java/noppes/npcs/DataAI.java b/src/main/java/noppes/npcs/DataAI.java index 0c8689122..7e4236374 100644 --- a/src/main/java/noppes/npcs/DataAI.java +++ b/src/main/java/noppes/npcs/DataAI.java @@ -1,8 +1,5 @@ package noppes.npcs; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; @@ -12,6 +9,9 @@ import noppes.npcs.constants.EnumNavType; import noppes.npcs.constants.EnumStandingType; import noppes.npcs.entity.EntityNPCInterface; +import java.util.ArrayList; +import java.util.List; + public class DataAI { private EntityNPCInterface npc; diff --git a/src/main/java/noppes/npcs/DataAdvanced.java b/src/main/java/noppes/npcs/DataAdvanced.java index 4bffc1564..6d0dbea3a 100644 --- a/src/main/java/noppes/npcs/DataAdvanced.java +++ b/src/main/java/noppes/npcs/DataAdvanced.java @@ -1,7 +1,5 @@ package noppes.npcs; -import java.util.HashMap; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.constants.EnumJobType; @@ -12,20 +10,9 @@ import noppes.npcs.controllers.data.FactionOptions; import noppes.npcs.controllers.data.Line; import noppes.npcs.controllers.data.Lines; import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.roles.JobBard; -import noppes.npcs.roles.JobChunkLoader; -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 noppes.npcs.roles.*; + +import java.util.HashMap; public class DataAdvanced { diff --git a/src/main/java/noppes/npcs/DataDisplay.java b/src/main/java/noppes/npcs/DataDisplay.java index b34474c82..9e982c8f3 100644 --- a/src/main/java/noppes/npcs/DataDisplay.java +++ b/src/main/java/noppes/npcs/DataDisplay.java @@ -1,7 +1,8 @@ package noppes.npcs; -import java.util.*; - +import com.google.common.collect.Iterables; +import com.mojang.authlib.GameProfile; +import com.mojang.authlib.properties.Property; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; @@ -14,9 +15,9 @@ import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.entity.data.DataSkinOverlays; import noppes.npcs.util.ValueUtil; -import com.google.common.collect.Iterables; -import com.mojang.authlib.GameProfile; -import com.mojang.authlib.properties.Property; +import java.util.ArrayList; +import java.util.Random; +import java.util.UUID; public class DataDisplay { public EntityNPCInterface npc; diff --git a/src/main/java/noppes/npcs/DataInventory.java b/src/main/java/noppes/npcs/DataInventory.java index 9d2ff9c8e..22fb23edc 100644 --- a/src/main/java/noppes/npcs/DataInventory.java +++ b/src/main/java/noppes/npcs/DataInventory.java @@ -1,8 +1,5 @@ package noppes.npcs; -import java.util.ArrayList; -import java.util.HashMap; - import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -16,6 +13,9 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import noppes.npcs.entity.EntityNPCInterface; +import java.util.ArrayList; +import java.util.HashMap; + public class DataInventory implements IInventory{ public HashMap items = new HashMap(); public HashMap dropchance = new HashMap(); diff --git a/src/main/java/noppes/npcs/EventHooks.java b/src/main/java/noppes/npcs/EventHooks.java index 1a83606ab..94bf5af59 100644 --- a/src/main/java/noppes/npcs/EventHooks.java +++ b/src/main/java/noppes/npcs/EventHooks.java @@ -15,33 +15,24 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.event.entity.EntityEvent; import net.minecraftforge.event.world.WorldEvent; -import noppes.npcs.api.IPos; import noppes.npcs.api.IWorld; -import noppes.npcs.controllers.*; -import noppes.npcs.controllers.data.*; -import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.scripted.event.*; -import noppes.npcs.scripted.event.PlayerEvent.ChatEvent; -import noppes.npcs.scripted.event.PlayerEvent.ContainerOpen; -import noppes.npcs.scripted.event.PlayerEvent.DamagedEntityEvent; -import noppes.npcs.scripted.event.PlayerEvent.KeyPressedEvent; -import noppes.npcs.scripted.event.PlayerEvent.LoginEvent; -import noppes.npcs.scripted.event.PlayerEvent.LogoutEvent; -import noppes.npcs.scripted.event.PlayerEvent.PickUpEvent; -import noppes.npcs.scripted.event.PlayerEvent.DropEvent; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.gui.ICustomGui; -import noppes.npcs.api.handler.data.INaturalSpawn; import noppes.npcs.api.item.IItemCustom; import noppes.npcs.api.item.IItemStack; -import noppes.npcs.scripted.NpcAPI; import noppes.npcs.constants.EnumScriptType; +import noppes.npcs.controllers.CustomGuiController; +import noppes.npcs.controllers.ScriptController; +import noppes.npcs.controllers.data.*; +import noppes.npcs.entity.EntityNPCInterface; +import noppes.npcs.scripted.NpcAPI; +import noppes.npcs.scripted.event.*; +import noppes.npcs.scripted.event.PlayerEvent.*; import noppes.npcs.scripted.item.ScriptCustomItem; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/noppes/npcs/LogWriter.java b/src/main/java/noppes/npcs/LogWriter.java index c373fe6f2..183a8a14e 100644 --- a/src/main/java/noppes/npcs/LogWriter.java +++ b/src/main/java/noppes/npcs/LogWriter.java @@ -1,26 +1,15 @@ package noppes.npcs; import noppes.npcs.config.ConfigDebug; -import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumScriptType; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; +import java.io.*; 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.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; +import java.util.logging.*; public class LogWriter { private final static String name = "CustomNPCs"; diff --git a/src/main/java/noppes/npcs/ModelDataShared.java b/src/main/java/noppes/npcs/ModelDataShared.java index 691bc338f..3b0c2cbe6 100644 --- a/src/main/java/noppes/npcs/ModelDataShared.java +++ b/src/main/java/noppes/npcs/ModelDataShared.java @@ -1,15 +1,11 @@ package noppes.npcs; -import java.util.HashMap; - -import net.minecraft.entity.EntityAgeable; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.passive.EntityBat; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.world.World; + +import java.util.HashMap; public class ModelDataShared{ diff --git a/src/main/java/noppes/npcs/NBTTags.java b/src/main/java/noppes/npcs/NBTTags.java index d3cc4bdca..9815f70fa 100644 --- a/src/main/java/noppes/npcs/NBTTags.java +++ b/src/main/java/noppes/npcs/NBTTags.java @@ -1,7 +1,5 @@ package noppes.npcs; -import java.util.*; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; @@ -10,6 +8,8 @@ import net.minecraft.nbt.NBTTagList; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.data.IScriptHandler; +import java.util.*; + public class NBTTags { public static HashMap getItemStackList( diff --git a/src/main/java/noppes/npcs/NPCSpawning.java b/src/main/java/noppes/npcs/NPCSpawning.java index 5662dcc5c..0363aae1b 100644 --- a/src/main/java/noppes/npcs/NPCSpawning.java +++ b/src/main/java/noppes/npcs/NPCSpawning.java @@ -1,24 +1,22 @@ package noppes.npcs; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Random; -import java.util.Set; - import com.google.common.collect.Sets; - import cpw.mods.fml.common.eventhandler.Event.Result; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.entity.*; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EnumCreatureType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.*; +import net.minecraft.world.ChunkCoordIntPair; +import net.minecraft.world.ChunkPosition; +import net.minecraft.world.World; +import net.minecraft.world.WorldServer; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.event.ForgeEventFactory; @@ -29,6 +27,8 @@ import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.event.CustomNPCsEvent; +import java.util.*; + 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 91099f252..9031c75c6 100644 --- a/src/main/java/noppes/npcs/NoppesStringUtils.java +++ b/src/main/java/noppes/npcs/NoppesStringUtils.java @@ -1,19 +1,14 @@ package noppes.npcs; -import java.awt.Toolkit; -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; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.StatCollector; import noppes.npcs.entity.EntityNPCInterface; +import java.awt.*; +import java.awt.datatransfer.*; +import java.io.IOException; +import java.util.Arrays; + public class NoppesStringUtils { final static int[] illegalChars = {34, 60, 62, 124, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 58, 42, 63, 92, 47}; diff --git a/src/main/java/noppes/npcs/NoppesUtilPlayer.java b/src/main/java/noppes/npcs/NoppesUtilPlayer.java index 3de2d457e..9f6e55698 100644 --- a/src/main/java/noppes/npcs/NoppesUtilPlayer.java +++ b/src/main/java/noppes/npcs/NoppesUtilPlayer.java @@ -1,14 +1,8 @@ package noppes.npcs; +import cpw.mods.fml.common.network.internal.FMLProxyPacket; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; @@ -21,7 +15,9 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.ChatComponentText; import net.minecraft.world.WorldServer; import net.minecraftforge.oredict.OreDictionary; -import noppes.npcs.api.handler.data.IQuest; +import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.api.handler.data.IQuestObjective; +import noppes.npcs.api.item.IItemStack; import noppes.npcs.constants.EnumOptionType; import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumPlayerPacket; @@ -33,14 +29,16 @@ import noppes.npcs.controllers.*; import noppes.npcs.controllers.data.*; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleFollower; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; +import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.ScriptSound; import noppes.npcs.scripted.event.DialogEvent; import noppes.npcs.scripted.event.QuestEvent; -import noppes.npcs.api.entity.IPlayer; -import noppes.npcs.api.handler.data.IQuestObjective; -import noppes.npcs.api.item.IItemStack; -import noppes.npcs.scripted.NpcAPI; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; public class NoppesUtilPlayer { diff --git a/src/main/java/noppes/npcs/NoppesUtilServer.java b/src/main/java/noppes/npcs/NoppesUtilServer.java index 51f86cda9..f6d8f0b5e 100644 --- a/src/main/java/noppes/npcs/NoppesUtilServer.java +++ b/src/main/java/noppes/npcs/NoppesUtilServer.java @@ -1,25 +1,11 @@ package noppes.npcs; import io.netty.buffer.ByteBuf; - -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.io.File; -import java.io.IOException; -import java.text.DecimalFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.zip.GZIPOutputStream; - import net.minecraft.command.server.CommandBlockLogic; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.passive.EntityBat; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.projectile.EntityArrow; @@ -37,8 +23,7 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.EntityJoinWorldEvent; +import noppes.npcs.api.entity.IPlayer; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumPlayerData; @@ -53,7 +38,14 @@ import noppes.npcs.roles.RoleTransporter; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.ScriptSound; import noppes.npcs.scripted.event.DialogEvent; -import noppes.npcs.api.entity.IPlayer; + +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.io.File; +import java.io.IOException; +import java.text.DecimalFormat; +import java.util.*; +import java.util.zip.GZIPOutputStream; public class NoppesUtilServer { private static HashMap editingQuests = new HashMap(); diff --git a/src/main/java/noppes/npcs/NpcMiscInventory.java b/src/main/java/noppes/npcs/NpcMiscInventory.java index 4636af202..cb55f45b8 100644 --- a/src/main/java/noppes/npcs/NpcMiscInventory.java +++ b/src/main/java/noppes/npcs/NpcMiscInventory.java @@ -1,12 +1,12 @@ package noppes.npcs; -import java.util.HashMap; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import java.util.HashMap; + public class NpcMiscInventory implements IInventory { public HashMap items = new HashMap(); public int stackLimit = 64; diff --git a/src/main/java/noppes/npcs/PacketHandlerPlayer.java b/src/main/java/noppes/npcs/PacketHandlerPlayer.java index 9299b060a..80efb2d71 100644 --- a/src/main/java/noppes/npcs/PacketHandlerPlayer.java +++ b/src/main/java/noppes/npcs/PacketHandlerPlayer.java @@ -1,10 +1,8 @@ package noppes.npcs; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent; import io.netty.buffer.ByteBuf; - -import java.io.IOException; -import java.util.Iterator; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Items; import net.minecraft.item.ItemEditableBook; @@ -18,12 +16,15 @@ import noppes.npcs.blocks.tiles.TileBigSign; import noppes.npcs.blocks.tiles.TileBook; import noppes.npcs.constants.*; import noppes.npcs.containers.ContainerMail; -import noppes.npcs.controllers.*; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.PlayerQuestController; +import noppes.npcs.controllers.ScriptController; import noppes.npcs.controllers.data.*; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleCompanion; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent; + +import java.io.IOException; +import java.util.Iterator; public class PacketHandlerPlayer{ diff --git a/src/main/java/noppes/npcs/PacketHandlerServer.java b/src/main/java/noppes/npcs/PacketHandlerServer.java index bf12bed85..6215d9bf6 100644 --- a/src/main/java/noppes/npcs/PacketHandlerServer.java +++ b/src/main/java/noppes/npcs/PacketHandlerServer.java @@ -1,16 +1,11 @@ package noppes.npcs; import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent; import cpw.mods.fml.relauncher.Side; import foxz.utils.Market; import io.netty.buffer.ByteBuf; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Set; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.passive.EntityVillager; @@ -31,16 +26,11 @@ import net.minecraft.village.MerchantRecipeList; import net.minecraft.world.WorldProvider; import net.minecraft.world.WorldServer; import net.minecraftforge.common.DimensionManager; +import noppes.npcs.api.entity.IPlayer; import noppes.npcs.config.ConfigDebug; import noppes.npcs.config.ConfigMain; import noppes.npcs.config.ConfigScript; -import noppes.npcs.constants.EnumCompanionStage; -import noppes.npcs.constants.EnumGuiType; -import noppes.npcs.constants.EnumJobType; -import noppes.npcs.constants.EnumPacketClient; -import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.constants.EnumPlayerData; -import noppes.npcs.constants.EnumRoleType; +import noppes.npcs.constants.*; import noppes.npcs.containers.ContainerCustomGui; import noppes.npcs.containers.ContainerMail; import noppes.npcs.controllers.*; @@ -52,13 +42,16 @@ import noppes.npcs.roles.JobSpawner; import noppes.npcs.roles.RoleCompanion; import noppes.npcs.roles.RoleTrader; import noppes.npcs.roles.RoleTransporter; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.gui.ScriptGui; -import noppes.npcs.api.entity.IPlayer; import noppes.npcs.scripted.item.ScriptCustomItem; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Set; + public class PacketHandlerServer{ @SubscribeEvent diff --git a/src/main/java/noppes/npcs/QuestLogData.java b/src/main/java/noppes/npcs/QuestLogData.java index 89c45fa1c..22ea6ce7a 100644 --- a/src/main/java/noppes/npcs/QuestLogData.java +++ b/src/main/java/noppes/npcs/QuestLogData.java @@ -1,16 +1,16 @@ package noppes.npcs; -import java.util.HashMap; -import java.util.Vector; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.constants.EnumQuestCompletion; -import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.PlayerQuestController; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.data.Quest; +import java.util.HashMap; +import java.util.Vector; + public class QuestLogData { public String trackedQuestKey = ""; public HashMap> categories = new HashMap>(); diff --git a/src/main/java/noppes/npcs/ScriptItemEventHandler.java b/src/main/java/noppes/npcs/ScriptItemEventHandler.java index aac7058b7..7bb0cae37 100644 --- a/src/main/java/noppes/npcs/ScriptItemEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptItemEventHandler.java @@ -11,13 +11,13 @@ import net.minecraftforge.event.entity.item.ItemTossEvent; import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.event.entity.player.EntityInteractEvent; import net.minecraftforge.event.entity.player.PlayerUseItemEvent; -import noppes.npcs.entity.EntityCustomNpc; -import noppes.npcs.items.ItemScripted; -import noppes.npcs.scripted.event.ItemEvent; +import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.item.IItemCustom; import noppes.npcs.api.item.IItemStack; -import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.entity.EntityCustomNpc; +import noppes.npcs.items.ItemScripted; import noppes.npcs.scripted.NpcAPI; +import noppes.npcs.scripted.event.ItemEvent; import java.util.HashMap; diff --git a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java index 29ac28b0e..45066d94f 100644 --- a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java @@ -22,15 +22,16 @@ 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.world.*; +import net.minecraftforge.event.world.BlockEvent; +import noppes.npcs.api.entity.IPlayer; import noppes.npcs.constants.EnumPacketClient; -import noppes.npcs.controllers.*; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.ScriptController; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.data.PlayerDataScript; import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.api.entity.IPlayer; public class ScriptPlayerEventHandler { public ScriptPlayerEventHandler() { diff --git a/src/main/java/noppes/npcs/Server.java b/src/main/java/noppes/npcs/Server.java index 900b1c968..23fe3a363 100644 --- a/src/main/java/noppes/npcs/Server.java +++ b/src/main/java/noppes/npcs/Server.java @@ -1,15 +1,10 @@ package noppes.npcs; +import com.google.common.base.Charsets; +import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.common.network.internal.FMLProxyPacket; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; - -import java.io.EOFException; -import java.io.IOException; -import java.util.List; -import java.util.Map; - -import com.google.common.base.Charsets; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.CompressedStreamTools; @@ -18,9 +13,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; import net.minecraft.village.MerchantRecipeList; import noppes.npcs.constants.EnumPacketClient; -import cpw.mods.fml.common.network.ByteBufUtils; -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; + +import java.io.IOException; +import java.util.List; +import java.util.Map; public class Server { diff --git a/src/main/java/noppes/npcs/ServerEventsHandler.java b/src/main/java/noppes/npcs/ServerEventsHandler.java index 1476752e3..3771af74b 100644 --- a/src/main/java/noppes/npcs/ServerEventsHandler.java +++ b/src/main/java/noppes/npcs/ServerEventsHandler.java @@ -1,9 +1,5 @@ package noppes.npcs; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; @@ -40,7 +36,9 @@ import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.constants.EnumRoleType; -import noppes.npcs.controllers.*; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.RecipeController; +import noppes.npcs.controllers.ServerCloneController; import noppes.npcs.controllers.data.*; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.items.ItemExcalibur; @@ -50,6 +48,10 @@ import noppes.npcs.quests.QuestItem; import noppes.npcs.quests.QuestKill; import noppes.npcs.roles.RoleFollower; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + public class ServerEventsHandler { public static EntityVillager Merchant; diff --git a/src/main/java/noppes/npcs/ServerTickHandler.java b/src/main/java/noppes/npcs/ServerTickHandler.java index e379460fd..4ef57f89e 100644 --- a/src/main/java/noppes/npcs/ServerTickHandler.java +++ b/src/main/java/noppes/npcs/ServerTickHandler.java @@ -1,17 +1,15 @@ package noppes.npcs; -import java.net.InetAddress; -import java.net.UnknownHostException; - -import net.minecraft.server.MinecraftServer; -import net.minecraft.world.WorldServer; -import noppes.npcs.client.AnalyticsTracking; -import noppes.npcs.controllers.SpawnController; -import noppes.npcs.entity.EntityNPCInterface; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.WorldServer; +import noppes.npcs.client.AnalyticsTracking; + +import java.net.InetAddress; +import java.net.UnknownHostException; public class ServerTickHandler { @SubscribeEvent diff --git a/src/main/java/noppes/npcs/TextBlock.java b/src/main/java/noppes/npcs/TextBlock.java index ed6c2b7cf..91978b1a5 100644 --- a/src/main/java/noppes/npcs/TextBlock.java +++ b/src/main/java/noppes/npcs/TextBlock.java @@ -1,10 +1,10 @@ package noppes.npcs; +import net.minecraft.util.IChatComponent; + import java.util.ArrayList; import java.util.List; -import net.minecraft.util.IChatComponent; - public class TextBlock { public List lines = new ArrayList(); } diff --git a/src/main/java/noppes/npcs/VersionCompatibility.java b/src/main/java/noppes/npcs/VersionCompatibility.java index 39886c4e0..8abebf4f6 100644 --- a/src/main/java/noppes/npcs/VersionCompatibility.java +++ b/src/main/java/noppes/npcs/VersionCompatibility.java @@ -1,17 +1,15 @@ package noppes.npcs; -import java.util.Collection; -import java.util.List; - import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagInt; import net.minecraft.nbt.NBTTagList; import noppes.npcs.controllers.data.Line; import noppes.npcs.controllers.data.Lines; -import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; -import org.lwjgl.Sys; + +import java.util.Collection; +import java.util.List; public class VersionCompatibility { public static int ModRev = 19; diff --git a/src/main/java/noppes/npcs/ai/EntityAIAmbushTarget.java b/src/main/java/noppes/npcs/ai/EntityAIAmbushTarget.java index d65952e67..592647238 100644 --- a/src/main/java/noppes/npcs/ai/EntityAIAmbushTarget.java +++ b/src/main/java/noppes/npcs/ai/EntityAIAmbushTarget.java @@ -1,11 +1,7 @@ package noppes.npcs.ai; -import java.util.Random; - -import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIBase; -import net.minecraft.pathfinding.PathEntity; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; @@ -13,6 +9,8 @@ import net.minecraft.world.World; import noppes.npcs.constants.AiMutex; import noppes.npcs.entity.EntityNPCInterface; +import java.util.Random; + public class EntityAIAmbushTarget extends EntityAIBase { private EntityNPCInterface theEntity; diff --git a/src/main/java/noppes/npcs/ai/EntityAIAnimation.java b/src/main/java/noppes/npcs/ai/EntityAIAnimation.java index cd56f70ec..dfdf8c648 100644 --- a/src/main/java/noppes/npcs/ai/EntityAIAnimation.java +++ b/src/main/java/noppes/npcs/ai/EntityAIAnimation.java @@ -1,7 +1,6 @@ package noppes.npcs.ai; import net.minecraft.entity.ai.EntityAIBase; -import noppes.npcs.constants.AiMutex; import noppes.npcs.constants.EnumAnimation; import noppes.npcs.constants.EnumMovingType; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/ai/EntityAIAttackTarget.java b/src/main/java/noppes/npcs/ai/EntityAIAttackTarget.java index c4fda8969..a7e411f2a 100644 --- a/src/main/java/noppes/npcs/ai/EntityAIAttackTarget.java +++ b/src/main/java/noppes/npcs/ai/EntityAIAttackTarget.java @@ -6,7 +6,6 @@ import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.pathfinding.PathEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import noppes.npcs.CustomNpcs; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.AiMutex; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/ai/EntityAIAvoidTarget.java b/src/main/java/noppes/npcs/ai/EntityAIAvoidTarget.java index 7f711ce95..2ae0724a0 100644 --- a/src/main/java/noppes/npcs/ai/EntityAIAvoidTarget.java +++ b/src/main/java/noppes/npcs/ai/EntityAIAvoidTarget.java @@ -1,11 +1,8 @@ package noppes.npcs.ai; -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIBase; -import net.minecraft.entity.ai.RandomPositionGenerator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.pathfinding.PathEntity; import net.minecraft.pathfinding.PathNavigate; @@ -14,6 +11,8 @@ import noppes.npcs.constants.AiMutex; import noppes.npcs.constants.EnumNavType; import noppes.npcs.entity.EntityNPCInterface; +import java.util.List; + public class EntityAIAvoidTarget extends EntityAIBase { /** The entity we are attached to */ diff --git a/src/main/java/noppes/npcs/ai/EntityAIDodgeShoot.java b/src/main/java/noppes/npcs/ai/EntityAIDodgeShoot.java index 3a280b339..371e0dfba 100644 --- a/src/main/java/noppes/npcs/ai/EntityAIDodgeShoot.java +++ b/src/main/java/noppes/npcs/ai/EntityAIDodgeShoot.java @@ -2,7 +2,6 @@ package noppes.npcs.ai; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIBase; -import net.minecraft.entity.ai.RandomPositionGenerator; import net.minecraft.util.Vec3; import noppes.npcs.constants.AiMutex; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/ai/EntityAIFindShade.java b/src/main/java/noppes/npcs/ai/EntityAIFindShade.java index ebd29793b..5d24047ff 100644 --- a/src/main/java/noppes/npcs/ai/EntityAIFindShade.java +++ b/src/main/java/noppes/npcs/ai/EntityAIFindShade.java @@ -1,7 +1,5 @@ package noppes.npcs.ai; -import java.util.Random; - import net.minecraft.entity.EntityCreature; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.util.MathHelper; @@ -9,6 +7,8 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; import noppes.npcs.constants.AiMutex; +import java.util.Random; + public class EntityAIFindShade extends EntityAIBase { private EntityCreature theCreature; diff --git a/src/main/java/noppes/npcs/ai/EntityAIFollow.java b/src/main/java/noppes/npcs/ai/EntityAIFollow.java index e30634e08..173af0224 100644 --- a/src/main/java/noppes/npcs/ai/EntityAIFollow.java +++ b/src/main/java/noppes/npcs/ai/EntityAIFollow.java @@ -1,13 +1,8 @@ package noppes.npcs.ai; -import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIBase; -import net.minecraft.entity.ai.RandomPositionGenerator; -import net.minecraft.pathfinding.PathEntity; -import net.minecraft.pathfinding.PathPoint; import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; import net.minecraft.world.World; import noppes.npcs.constants.AiMutex; import noppes.npcs.constants.EnumAnimation; diff --git a/src/main/java/noppes/npcs/ai/EntityAILook.java b/src/main/java/noppes/npcs/ai/EntityAILook.java index 00575ed7b..9151ee625 100644 --- a/src/main/java/noppes/npcs/ai/EntityAILook.java +++ b/src/main/java/noppes/npcs/ai/EntityAILook.java @@ -1,7 +1,5 @@ package noppes.npcs.ai; -import java.util.Iterator; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.player.EntityPlayer; @@ -9,6 +7,8 @@ import noppes.npcs.constants.AiMutex; import noppes.npcs.constants.EnumStandingType; import noppes.npcs.entity.EntityNPCInterface; +import java.util.Iterator; + public class EntityAILook extends EntityAIBase{ private final EntityNPCInterface npc; private int idle = 0; diff --git a/src/main/java/noppes/npcs/ai/EntityAIMoveIndoors.java b/src/main/java/noppes/npcs/ai/EntityAIMoveIndoors.java index f8cfe51cf..47f4f3c86 100644 --- a/src/main/java/noppes/npcs/ai/EntityAIMoveIndoors.java +++ b/src/main/java/noppes/npcs/ai/EntityAIMoveIndoors.java @@ -1,7 +1,5 @@ package noppes.npcs.ai; -import java.util.Random; - import net.minecraft.entity.EntityCreature; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.util.MathHelper; @@ -9,6 +7,8 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; import noppes.npcs.constants.AiMutex; +import java.util.Random; + public class EntityAIMoveIndoors extends EntityAIBase { private EntityCreature theCreature; diff --git a/src/main/java/noppes/npcs/ai/EntityAIMovingPath.java b/src/main/java/noppes/npcs/ai/EntityAIMovingPath.java index 0d5e8ef9e..37cfe103a 100644 --- a/src/main/java/noppes/npcs/ai/EntityAIMovingPath.java +++ b/src/main/java/noppes/npcs/ai/EntityAIMovingPath.java @@ -1,12 +1,11 @@ package noppes.npcs.ai; -import java.util.List; - import net.minecraft.entity.ai.EntityAIBase; import noppes.npcs.constants.AiMutex; -import noppes.npcs.constants.EnumMovingType; import noppes.npcs.entity.EntityNPCInterface; +import java.util.List; + public class EntityAIMovingPath extends EntityAIBase { private EntityNPCInterface npc; diff --git a/src/main/java/noppes/npcs/ai/EntityAIOrbitTarget.java b/src/main/java/noppes/npcs/ai/EntityAIOrbitTarget.java index 058649b6a..2c40e13cb 100644 --- a/src/main/java/noppes/npcs/ai/EntityAIOrbitTarget.java +++ b/src/main/java/noppes/npcs/ai/EntityAIOrbitTarget.java @@ -1,23 +1,13 @@ package noppes.npcs.ai; -import java.util.Iterator; -import java.util.List; -import java.util.Random; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIBase; -import net.minecraft.entity.monster.EntityPigZombie; -import net.minecraft.entity.monster.EntityZombie; -import net.minecraft.entity.passive.EntityVillager; -import net.minecraft.pathfinding.PathEntity; -import net.minecraft.pathfinding.PathPoint; import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; import noppes.npcs.constants.AiMutex; import noppes.npcs.entity.EntityNPCInterface; +import java.util.Random; + public class EntityAIOrbitTarget extends EntityAIBase { private EntityNPCInterface theEntity; diff --git a/src/main/java/noppes/npcs/ai/EntityAIPanic.java b/src/main/java/noppes/npcs/ai/EntityAIPanic.java index 556e99abc..6edc6c895 100644 --- a/src/main/java/noppes/npcs/ai/EntityAIPanic.java +++ b/src/main/java/noppes/npcs/ai/EntityAIPanic.java @@ -2,7 +2,6 @@ package noppes.npcs.ai; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.ai.EntityAIBase; -import net.minecraft.entity.ai.RandomPositionGenerator; import net.minecraft.util.Vec3; import noppes.npcs.constants.AiMutex; diff --git a/src/main/java/noppes/npcs/ai/EntityAIRangedAttack.java b/src/main/java/noppes/npcs/ai/EntityAIRangedAttack.java index 3553c2287..7e7aa75d3 100644 --- a/src/main/java/noppes/npcs/ai/EntityAIRangedAttack.java +++ b/src/main/java/noppes/npcs/ai/EntityAIRangedAttack.java @@ -4,7 +4,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IRangedAttackMob; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; import noppes.npcs.constants.AiMutex; import noppes.npcs.constants.EnumAnimation; import noppes.npcs.constants.EnumNavType; diff --git a/src/main/java/noppes/npcs/ai/EntityAIReturn.java b/src/main/java/noppes/npcs/ai/EntityAIReturn.java index a27b88be0..d3c42e426 100644 --- a/src/main/java/noppes/npcs/ai/EntityAIReturn.java +++ b/src/main/java/noppes/npcs/ai/EntityAIReturn.java @@ -2,7 +2,6 @@ package noppes.npcs.ai; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.util.Vec3; -import noppes.npcs.CustomNpcs; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumMovingType; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/ai/EntityAIStalkTarget.java b/src/main/java/noppes/npcs/ai/EntityAIStalkTarget.java index 6017fd8f4..4c7e02ac4 100644 --- a/src/main/java/noppes/npcs/ai/EntityAIStalkTarget.java +++ b/src/main/java/noppes/npcs/ai/EntityAIStalkTarget.java @@ -1,16 +1,12 @@ package noppes.npcs.ai; -import java.util.Random; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIBase; -import net.minecraft.init.Blocks; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; import noppes.npcs.constants.AiMutex; -import noppes.npcs.constants.EnumNavType; import noppes.npcs.entity.EntityNPCInterface; public class EntityAIStalkTarget extends EntityAIBase diff --git a/src/main/java/noppes/npcs/ai/EntityAITransform.java b/src/main/java/noppes/npcs/ai/EntityAITransform.java index 71af3232e..10c2217cf 100644 --- a/src/main/java/noppes/npcs/ai/EntityAITransform.java +++ b/src/main/java/noppes/npcs/ai/EntityAITransform.java @@ -1,12 +1,7 @@ package noppes.npcs.ai; import net.minecraft.entity.ai.EntityAIBase; -import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.NoppesStringUtils; -import noppes.npcs.NoppesUtilServer; -import noppes.npcs.Server; import noppes.npcs.constants.AiMutex; -import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.entity.EntityNPCInterface; public class EntityAITransform extends EntityAIBase { diff --git a/src/main/java/noppes/npcs/ai/EntityAIWander.java b/src/main/java/noppes/npcs/ai/EntityAIWander.java index 528b4c831..ee6ebbbcc 100644 --- a/src/main/java/noppes/npcs/ai/EntityAIWander.java +++ b/src/main/java/noppes/npcs/ai/EntityAIWander.java @@ -1,19 +1,18 @@ package noppes.npcs.ai; -import java.util.Iterator; -import java.util.List; - import net.minecraft.command.IEntitySelector; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; -import noppes.npcs.CustomNpcs; import noppes.npcs.ai.selector.NPCInteractSelector; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.AiMutex; import noppes.npcs.controllers.data.Line; import noppes.npcs.entity.EntityNPCInterface; +import java.util.Iterator; +import java.util.List; + public class EntityAIWander extends EntityAIBase { private EntityNPCInterface entity; diff --git a/src/main/java/noppes/npcs/ai/EntityAIZigZagTarget.java b/src/main/java/noppes/npcs/ai/EntityAIZigZagTarget.java index 6636ce80e..8bd159a51 100644 --- a/src/main/java/noppes/npcs/ai/EntityAIZigZagTarget.java +++ b/src/main/java/noppes/npcs/ai/EntityAIZigZagTarget.java @@ -3,7 +3,6 @@ package noppes.npcs.ai; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIBase; -import net.minecraft.entity.ai.RandomPositionGenerator; import net.minecraft.pathfinding.PathEntity; import net.minecraft.pathfinding.PathPoint; import net.minecraft.util.MathHelper; diff --git a/src/main/java/noppes/npcs/ai/RandomPositionGeneratorAlt.java b/src/main/java/noppes/npcs/ai/RandomPositionGeneratorAlt.java index 44d6668ca..8c5a6ce19 100644 --- a/src/main/java/noppes/npcs/ai/RandomPositionGeneratorAlt.java +++ b/src/main/java/noppes/npcs/ai/RandomPositionGeneratorAlt.java @@ -1,10 +1,11 @@ package noppes.npcs.ai; -import java.util.Random; import net.minecraft.entity.EntityCreature; import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; +import java.util.Random; + public class RandomPositionGeneratorAlt { /** diff --git a/src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java b/src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java index 0aee35ccc..c9bca0579 100644 --- a/src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java +++ b/src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java @@ -8,7 +8,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.init.Blocks; import net.minecraft.pathfinding.PathFinder; -import net.minecraft.pathfinding.PathPoint; import net.minecraft.util.MathHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.IntHashMap; @@ -16,7 +15,6 @@ import net.minecraft.world.IBlockAccess; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; -import javax.annotation.Nullable; import java.util.EnumSet; import java.util.Map; import java.util.Set; diff --git a/src/main/java/noppes/npcs/ai/pathfinder/FlyingMoveHelper.java b/src/main/java/noppes/npcs/ai/pathfinder/FlyingMoveHelper.java index da6508f77..bdb317883 100644 --- a/src/main/java/noppes/npcs/ai/pathfinder/FlyingMoveHelper.java +++ b/src/main/java/noppes/npcs/ai/pathfinder/FlyingMoveHelper.java @@ -2,7 +2,6 @@ package noppes.npcs.ai.pathfinder; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.EntityMoveHelper; -import net.minecraft.init.Blocks; import net.minecraft.util.MathHelper; import noppes.npcs.entity.EntityNPCFlying; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/ai/pathfinder/NPCPath.java b/src/main/java/noppes/npcs/ai/pathfinder/NPCPath.java index 254dd999e..39510e52a 100644 --- a/src/main/java/noppes/npcs/ai/pathfinder/NPCPath.java +++ b/src/main/java/noppes/npcs/ai/pathfinder/NPCPath.java @@ -2,7 +2,6 @@ package noppes.npcs.ai.pathfinder; import net.minecraft.entity.Entity; import net.minecraft.pathfinding.PathEntity; -import net.minecraft.pathfinding.PathPoint; import net.minecraft.util.Vec3; public class NPCPath extends PathEntity{ diff --git a/src/main/java/noppes/npcs/ai/pathfinder/PathNavigateFlying.java b/src/main/java/noppes/npcs/ai/pathfinder/PathNavigateFlying.java index 5a8ce0c64..346074152 100644 --- a/src/main/java/noppes/npcs/ai/pathfinder/PathNavigateFlying.java +++ b/src/main/java/noppes/npcs/ai/pathfinder/PathNavigateFlying.java @@ -17,6 +17,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.ChunkCache; import net.minecraft.world.World; import noppes.npcs.entity.EntityNPCInterface; + import javax.annotation.Nullable; public class PathNavigateFlying extends PathNavigate { diff --git a/src/main/java/noppes/npcs/ai/selector/NPCAttackSelector.java b/src/main/java/noppes/npcs/ai/selector/NPCAttackSelector.java index 5562d3ab0..3fbfe3c8c 100644 --- a/src/main/java/noppes/npcs/ai/selector/NPCAttackSelector.java +++ b/src/main/java/noppes/npcs/ai/selector/NPCAttackSelector.java @@ -1,14 +1,11 @@ package noppes.npcs.ai.selector; -import java.util.List; - import net.minecraft.command.IEntitySelector; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.potion.Potion; -import noppes.npcs.CustomNpcs; import noppes.npcs.constants.EnumCompanionJobs; import noppes.npcs.constants.EnumJobType; import noppes.npcs.constants.EnumMovingType; diff --git a/src/main/java/noppes/npcs/ai/target/EntityAIClearTarget.java b/src/main/java/noppes/npcs/ai/target/EntityAIClearTarget.java index 8ac336592..ab38f9feb 100644 --- a/src/main/java/noppes/npcs/ai/target/EntityAIClearTarget.java +++ b/src/main/java/noppes/npcs/ai/target/EntityAIClearTarget.java @@ -1,16 +1,8 @@ package noppes.npcs.ai.target; -import java.util.Collections; -import java.util.List; - -import net.minecraft.command.IEntitySelector; -import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.ai.EntityAINearestAttackableTarget; import net.minecraft.entity.ai.EntityAITarget; -import net.minecraft.entity.monster.EntityMob; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.MathHelper; import noppes.npcs.entity.EntityNPCInterface; public class EntityAIClearTarget extends EntityAITarget diff --git a/src/main/java/noppes/npcs/ai/target/EntityAIClosestTarget.java b/src/main/java/noppes/npcs/ai/target/EntityAIClosestTarget.java index 1aeee1fe2..1221086d4 100644 --- a/src/main/java/noppes/npcs/ai/target/EntityAIClosestTarget.java +++ b/src/main/java/noppes/npcs/ai/target/EntityAIClosestTarget.java @@ -1,8 +1,5 @@ package noppes.npcs.ai.target; -import java.util.Collections; -import java.util.List; - import net.minecraft.command.IEntitySelector; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityLivingBase; @@ -11,10 +8,12 @@ import net.minecraft.entity.ai.EntityAINearestAttackableTarget; import net.minecraft.entity.ai.EntityAITarget; import net.minecraft.entity.monster.EntityMob; import net.minecraft.util.MathHelper; -import noppes.npcs.CustomNpcs; import noppes.npcs.config.ConfigMain; import noppes.npcs.entity.EntityNPCInterface; +import java.util.Collections; +import java.util.List; + public class EntityAIClosestTarget extends EntityAITarget { private final Class targetClass; diff --git a/src/main/java/noppes/npcs/ai/target/EntityAIOwnerHurtByTarget.java b/src/main/java/noppes/npcs/ai/target/EntityAIOwnerHurtByTarget.java index 5c5fa5a3a..8ce7a8345 100644 --- a/src/main/java/noppes/npcs/ai/target/EntityAIOwnerHurtByTarget.java +++ b/src/main/java/noppes/npcs/ai/target/EntityAIOwnerHurtByTarget.java @@ -2,7 +2,6 @@ package noppes.npcs.ai.target; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAITarget; -import net.minecraft.entity.passive.EntityTameable; import noppes.npcs.constants.AiMutex; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/ai/target/EntityAIOwnerHurtTarget.java b/src/main/java/noppes/npcs/ai/target/EntityAIOwnerHurtTarget.java index 63d11e71c..c8b315306 100644 --- a/src/main/java/noppes/npcs/ai/target/EntityAIOwnerHurtTarget.java +++ b/src/main/java/noppes/npcs/ai/target/EntityAIOwnerHurtTarget.java @@ -2,7 +2,6 @@ package noppes.npcs.ai.target; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAITarget; -import net.minecraft.entity.passive.EntityTameable; import noppes.npcs.constants.AiMutex; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/blocks/BlockBanner.java b/src/main/java/noppes/npcs/blocks/BlockBanner.java index 377e5f42d..1dc69c8f4 100644 --- a/src/main/java/noppes/npcs/blocks/BlockBanner.java +++ b/src/main/java/noppes/npcs/blocks/BlockBanner.java @@ -1,7 +1,7 @@ package noppes.npcs.blocks; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockColored; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -21,8 +21,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import noppes.npcs.NoppesUtilServer; import noppes.npcs.blocks.tiles.TileBanner; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class BlockBanner extends BlockContainer{ diff --git a/src/main/java/noppes/npcs/blocks/BlockBarrel.java b/src/main/java/noppes/npcs/blocks/BlockBarrel.java index 859e342c1..fd4fc3a63 100644 --- a/src/main/java/noppes/npcs/blocks/BlockBarrel.java +++ b/src/main/java/noppes/npcs/blocks/BlockBarrel.java @@ -1,7 +1,5 @@ package noppes.npcs.blocks; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -16,6 +14,8 @@ import noppes.npcs.blocks.tiles.TileBarrel; import noppes.npcs.blocks.tiles.TileNpcContainer; import noppes.npcs.constants.EnumGuiType; +import java.util.List; + public class BlockBarrel extends BlockRotated{ public BlockBarrel() { diff --git a/src/main/java/noppes/npcs/blocks/BlockBeam.java b/src/main/java/noppes/npcs/blocks/BlockBeam.java index 77ba6fc8a..2157003d6 100644 --- a/src/main/java/noppes/npcs/blocks/BlockBeam.java +++ b/src/main/java/noppes/npcs/blocks/BlockBeam.java @@ -1,7 +1,5 @@ package noppes.npcs.blocks; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; @@ -13,6 +11,8 @@ import net.minecraft.world.World; import noppes.npcs.blocks.tiles.TileBeam; import noppes.npcs.blocks.tiles.TileColorable; +import java.util.List; + public class BlockBeam extends BlockRotated{ public BlockBeam() { diff --git a/src/main/java/noppes/npcs/blocks/BlockBigSign.java b/src/main/java/noppes/npcs/blocks/BlockBigSign.java index 406911f73..037e9de81 100644 --- a/src/main/java/noppes/npcs/blocks/BlockBigSign.java +++ b/src/main/java/noppes/npcs/blocks/BlockBigSign.java @@ -1,14 +1,14 @@ package noppes.npcs.blocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; @@ -19,13 +19,9 @@ import noppes.npcs.CustomItems; import noppes.npcs.CustomNpcs; import noppes.npcs.CustomNpcsPermissions; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.Server; import noppes.npcs.blocks.tiles.TileBigSign; import noppes.npcs.blocks.tiles.TileColorable; import noppes.npcs.constants.EnumGuiType; -import noppes.npcs.constants.EnumPacketClient; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockBigSign extends BlockContainer{ diff --git a/src/main/java/noppes/npcs/blocks/BlockBlood.java b/src/main/java/noppes/npcs/blocks/BlockBlood.java index 3da0a7ff3..addec578e 100644 --- a/src/main/java/noppes/npcs/blocks/BlockBlood.java +++ b/src/main/java/noppes/npcs/blocks/BlockBlood.java @@ -1,12 +1,9 @@ package noppes.npcs.blocks; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; -import net.minecraft.block.BlockEnchantmentTable; -import net.minecraft.block.BlockFence; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.BlockFurnace; -import net.minecraft.block.BlockGlowstone; -import net.minecraft.block.BlockSapling; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; @@ -18,9 +15,6 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import noppes.npcs.CustomItems; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockBlood extends Block{ diff --git a/src/main/java/noppes/npcs/blocks/BlockBorder.java b/src/main/java/noppes/npcs/blocks/BlockBorder.java index 71d5655ec..52c6b2c94 100644 --- a/src/main/java/noppes/npcs/blocks/BlockBorder.java +++ b/src/main/java/noppes/npcs/blocks/BlockBorder.java @@ -2,27 +2,21 @@ package noppes.npcs.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import noppes.npcs.CustomItems; import noppes.npcs.CustomNpcs; -import noppes.npcs.Server; import noppes.npcs.blocks.tiles.TileBorder; import noppes.npcs.constants.EnumGuiType; -import noppes.npcs.constants.EnumPacketServer; public class BlockBorder extends BlockContainer{ public int renderId = -1; diff --git a/src/main/java/noppes/npcs/blocks/BlockCampfire.java b/src/main/java/noppes/npcs/blocks/BlockCampfire.java index 243dc4282..12019ee2a 100644 --- a/src/main/java/noppes/npcs/blocks/BlockCampfire.java +++ b/src/main/java/noppes/npcs/blocks/BlockCampfire.java @@ -1,7 +1,7 @@ package noppes.npcs.blocks; -import java.util.Random; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -14,11 +14,9 @@ import noppes.npcs.CustomItems; import noppes.npcs.CustomNpcs; import noppes.npcs.NoppesUtilServer; import noppes.npcs.blocks.tiles.TileCampfire; - import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.Random; public class BlockCampfire extends BlockLightable{ diff --git a/src/main/java/noppes/npcs/blocks/BlockCandle.java b/src/main/java/noppes/npcs/blocks/BlockCandle.java index 63f77b17b..8cc57d7d9 100644 --- a/src/main/java/noppes/npcs/blocks/BlockCandle.java +++ b/src/main/java/noppes/npcs/blocks/BlockCandle.java @@ -1,9 +1,8 @@ package noppes.npcs.blocks; -import java.util.Random; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -12,8 +11,8 @@ import net.minecraft.world.World; import noppes.npcs.CustomItems; import noppes.npcs.blocks.tiles.TileCandle; import noppes.npcs.blocks.tiles.TileColorable; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockCandle extends BlockLightable{ diff --git a/src/main/java/noppes/npcs/blocks/BlockCarpentryBench.java b/src/main/java/noppes/npcs/blocks/BlockCarpentryBench.java index 28090a57b..31f9e1957 100644 --- a/src/main/java/noppes/npcs/blocks/BlockCarpentryBench.java +++ b/src/main/java/noppes/npcs/blocks/BlockCarpentryBench.java @@ -1,7 +1,5 @@ package noppes.npcs.blocks; -import java.util.List; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockContainer; @@ -15,11 +13,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import noppes.npcs.CustomItems; import noppes.npcs.CustomNpcs; import noppes.npcs.blocks.tiles.TileBlockAnvil; import noppes.npcs.constants.EnumGuiType; +import java.util.List; + public class BlockCarpentryBench extends BlockContainer { public int renderId = -1; diff --git a/src/main/java/noppes/npcs/blocks/BlockChair.java b/src/main/java/noppes/npcs/blocks/BlockChair.java index c6cc0a4e8..0027b870a 100644 --- a/src/main/java/noppes/npcs/blocks/BlockChair.java +++ b/src/main/java/noppes/npcs/blocks/BlockChair.java @@ -1,10 +1,5 @@ package noppes.npcs.blocks; -import java.util.List; - -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -14,17 +9,12 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import noppes.npcs.blocks.tiles.TileChair; -import noppes.npcs.blocks.tiles.TileColorable; import noppes.npcs.entity.EntityChairMount; import noppes.npcs.entity.EntityCustomNpc; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class BlockChair extends BlockRotated{ diff --git a/src/main/java/noppes/npcs/blocks/BlockCouchWood.java b/src/main/java/noppes/npcs/blocks/BlockCouchWood.java index 3458a19b6..83247a4fe 100644 --- a/src/main/java/noppes/npcs/blocks/BlockCouchWood.java +++ b/src/main/java/noppes/npcs/blocks/BlockCouchWood.java @@ -1,7 +1,7 @@ package noppes.npcs.blocks; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.BlockColored; import net.minecraft.block.BlockContainer; @@ -22,8 +22,8 @@ import net.minecraft.world.World; import noppes.npcs.NoppesUtilServer; import noppes.npcs.blocks.tiles.TileColorable; import noppes.npcs.blocks.tiles.TileCouchWood; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class BlockCouchWood extends BlockContainer{ diff --git a/src/main/java/noppes/npcs/blocks/BlockCouchWool.java b/src/main/java/noppes/npcs/blocks/BlockCouchWool.java index 8e5c86b8b..771c2f912 100644 --- a/src/main/java/noppes/npcs/blocks/BlockCouchWool.java +++ b/src/main/java/noppes/npcs/blocks/BlockCouchWool.java @@ -1,7 +1,7 @@ package noppes.npcs.blocks; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.BlockColored; import net.minecraft.block.BlockContainer; @@ -22,8 +22,8 @@ import net.minecraft.world.World; import noppes.npcs.NoppesUtilServer; import noppes.npcs.blocks.tiles.TileColorable; import noppes.npcs.blocks.tiles.TileCouchWool; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class BlockCouchWool extends BlockContainer{ diff --git a/src/main/java/noppes/npcs/blocks/BlockCrate.java b/src/main/java/noppes/npcs/blocks/BlockCrate.java index 04a072d4f..dcbdaef16 100644 --- a/src/main/java/noppes/npcs/blocks/BlockCrate.java +++ b/src/main/java/noppes/npcs/blocks/BlockCrate.java @@ -1,7 +1,5 @@ package noppes.npcs.blocks; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -16,6 +14,8 @@ import noppes.npcs.blocks.tiles.TileCrate; import noppes.npcs.blocks.tiles.TileNpcContainer; import noppes.npcs.constants.EnumGuiType; +import java.util.List; + public class BlockCrate extends BlockRotated{ public BlockCrate() { diff --git a/src/main/java/noppes/npcs/blocks/BlockCrystal.java b/src/main/java/noppes/npcs/blocks/BlockCrystal.java index 4e61724df..eae17c497 100644 --- a/src/main/java/noppes/npcs/blocks/BlockCrystal.java +++ b/src/main/java/noppes/npcs/blocks/BlockCrystal.java @@ -1,11 +1,7 @@ package noppes.npcs.blocks; -import java.util.List; - -import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; import net.minecraft.block.BlockBreakable; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; @@ -14,6 +10,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; +import java.util.List; + public class BlockCrystal extends BlockBreakable{ public BlockCrystal() { diff --git a/src/main/java/noppes/npcs/blocks/BlockLamp.java b/src/main/java/noppes/npcs/blocks/BlockLamp.java index 408be61c4..bc184eb23 100644 --- a/src/main/java/noppes/npcs/blocks/BlockLamp.java +++ b/src/main/java/noppes/npcs/blocks/BlockLamp.java @@ -1,7 +1,8 @@ package noppes.npcs.blocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -10,8 +11,6 @@ import net.minecraft.world.World; import noppes.npcs.CustomItems; import noppes.npcs.blocks.tiles.TileColorable; import noppes.npcs.blocks.tiles.TileLamp; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockLamp extends BlockLightable{ diff --git a/src/main/java/noppes/npcs/blocks/BlockLightable.java b/src/main/java/noppes/npcs/blocks/BlockLightable.java index e0f065da3..b0e8383e2 100644 --- a/src/main/java/noppes/npcs/blocks/BlockLightable.java +++ b/src/main/java/noppes/npcs/blocks/BlockLightable.java @@ -1,17 +1,16 @@ package noppes.npcs.blocks; -import java.util.Random; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import java.util.Random; + public abstract class BlockLightable extends BlockRotated{ protected BlockLightable(Block block, boolean lit) { diff --git a/src/main/java/noppes/npcs/blocks/BlockMailbox.java b/src/main/java/noppes/npcs/blocks/BlockMailbox.java index 726fce7bf..062aec591 100644 --- a/src/main/java/noppes/npcs/blocks/BlockMailbox.java +++ b/src/main/java/noppes/npcs/blocks/BlockMailbox.java @@ -1,8 +1,7 @@ package noppes.npcs.blocks; -import java.util.ArrayList; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -21,8 +20,9 @@ import noppes.npcs.Server; import noppes.npcs.blocks.tiles.TileMailbox; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumPacketClient; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.ArrayList; +import java.util.List; public class BlockMailbox extends BlockContainer{ diff --git a/src/main/java/noppes/npcs/blocks/BlockPedestal.java b/src/main/java/noppes/npcs/blocks/BlockPedestal.java index 2caaa5786..0bce8d0b1 100644 --- a/src/main/java/noppes/npcs/blocks/BlockPedestal.java +++ b/src/main/java/noppes/npcs/blocks/BlockPedestal.java @@ -1,7 +1,7 @@ package noppes.npcs.blocks; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -10,7 +10,6 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemSword; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -18,8 +17,8 @@ import net.minecraft.world.World; import noppes.npcs.blocks.tiles.TileColorable; import noppes.npcs.blocks.tiles.TileNpcContainer; import noppes.npcs.blocks.tiles.TilePedestal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class BlockPedestal extends BlockTrigger{ diff --git a/src/main/java/noppes/npcs/blocks/BlockPlaceholder.java b/src/main/java/noppes/npcs/blocks/BlockPlaceholder.java index 427a3178a..d5a6a7123 100644 --- a/src/main/java/noppes/npcs/blocks/BlockPlaceholder.java +++ b/src/main/java/noppes/npcs/blocks/BlockPlaceholder.java @@ -1,7 +1,7 @@ package noppes.npcs.blocks; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -11,8 +11,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class BlockPlaceholder extends Block{ diff --git a/src/main/java/noppes/npcs/blocks/BlockRotated.java b/src/main/java/noppes/npcs/blocks/BlockRotated.java index ea67ccb31..41898f21c 100644 --- a/src/main/java/noppes/npcs/blocks/BlockRotated.java +++ b/src/main/java/noppes/npcs/blocks/BlockRotated.java @@ -1,5 +1,7 @@ package noppes.npcs.blocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,8 +14,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import noppes.npcs.blocks.tiles.TileColorable; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public abstract class BlockRotated extends BlockContainer{ private Block block; diff --git a/src/main/java/noppes/npcs/blocks/BlockShelf.java b/src/main/java/noppes/npcs/blocks/BlockShelf.java index 5b2e91b3e..89ba1117c 100644 --- a/src/main/java/noppes/npcs/blocks/BlockShelf.java +++ b/src/main/java/noppes/npcs/blocks/BlockShelf.java @@ -1,7 +1,5 @@ package noppes.npcs.blocks; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; @@ -14,6 +12,8 @@ import net.minecraft.world.World; import noppes.npcs.blocks.tiles.TileColorable; import noppes.npcs.blocks.tiles.TileShelf; +import java.util.List; + public class BlockShelf extends BlockRotated{ public BlockShelf() { diff --git a/src/main/java/noppes/npcs/blocks/BlockSign.java b/src/main/java/noppes/npcs/blocks/BlockSign.java index cc42b1976..b291d10ed 100644 --- a/src/main/java/noppes/npcs/blocks/BlockSign.java +++ b/src/main/java/noppes/npcs/blocks/BlockSign.java @@ -1,7 +1,5 @@ package noppes.npcs.blocks; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -17,6 +15,8 @@ import noppes.npcs.blocks.tiles.TileBanner; import noppes.npcs.blocks.tiles.TileColorable; import noppes.npcs.blocks.tiles.TileSign; +import java.util.List; + public class BlockSign extends BlockRotated{ public BlockSign() { diff --git a/src/main/java/noppes/npcs/blocks/BlockStool.java b/src/main/java/noppes/npcs/blocks/BlockStool.java index 49e2dfd83..742a6a49a 100644 --- a/src/main/java/noppes/npcs/blocks/BlockStool.java +++ b/src/main/java/noppes/npcs/blocks/BlockStool.java @@ -1,12 +1,11 @@ package noppes.npcs.blocks; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -16,13 +15,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import noppes.npcs.blocks.tiles.TileColorable; import noppes.npcs.blocks.tiles.TileStool; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class BlockStool extends BlockContainer{ diff --git a/src/main/java/noppes/npcs/blocks/BlockTable.java b/src/main/java/noppes/npcs/blocks/BlockTable.java index be4f5bc7b..62be7406d 100644 --- a/src/main/java/noppes/npcs/blocks/BlockTable.java +++ b/src/main/java/noppes/npcs/blocks/BlockTable.java @@ -1,29 +1,15 @@ package noppes.npcs.blocks; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.BlockSlab; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import noppes.npcs.CustomNpcs; -import noppes.npcs.blocks.tiles.TileColorable; import noppes.npcs.blocks.tiles.TileTable; -import noppes.npcs.constants.EnumGuiType; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class BlockTable extends BlockRotated{ diff --git a/src/main/java/noppes/npcs/blocks/BlockTallLamp.java b/src/main/java/noppes/npcs/blocks/BlockTallLamp.java index a1ed8e86e..9e38535f8 100644 --- a/src/main/java/noppes/npcs/blocks/BlockTallLamp.java +++ b/src/main/java/noppes/npcs/blocks/BlockTallLamp.java @@ -1,8 +1,7 @@ package noppes.npcs.blocks; -import java.util.List; - -import net.minecraft.block.Block; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockColored; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -23,8 +22,8 @@ import net.minecraft.world.World; import noppes.npcs.NoppesUtilServer; import noppes.npcs.blocks.tiles.TileColorable; import noppes.npcs.blocks.tiles.TileTallLamp; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class BlockTallLamp extends BlockContainer{ diff --git a/src/main/java/noppes/npcs/blocks/BlockTombstone.java b/src/main/java/noppes/npcs/blocks/BlockTombstone.java index db6191adb..9c809d863 100644 --- a/src/main/java/noppes/npcs/blocks/BlockTombstone.java +++ b/src/main/java/noppes/npcs/blocks/BlockTombstone.java @@ -1,7 +1,7 @@ package noppes.npcs.blocks; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -25,8 +25,8 @@ import noppes.npcs.blocks.tiles.TileBigSign; import noppes.npcs.blocks.tiles.TileColorable; import noppes.npcs.blocks.tiles.TileTombstone; import noppes.npcs.constants.EnumGuiType; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class BlockTombstone extends BlockContainer{ diff --git a/src/main/java/noppes/npcs/blocks/BlockTrigger.java b/src/main/java/noppes/npcs/blocks/BlockTrigger.java index 8d7e0c6ce..f1d7b5ed8 100644 --- a/src/main/java/noppes/npcs/blocks/BlockTrigger.java +++ b/src/main/java/noppes/npcs/blocks/BlockTrigger.java @@ -1,9 +1,6 @@ package noppes.npcs.blocks; import net.minecraft.block.Block; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityChest; -import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import noppes.npcs.blocks.tiles.TileColorable; diff --git a/src/main/java/noppes/npcs/blocks/BlockWallBanner.java b/src/main/java/noppes/npcs/blocks/BlockWallBanner.java index ab4aeb5c2..302db06ae 100644 --- a/src/main/java/noppes/npcs/blocks/BlockWallBanner.java +++ b/src/main/java/noppes/npcs/blocks/BlockWallBanner.java @@ -1,7 +1,7 @@ package noppes.npcs.blocks; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockColored; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -21,8 +21,8 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import noppes.npcs.NoppesUtilServer; import noppes.npcs.blocks.tiles.TileWallBanner; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class BlockWallBanner extends BlockContainer{ diff --git a/src/main/java/noppes/npcs/blocks/BlockWeaponRack.java b/src/main/java/noppes/npcs/blocks/BlockWeaponRack.java index 02005f5f9..27c516814 100644 --- a/src/main/java/noppes/npcs/blocks/BlockWeaponRack.java +++ b/src/main/java/noppes/npcs/blocks/BlockWeaponRack.java @@ -1,11 +1,6 @@ package noppes.npcs.blocks; -import java.util.List; - import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -15,17 +10,14 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import noppes.npcs.CustomNpcs; import noppes.npcs.blocks.tiles.TileColorable; import noppes.npcs.blocks.tiles.TileNpcContainer; import noppes.npcs.blocks.tiles.TileWeaponRack; -import noppes.npcs.constants.EnumGuiType; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class BlockWeaponRack extends BlockTrigger{ diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileBanner.java b/src/main/java/noppes/npcs/blocks/tiles/TileBanner.java index 4ff61924f..bb8075346 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileBanner.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileBanner.java @@ -2,10 +2,6 @@ package noppes.npcs.blocks.tiles; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; public class TileBanner extends TileColorable { diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileBeam.java b/src/main/java/noppes/npcs/blocks/tiles/TileBeam.java index e80281ec2..2c87c33a9 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileBeam.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileBeam.java @@ -1,8 +1,5 @@ package noppes.npcs.blocks.tiles; -import net.minecraft.util.AxisAlignedBB; - - public class TileBeam extends TileColorable { } diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileBigSign.java b/src/main/java/noppes/npcs/blocks/tiles/TileBigSign.java index 288f1fd7a..4f27af0a2 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileBigSign.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileBigSign.java @@ -1,16 +1,10 @@ package noppes.npcs.blocks.tiles; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; 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.IChatComponent; import noppes.npcs.TextBlock; public class TileBigSign extends TileEntity { diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileBlockAnvil.java b/src/main/java/noppes/npcs/blocks/tiles/TileBlockAnvil.java index a6b5fbf9a..3c05fcbf9 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileBlockAnvil.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileBlockAnvil.java @@ -1,6 +1,5 @@ package noppes.npcs.blocks.tiles; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; public class TileBlockAnvil extends TileEntity { diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileBorder.java b/src/main/java/noppes/npcs/blocks/tiles/TileBorder.java index 9eb75082a..32b9b80e8 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileBorder.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileBorder.java @@ -1,7 +1,5 @@ package noppes.npcs.blocks.tiles; -import java.util.List; - import net.minecraft.command.IEntitySelector; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityEnderPearl; @@ -16,6 +14,8 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentTranslation; import noppes.npcs.controllers.data.Availability; +import java.util.List; + public class TileBorder extends TileEntity implements IEntitySelector{ public Availability availability = new Availability(); public AxisAlignedBB boundingbox; diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileCandle.java b/src/main/java/noppes/npcs/blocks/tiles/TileCandle.java index 21a4c25ae..051d8d9b9 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileCandle.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileCandle.java @@ -1,8 +1,5 @@ package noppes.npcs.blocks.tiles; -import net.minecraft.util.AxisAlignedBB; - - public class TileCandle extends TileLamp { } diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileChair.java b/src/main/java/noppes/npcs/blocks/tiles/TileChair.java index 07cf176a4..271d5c760 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileChair.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileChair.java @@ -1,8 +1,5 @@ package noppes.npcs.blocks.tiles; -import net.minecraft.util.AxisAlignedBB; - - public class TileChair extends TileColorable { } diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileColorable.java b/src/main/java/noppes/npcs/blocks/tiles/TileColorable.java index 6e5783b33..dda5ba281 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileColorable.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileColorable.java @@ -1,6 +1,5 @@ package noppes.npcs.blocks.tiles; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileCouchWool.java b/src/main/java/noppes/npcs/blocks/tiles/TileCouchWool.java index 417c1df15..ec65bc8ce 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileCouchWool.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileCouchWool.java @@ -1,7 +1,6 @@ package noppes.npcs.blocks.tiles; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; public class TileCouchWool extends TileColorable { diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileCrate.java b/src/main/java/noppes/npcs/blocks/tiles/TileCrate.java index 3aba46c46..5cebcaf07 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileCrate.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileCrate.java @@ -1,13 +1,5 @@ package noppes.npcs.blocks.tiles; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.world.World; - - public class TileCrate extends TileNpcContainer{ @Override diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileRedstoneBlock.java b/src/main/java/noppes/npcs/blocks/tiles/TileRedstoneBlock.java index 224251e2c..6abba95af 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileRedstoneBlock.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileRedstoneBlock.java @@ -1,7 +1,5 @@ package noppes.npcs.blocks.tiles; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; @@ -11,6 +9,8 @@ import noppes.npcs.CustomNpcs; import noppes.npcs.blocks.BlockNpcRedstone; import noppes.npcs.controllers.data.Availability; +import java.util.List; + public class TileRedstoneBlock extends TileEntity { public int onRange = 6; public int offRange = 10; diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileShelf.java b/src/main/java/noppes/npcs/blocks/tiles/TileShelf.java index 1c74928f3..50ff31616 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileShelf.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileShelf.java @@ -1,8 +1,5 @@ package noppes.npcs.blocks.tiles; -import net.minecraft.util.AxisAlignedBB; - - public class TileShelf extends TileColorable { } diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileSign.java b/src/main/java/noppes/npcs/blocks/tiles/TileSign.java index 5ad87a198..9af7d31b2 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileSign.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileSign.java @@ -1,8 +1,5 @@ package noppes.npcs.blocks.tiles; -import net.minecraft.util.AxisAlignedBB; - - public class TileSign extends TileBanner { diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileStool.java b/src/main/java/noppes/npcs/blocks/tiles/TileStool.java index c6576a793..57f088e6a 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileStool.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileStool.java @@ -1,8 +1,5 @@ package noppes.npcs.blocks.tiles; -import net.minecraft.util.AxisAlignedBB; - - public class TileStool extends TileColorable { } diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileTombstone.java b/src/main/java/noppes/npcs/blocks/tiles/TileTombstone.java index 3ff3e4902..38c6518a9 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileTombstone.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileTombstone.java @@ -1,9 +1,5 @@ package noppes.npcs.blocks.tiles; -import noppes.npcs.TextBlock; - - - public class TileTombstone extends TileBigSign{ } diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java b/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java index c92302d67..081270cae 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java @@ -1,8 +1,5 @@ package noppes.npcs.blocks.tiles; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -10,12 +7,15 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.StatCollector; import noppes.npcs.constants.EnumQuestType; -import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.data.PlayerQuestData; import noppes.npcs.controllers.data.QuestData; import noppes.npcs.quests.QuestLocation; +import java.util.ArrayList; +import java.util.List; + public class TileWaypoint extends TileEntity { public String name = ""; diff --git a/src/main/java/noppes/npcs/client/AnalyticsTracking.java b/src/main/java/noppes/npcs/client/AnalyticsTracking.java index dc6004b6f..0d9b6659e 100644 --- a/src/main/java/noppes/npcs/client/AnalyticsTracking.java +++ b/src/main/java/noppes/npcs/client/AnalyticsTracking.java @@ -1,13 +1,13 @@ package noppes.npcs.client; +import net.minecraft.entity.player.EntityPlayer; + import java.io.IOException; import java.io.OutputStream; import java.net.HttpURLConnection; import java.net.URL; import java.util.UUID; -import net.minecraft.entity.player.EntityPlayer; - public class AnalyticsTracking{ public static void sendData(final EntityPlayer player, final String event, final String data){ diff --git a/src/main/java/noppes/npcs/client/AssetsBrowser.java b/src/main/java/noppes/npcs/client/AssetsBrowser.java index 0501829dd..d32aa3f3e 100644 --- a/src/main/java/noppes/npcs/client/AssetsBrowser.java +++ b/src/main/java/noppes/npcs/client/AssetsBrowser.java @@ -1,5 +1,12 @@ package noppes.npcs.client; +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 org.apache.commons.lang3.StringUtils; + import java.io.File; import java.util.Enumeration; import java.util.HashSet; @@ -8,21 +15,6 @@ import java.util.Map; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import net.minecraft.client.Minecraft; -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 cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.ObfuscationReflectionHelper; - public class AssetsBrowser { public boolean isRoot; private int depth; diff --git a/src/main/java/noppes/npcs/client/Client.java b/src/main/java/noppes/npcs/client/Client.java index bfd3f9a9c..6bc3459f0 100644 --- a/src/main/java/noppes/npcs/client/Client.java +++ b/src/main/java/noppes/npcs/client/Client.java @@ -1,21 +1,20 @@ package noppes.npcs.client; +import cpw.mods.fml.common.network.internal.FMLProxyPacket; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; - -import java.io.IOException; -import java.util.HashMap; -import java.util.UUID; - import noppes.npcs.AnimationDataShared; import noppes.npcs.CustomNpcs; import noppes.npcs.Server; import noppes.npcs.client.gui.OverlayQuestTracking; import noppes.npcs.client.gui.customoverlay.OverlayCustom; import noppes.npcs.constants.EnumPacketServer; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; import noppes.npcs.controllers.data.SkinOverlay; +import java.io.IOException; +import java.util.HashMap; +import java.util.UUID; + public class Client { public static OverlayQuestTracking questTrackingOverlay = null; public static HashMap customOverlays = new HashMap<>(); diff --git a/src/main/java/noppes/npcs/client/ClientProxy.java b/src/main/java/noppes/npcs/client/ClientProxy.java index 273533784..f284dd699 100644 --- a/src/main/java/noppes/npcs/client/ClientProxy.java +++ b/src/main/java/noppes/npcs/client/ClientProxy.java @@ -1,12 +1,10 @@ package noppes.npcs.client; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.util.Random; - +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.ObfuscationReflectionHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.model.ModelBiped; @@ -29,120 +27,51 @@ import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; -import noppes.npcs.CommonProxy; -import noppes.npcs.CustomNpcs; -import noppes.npcs.LogWriter; -import noppes.npcs.ModelData; -import noppes.npcs.ModelPartData; -import noppes.npcs.PacketHandlerPlayer; -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.TileShelf; -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.*; +import noppes.npcs.api.IWorld; +import noppes.npcs.blocks.tiles.*; import noppes.npcs.client.controllers.ClientCloneController; import noppes.npcs.client.controllers.MusicController; import noppes.npcs.client.controllers.PresetController; +import noppes.npcs.client.controllers.ScriptSoundController; 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.custom.GuiCustom; import noppes.npcs.client.gui.global.*; -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.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.mainmenu.*; +import noppes.npcs.client.gui.player.*; 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.questtypes.GuiNpcQuestTypeItem; -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.roles.*; 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.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.BlockLampRenderer; -import noppes.npcs.client.renderer.blocks.BlockMailboxRenderer; -import noppes.npcs.client.renderer.blocks.BlockPedestalRenderer; -import noppes.npcs.client.renderer.blocks.BlockShelfRenderer; -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.blocks.*; import noppes.npcs.config.ConfigClient; import noppes.npcs.config.ConfigMain; import noppes.npcs.config.ConfigScript; import noppes.npcs.config.StringCache; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.containers.*; -import noppes.npcs.client.controllers.ScriptSoundController; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.*; - import noppes.npcs.items.ItemScripted; -import noppes.npcs.api.IWorld; import org.lwjgl.input.Keyboard; - import tconstruct.client.tabs.InventoryTabFactions; import tconstruct.client.tabs.InventoryTabQuests; import tconstruct.client.tabs.InventoryTabVanilla; import tconstruct.client.tabs.TabRegistry; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.ObfuscationReflectionHelper; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.util.Random; public class ClientProxy extends CommonProxy { public static KeyBinding QuestLog; diff --git a/src/main/java/noppes/npcs/client/ClientTickHandler.java b/src/main/java/noppes/npcs/client/ClientTickHandler.java index 8c710484c..9c0ecfcdf 100644 --- a/src/main/java/noppes/npcs/client/ClientTickHandler.java +++ b/src/main/java/noppes/npcs/client/ClientTickHandler.java @@ -1,5 +1,10 @@ package noppes.npcs.client; +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.InputEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +import cpw.mods.fml.common.gameevent.TickEvent.Phase; import net.minecraft.client.Minecraft; import net.minecraft.inventory.ContainerPlayer; import net.minecraft.world.World; @@ -10,11 +15,6 @@ import noppes.npcs.client.controllers.ScriptSoundController; import noppes.npcs.client.gui.player.GuiQuestLog; import noppes.npcs.client.renderer.RenderNPCInterface; import noppes.npcs.constants.EnumPlayerPacket; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.InputEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; diff --git a/src/main/java/noppes/npcs/client/CustomNpcResourceListener.java b/src/main/java/noppes/npcs/client/CustomNpcResourceListener.java index 1cc2f1c80..1fcd9c9e1 100644 --- a/src/main/java/noppes/npcs/client/CustomNpcResourceListener.java +++ b/src/main/java/noppes/npcs/client/CustomNpcResourceListener.java @@ -1,12 +1,5 @@ package noppes.npcs.client; -import java.awt.Graphics; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; - -import javax.imageio.ImageIO; - import net.minecraft.client.Minecraft; import net.minecraft.client.resources.FolderResourcePack; import net.minecraft.client.resources.IResourceManager; @@ -17,6 +10,11 @@ import net.minecraft.util.StatCollector; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; +import javax.imageio.ImageIO; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.File; + public class CustomNpcResourceListener implements IResourceManagerReloadListener { diff --git a/src/main/java/noppes/npcs/client/EntityUtil.java b/src/main/java/noppes/npcs/client/EntityUtil.java index e8a9c7523..b2a283205 100644 --- a/src/main/java/noppes/npcs/client/EntityUtil.java +++ b/src/main/java/noppes/npcs/client/EntityUtil.java @@ -5,7 +5,6 @@ import net.minecraft.entity.boss.EntityDragon; import net.minecraft.entity.passive.EntityChicken; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.entity.EntityNpcPony; public class EntityUtil { diff --git a/src/main/java/noppes/npcs/client/ImageDownloadAlt.java b/src/main/java/noppes/npcs/client/ImageDownloadAlt.java index 470a13647..1f3193de3 100644 --- a/src/main/java/noppes/npcs/client/ImageDownloadAlt.java +++ b/src/main/java/noppes/npcs/client/ImageDownloadAlt.java @@ -1,5 +1,18 @@ package noppes.npcs.client; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.IImageBuffer; +import net.minecraft.client.renderer.texture.SimpleTexture; +import net.minecraft.client.renderer.texture.TextureUtil; +import net.minecraft.client.resources.IResourceManager; +import net.minecraft.util.ResourceLocation; +import org.apache.commons.io.FileUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; @@ -8,22 +21,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.concurrent.atomic.AtomicInteger; -import javax.imageio.ImageIO; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.IImageBuffer; -import net.minecraft.client.renderer.texture.SimpleTexture; -import net.minecraft.client.renderer.texture.TextureUtil; -import net.minecraft.client.resources.IResourceManager; -import net.minecraft.util.ResourceLocation; - -import org.apache.commons.io.FileUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class ImageDownloadAlt extends SimpleTexture { diff --git a/src/main/java/noppes/npcs/client/NoppesUtil.java b/src/main/java/noppes/npcs/client/NoppesUtil.java index 79ee04db6..19450b1d9 100644 --- a/src/main/java/noppes/npcs/client/NoppesUtil.java +++ b/src/main/java/noppes/npcs/client/NoppesUtil.java @@ -1,14 +1,6 @@ package noppes.npcs.client; import io.netty.buffer.ByteBuf; - -import java.io.File; -import java.io.IOException; -import java.net.URI; -import java.util.HashMap; -import java.util.Random; -import java.util.Vector; - import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.GuiScreen; @@ -31,15 +23,21 @@ import noppes.npcs.client.gui.util.GuiNPCInterface; import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.Quest; import noppes.npcs.controllers.data.SkinOverlay; import noppes.npcs.entity.EntityNPCInterface; - import noppes.npcs.scripted.ScriptParticle; import org.lwjgl.Sys; +import java.io.File; +import java.io.IOException; +import java.net.URI; +import java.util.HashMap; +import java.util.Random; +import java.util.Vector; + public class NoppesUtil { public static void requestOpenGUI(EnumGuiType gui) { diff --git a/src/main/java/noppes/npcs/client/PacketHandlerClient.java b/src/main/java/noppes/npcs/client/PacketHandlerClient.java index a3300d4fd..517fbc77a 100644 --- a/src/main/java/noppes/npcs/client/PacketHandlerClient.java +++ b/src/main/java/noppes/npcs/client/PacketHandlerClient.java @@ -1,10 +1,9 @@ package noppes.npcs.client; +import cpw.mods.fml.common.ObfuscationReflectionHelper; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.network.FMLNetworkEvent.ClientCustomPacketEvent; import io.netty.buffer.ByteBuf; - -import java.io.IOException; -import java.util.HashMap; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.achievement.GuiAchievement; @@ -18,11 +17,7 @@ import net.minecraft.stats.Achievement; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.StatCollector; import net.minecraft.village.MerchantRecipeList; -import noppes.npcs.CustomNpcs; -import noppes.npcs.NoppesStringUtils; -import noppes.npcs.PacketHandlerServer; -import noppes.npcs.Server; -import noppes.npcs.ServerEventsHandler; +import noppes.npcs.*; import noppes.npcs.client.ClientProxy.FontContainer; import noppes.npcs.client.controllers.MusicController; import noppes.npcs.client.controllers.ScriptClientSound; @@ -31,23 +26,17 @@ import noppes.npcs.client.gui.GuiNpcMobSpawnerAdd; import noppes.npcs.client.gui.OverlayQuestTracking; import noppes.npcs.client.gui.customoverlay.OverlayCustom; import noppes.npcs.client.gui.player.GuiBook; -import noppes.npcs.client.gui.util.GuiContainerNPCInterface; -import noppes.npcs.client.gui.util.GuiNPCInterface; -import noppes.npcs.client.gui.util.IGuiClose; -import noppes.npcs.client.gui.util.IGuiData; -import noppes.npcs.client.gui.util.IGuiError; -import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.*; import noppes.npcs.config.ConfigClient; -import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumPacketClient; -import noppes.npcs.controllers.data.RecipeCarpentry; import noppes.npcs.controllers.RecipeController; +import noppes.npcs.controllers.data.RecipeCarpentry; import noppes.npcs.entity.EntityDialogNpc; import noppes.npcs.entity.EntityNPCInterface; -import cpw.mods.fml.common.ObfuscationReflectionHelper; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.network.FMLNetworkEvent.ClientCustomPacketEvent; + +import java.io.IOException; +import java.util.HashMap; public class PacketHandlerClient extends PacketHandlerServer{ diff --git a/src/main/java/noppes/npcs/client/QuestAchievement.java b/src/main/java/noppes/npcs/client/QuestAchievement.java index d991f6345..98c24fc3f 100644 --- a/src/main/java/noppes/npcs/client/QuestAchievement.java +++ b/src/main/java/noppes/npcs/client/QuestAchievement.java @@ -1,7 +1,6 @@ package noppes.npcs.client; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.stats.Achievement; import net.minecraft.util.ChatComponentText; import net.minecraft.util.IChatComponent; diff --git a/src/main/java/noppes/npcs/client/RenderChatMessages.java b/src/main/java/noppes/npcs/client/RenderChatMessages.java index c612a01a6..3215cb170 100644 --- a/src/main/java/noppes/npcs/client/RenderChatMessages.java +++ b/src/main/java/noppes/npcs/client/RenderChatMessages.java @@ -1,8 +1,5 @@ package noppes.npcs.client; -import java.util.Map; -import java.util.TreeMap; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.OpenGlHelper; @@ -13,9 +10,11 @@ import net.minecraft.util.IChatComponent; import noppes.npcs.IChatMessages; import noppes.npcs.config.ConfigClient; import noppes.npcs.entity.EntityNPCInterface; - import org.lwjgl.opengl.GL11; +import java.util.Map; +import java.util.TreeMap; + public class RenderChatMessages implements IChatMessages{ private Map messages = new TreeMap(); diff --git a/src/main/java/noppes/npcs/client/TextBlockClient.java b/src/main/java/noppes/npcs/client/TextBlockClient.java index 0ff3a81e9..aa7c3a02f 100644 --- a/src/main/java/noppes/npcs/client/TextBlockClient.java +++ b/src/main/java/noppes/npcs/client/TextBlockClient.java @@ -3,13 +3,11 @@ package noppes.npcs.client; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ChatComponentText; import net.minecraft.util.ChatStyle; import noppes.npcs.NoppesStringUtils; import noppes.npcs.TextBlock; import noppes.npcs.controllers.data.Dialog; -import noppes.npcs.entity.EntityNPCInterface; public class TextBlockClient extends TextBlock{ private ChatStyle style; diff --git a/src/main/java/noppes/npcs/client/TranslateUtil.java b/src/main/java/noppes/npcs/client/TranslateUtil.java index 7e3e758b9..b4e26426b 100644 --- a/src/main/java/noppes/npcs/client/TranslateUtil.java +++ b/src/main/java/noppes/npcs/client/TranslateUtil.java @@ -1,28 +1,18 @@ package noppes.npcs.client; -import java.io.BufferedInputStream; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonParser; + import java.io.BufferedReader; -import java.io.DataInputStream; import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; -import java.net.URLConnection; import java.net.URLEncoder; -import javax.sound.sampled.AudioInputStream; -import javax.sound.sampled.AudioSystem; -import javax.sound.sampled.Clip; -import javax.sound.sampled.LineUnavailableException; -import javax.sound.sampled.UnsupportedAudioFileException; - -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonParser; - public class TranslateUtil { private static final String TranslateUrl = "http://translate.google.com/translate_a/t?client=t&text=%s&hl=en&sl=%s&tl=%s&ie=UTF-8&oe=UTF-8&multires=1&otf=1&pc=1&trs=1&ssel=3&tsel=6&sc=1"; private static final String AudioUrl = "http://translate.google.com/translate_tts?q=%s&tl=%s"; diff --git a/src/main/java/noppes/npcs/client/VersionChecker.java b/src/main/java/noppes/npcs/client/VersionChecker.java index fd8abb0e8..19ec426f6 100644 --- a/src/main/java/noppes/npcs/client/VersionChecker.java +++ b/src/main/java/noppes/npcs/client/VersionChecker.java @@ -1,10 +1,5 @@ package noppes.npcs.client; -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.net.URL; -import java.net.URLConnection; - import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.event.ClickEvent; diff --git a/src/main/java/noppes/npcs/client/controllers/ClientCloneController.java b/src/main/java/noppes/npcs/client/controllers/ClientCloneController.java index 75b2bec4c..b0cf6523d 100644 --- a/src/main/java/noppes/npcs/client/controllers/ClientCloneController.java +++ b/src/main/java/noppes/npcs/client/controllers/ClientCloneController.java @@ -1,19 +1,10 @@ package noppes.npcs.client.controllers; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import net.minecraft.entity.Entity; -import net.minecraft.nbt.CompressedStreamTools; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcs; import noppes.npcs.controllers.ServerCloneController; +import java.io.File; + public class ClientCloneController extends ServerCloneController{ public static ClientCloneController Instance; diff --git a/src/main/java/noppes/npcs/client/controllers/MusicController.java b/src/main/java/noppes/npcs/client/controllers/MusicController.java index 4fb230003..51e80971c 100644 --- a/src/main/java/noppes/npcs/client/controllers/MusicController.java +++ b/src/main/java/noppes/npcs/client/controllers/MusicController.java @@ -1,22 +1,10 @@ package noppes.npcs.client.controllers; -import java.util.Map; - -import cpw.mods.fml.common.ObfuscationReflectionHelper; -import net.minecraft.block.BlockJukebox; import net.minecraft.client.Minecraft; -import net.minecraft.client.audio.ISound; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.audio.SoundHandler; -import net.minecraft.client.audio.SoundManager; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemRecord; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import noppes.npcs.client.AssetsBrowser; public class MusicController { diff --git a/src/main/java/noppes/npcs/client/controllers/Preset.java b/src/main/java/noppes/npcs/client/controllers/Preset.java index 30b664630..71f18bdaa 100644 --- a/src/main/java/noppes/npcs/client/controllers/Preset.java +++ b/src/main/java/noppes/npcs/client/controllers/Preset.java @@ -1,11 +1,11 @@ package noppes.npcs.client.controllers; -import java.util.HashMap; - import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.ModelData; import noppes.npcs.ModelPartData; +import java.util.HashMap; + public class Preset { public ModelData data = new ModelData(); diff --git a/src/main/java/noppes/npcs/client/controllers/PresetController.java b/src/main/java/noppes/npcs/client/controllers/PresetController.java index 84e271ee0..9c10caff7 100644 --- a/src/main/java/noppes/npcs/client/controllers/PresetController.java +++ b/src/main/java/noppes/npcs/client/controllers/PresetController.java @@ -1,15 +1,15 @@ package noppes.npcs.client.controllers; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.util.HashMap; - import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.LogWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.util.HashMap; + public class PresetController { public HashMap presets = new HashMap(); diff --git a/src/main/java/noppes/npcs/client/controllers/ScriptSoundController.java b/src/main/java/noppes/npcs/client/controllers/ScriptSoundController.java index cbea249b0..385ad4d64 100644 --- a/src/main/java/noppes/npcs/client/controllers/ScriptSoundController.java +++ b/src/main/java/noppes/npcs/client/controllers/ScriptSoundController.java @@ -2,6 +2,7 @@ package noppes.npcs.client.controllers; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.SoundHandler; + import java.util.HashMap; import java.util.Map; import java.util.Set; diff --git a/src/main/java/noppes/npcs/client/fx/CustomFX.java b/src/main/java/noppes/npcs/client/fx/CustomFX.java index 2358f7fcc..eb6c74067 100644 --- a/src/main/java/noppes/npcs/client/fx/CustomFX.java +++ b/src/main/java/noppes/npcs/client/fx/CustomFX.java @@ -4,21 +4,13 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.ITextureObject; import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.renderer.texture.TextureUtil; import net.minecraft.client.resources.IResource; -import net.minecraft.client.resources.SkinManager; -import net.minecraft.client.resources.data.TextureMetadataSection; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; import noppes.npcs.client.ClientProxy; import noppes.npcs.client.ImageDownloadAlt; diff --git a/src/main/java/noppes/npcs/client/fx/EntityEnderFX.java b/src/main/java/noppes/npcs/client/fx/EntityEnderFX.java index 685998967..9c630c4e7 100644 --- a/src/main/java/noppes/npcs/client/fx/EntityEnderFX.java +++ b/src/main/java/noppes/npcs/client/fx/EntityEnderFX.java @@ -1,14 +1,11 @@ package noppes.npcs.client.fx; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.particle.EntityPortalFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.ResourceLocation; import noppes.npcs.ModelPartData; import noppes.npcs.client.ClientProxy; import noppes.npcs.entity.EntityCustomNpc; - import org.lwjgl.opengl.GL11; public class EntityEnderFX extends EntityPortalFX{ diff --git a/src/main/java/noppes/npcs/client/gui/EventGuiScriptList.java b/src/main/java/noppes/npcs/client/gui/EventGuiScriptList.java index 757bc9e51..5e06ea31b 100644 --- a/src/main/java/noppes/npcs/client/gui/EventGuiScriptList.java +++ b/src/main/java/noppes/npcs/client/gui/EventGuiScriptList.java @@ -1,14 +1,14 @@ package noppes.npcs.client.gui; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.client.gui.GuiButton; -import noppes.npcs.controllers.ScriptContainer; 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.SubGuiInterface; +import noppes.npcs.controllers.ScriptContainer; + +import java.util.ArrayList; +import java.util.List; public class EventGuiScriptList extends SubGuiInterface{ private GuiCustomScroll scroll1; diff --git a/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java b/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java index d0ee018bc..ded3070c3 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java +++ b/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java @@ -4,11 +4,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.blocks.tiles.TileBorder; import noppes.npcs.client.Client; -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.*; import noppes.npcs.constants.EnumPacketServer; public class GuiBorderBlock extends GuiNPCInterface implements IGuiData{ diff --git a/src/main/java/noppes/npcs/client/gui/GuiMerchantAdd.java b/src/main/java/noppes/npcs/client/gui/GuiMerchantAdd.java index a7e24ce76..71f7c234f 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiMerchantAdd.java +++ b/src/main/java/noppes/npcs/client/gui/GuiMerchantAdd.java @@ -1,5 +1,7 @@ package noppes.npcs.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.minecraft.client.Minecraft; @@ -8,7 +10,6 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.resources.I18n; import net.minecraft.entity.IMerchant; -import net.minecraft.inventory.ContainerMerchant; import net.minecraft.item.ItemStack; import net.minecraft.network.play.client.C17PacketCustomPayload; import net.minecraft.util.ResourceLocation; @@ -20,13 +21,9 @@ import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.containers.ContainerMerchantAdd; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiMerchantAdd extends GuiContainer { diff --git a/src/main/java/noppes/npcs/client/gui/GuiNPCDialogSelection.java b/src/main/java/noppes/npcs/client/gui/GuiNPCDialogSelection.java index 7fdd12e38..d906fd0ab 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNPCDialogSelection.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNPCDialogSelection.java @@ -1,20 +1,16 @@ package noppes.npcs.client.gui; -import java.util.HashMap; -import java.util.Vector; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; -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.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.entity.EntityNPCInterface; +import java.util.HashMap; +import java.util.Vector; + public class GuiNPCDialogSelection extends GuiNPCInterface implements IScrollData { private GuiNPCStringSlot slot; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java b/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java index 5ceb9c005..2b3525881 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java @@ -1,20 +1,16 @@ package noppes.npcs.client.gui; -import java.util.HashMap; -import java.util.Vector; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; -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.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.entity.EntityNPCInterface; +import java.util.HashMap; +import java.util.Vector; + public class GuiNPCFactionSelection extends GuiNPCInterface implements IScrollData { diff --git a/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java b/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java index ab3a1674d..9598495c0 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java @@ -1,7 +1,5 @@ package noppes.npcs.client.gui; -import java.util.HashMap; - import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; @@ -15,6 +13,8 @@ import noppes.npcs.controllers.data.Line; import noppes.npcs.controllers.data.Lines; import noppes.npcs.entity.EntityNPCInterface; +import java.util.HashMap; + public class GuiNPCLinesEdit extends GuiNPCInterface2 implements IGuiData { private Lines lines; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNPCTextures.java b/src/main/java/noppes/npcs/client/gui/GuiNPCTextures.java index 9c4eedc5f..9c70a569e 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNPCTextures.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNPCTextures.java @@ -5,7 +5,6 @@ import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderManager; import noppes.npcs.entity.EntityNPCInterface; - import org.lwjgl.opengl.GL11; public class GuiNPCTextures extends GuiNpcSelectionInterface diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java b/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java index 4904cf24d..8f8c463b7 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java @@ -1,21 +1,14 @@ package noppes.npcs.client.gui; -import java.util.HashMap; -import java.util.Vector; - import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiYesNo; -import net.minecraft.entity.Entity; import net.minecraft.util.StatCollector; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.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.*; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.entity.EntityNPCInterface; + +import java.util.HashMap; +import java.util.Vector; public class GuiNpcDimension extends GuiNPCInterface implements IScrollData{ diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java index 46abaf364..a5f5aa604 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java @@ -1,12 +1,5 @@ package noppes.npcs.client.gui; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.Entity; @@ -15,19 +8,15 @@ import net.minecraft.entity.EntityLiving; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; -import noppes.npcs.CustomNpcs; -import noppes.npcs.LogWriter; import noppes.npcs.client.Client; import noppes.npcs.client.controllers.ClientCloneController; -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 noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.entity.EntityNPCInterface; + +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; public class GuiNpcMobSpawner extends GuiNPCInterface implements IGuiData{ diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java index 5a4146a05..0bf553d13 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java @@ -1,7 +1,5 @@ package noppes.npcs.client.gui; -import java.util.ArrayList; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiYesNo; @@ -10,11 +8,9 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; -import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.controllers.ClientCloneController; import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.entity.EntityNPCInterface; public class GuiNpcMobSpawnerAdd extends GuiNPCInterface implements GuiYesNoCallback, IGuiData{ diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java index b3cec0a09..78c9bda74 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java @@ -1,11 +1,5 @@ package noppes.npcs.client.gui; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.Entity; @@ -17,15 +11,14 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; import noppes.npcs.client.Client; import noppes.npcs.client.controllers.ClientCloneController; -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 noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + public class GuiNpcMobSpawnerMounter extends GuiNPCInterface implements IGuiData{ private GuiCustomScroll scroll; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java index 4636347d6..96b8905a9 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java @@ -1,25 +1,17 @@ package noppes.npcs.client.gui; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagDouble; import net.minecraft.nbt.NBTTagList; import noppes.npcs.client.Client; import noppes.npcs.client.controllers.ClientCloneController; -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.GuiNpcButton; -import noppes.npcs.client.gui.util.GuiNpcTextField; -import noppes.npcs.client.gui.util.IGuiData; -import noppes.npcs.client.gui.util.SubGuiInterface; +import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; +import java.util.ArrayList; +import java.util.List; + public class GuiNpcMobSpawnerSelector extends SubGuiInterface implements IGuiData{ private GuiCustomScroll scroll; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcPather.java b/src/main/java/noppes/npcs/client/gui/GuiNpcPather.java index 3d7fe49da..4e812a348 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcPather.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcPather.java @@ -1,9 +1,5 @@ package noppes.npcs.client.gui; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.DataAI; @@ -16,6 +12,10 @@ import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.entity.EntityNPCInterface; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + public class GuiNpcPather extends GuiNPCInterface implements IGuiData{ private GuiCustomScroll scroll; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java b/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java index 526554a91..ed2cf7845 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java @@ -1,8 +1,5 @@ package noppes.npcs.client.gui; -import java.util.HashMap; -import java.util.Vector; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; @@ -10,14 +7,13 @@ import net.minecraft.entity.Entity; import net.minecraft.util.StatCollector; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.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.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.entity.EntityNPCInterface; +import java.util.HashMap; +import java.util.Vector; + public class GuiNpcRemoteEditor extends GuiNPCInterface implements IScrollData, GuiYesNoCallback{ private GuiCustomScroll scroll; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcSelectionInterface.java b/src/main/java/noppes/npcs/client/gui/GuiNpcSelectionInterface.java index 7f98ca663..1604ce225 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcSelectionInterface.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcSelectionInterface.java @@ -1,21 +1,17 @@ package noppes.npcs.client.gui; -import java.util.Collections; -import java.util.HashSet; -import java.util.Vector; - import net.minecraft.client.gui.GuiButton; 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.GuiNPCInterface; -import noppes.npcs.client.gui.util.GuiNPCInterface2; -import noppes.npcs.client.gui.util.GuiNPCStringSlot; -import noppes.npcs.client.gui.util.GuiNpcButton; -import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.*; import noppes.npcs.entity.EntityNPCInterface; +import java.util.Collections; +import java.util.HashSet; +import java.util.Vector; + public abstract class GuiNpcSelectionInterface extends GuiNPCInterface{ public GuiNPCStringSlot slot; public GuiScreen parent; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcSoundSelection.java b/src/main/java/noppes/npcs/client/gui/GuiNpcSoundSelection.java index c20ec88a2..58961e34d 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcSoundSelection.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcSoundSelection.java @@ -1,11 +1,6 @@ package noppes.npcs.client.gui; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Set; - +import cpw.mods.fml.common.ObfuscationReflectionHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.SoundHandler; import net.minecraft.client.audio.SoundRegistry; @@ -14,13 +9,10 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import noppes.npcs.client.controllers.MusicController; -import noppes.npcs.client.gui.util.GuiNPCInterface; -import noppes.npcs.client.gui.util.GuiNPCInterface2; -import noppes.npcs.client.gui.util.GuiNPCStringSlot; -import noppes.npcs.client.gui.util.GuiNpcButton; -import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.*; import noppes.npcs.entity.EntityNPCInterface; -import cpw.mods.fml.common.ObfuscationReflectionHelper; + +import java.util.*; public class GuiNpcSoundSelection extends GuiNPCInterface{ diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcTextureCloaks.java b/src/main/java/noppes/npcs/client/gui/GuiNpcTextureCloaks.java index b706a3858..35e50c53a 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcTextureCloaks.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcTextureCloaks.java @@ -5,7 +5,6 @@ import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderManager; import noppes.npcs.entity.EntityNPCInterface; - import org.lwjgl.opengl.GL11; public class GuiNpcTextureCloaks extends GuiNpcSelectionInterface diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcTextureOverlays.java b/src/main/java/noppes/npcs/client/gui/GuiNpcTextureOverlays.java index 98ffa8dc6..3ff295ee8 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcTextureOverlays.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcTextureOverlays.java @@ -6,7 +6,6 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderManager; import noppes.npcs.controllers.data.SkinOverlay; import noppes.npcs.entity.EntityNPCInterface; - import org.lwjgl.opengl.GL11; public class GuiNpcTextureOverlays extends GuiNpcSelectionInterface{ diff --git a/src/main/java/noppes/npcs/client/gui/GuiScript.java b/src/main/java/noppes/npcs/client/gui/GuiScript.java index ea7e4f3a9..04ddd5cd1 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiScript.java +++ b/src/main/java/noppes/npcs/client/gui/GuiScript.java @@ -1,32 +1,24 @@ package noppes.npcs.client.gui; -import java.util.*; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiConfirmOpenLink; import net.minecraft.client.gui.GuiYesNoCallback; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.server.MinecraftServer; -import noppes.npcs.controllers.data.DataScript; import noppes.npcs.NoppesStringUtils; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.swing.GuiJTextArea; -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.ICustomScrollListener; -import noppes.npcs.client.gui.util.IGuiData; -import noppes.npcs.client.gui.util.IJTextAreaListener; +import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; +import noppes.npcs.controllers.data.DataScript; import noppes.npcs.entity.EntityNPCInterface; +import java.util.*; + public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCallback, ICustomScrollListener, IJTextAreaListener { public boolean showScript = false; private int activeTab = 0; diff --git a/src/main/java/noppes/npcs/client/gui/GuiScriptList.java b/src/main/java/noppes/npcs/client/gui/GuiScriptList.java index 5ec6bd1f2..a37f4f43e 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiScriptList.java +++ b/src/main/java/noppes/npcs/client/gui/GuiScriptList.java @@ -1,8 +1,5 @@ package noppes.npcs.client.gui; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.client.gui.GuiButton; import noppes.npcs.client.gui.util.GuiCustomScroll; import noppes.npcs.client.gui.util.GuiNpcButton; @@ -10,6 +7,9 @@ import noppes.npcs.client.gui.util.GuiNpcLabel; import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.ScriptContainer; +import java.util.ArrayList; +import java.util.List; + public class GuiScriptList extends SubGuiInterface{ private GuiCustomScroll scroll1; private GuiCustomScroll scroll2; diff --git a/src/main/java/noppes/npcs/client/gui/OverlayQuestTracking.java b/src/main/java/noppes/npcs/client/gui/OverlayQuestTracking.java index 270b76b87..169d43441 100644 --- a/src/main/java/noppes/npcs/client/gui/OverlayQuestTracking.java +++ b/src/main/java/noppes/npcs/client/gui/OverlayQuestTracking.java @@ -12,9 +12,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.ResourceLocation; -import noppes.npcs.CustomNpcs; import noppes.npcs.config.ConfigClient; -import noppes.npcs.config.ConfigScript; import noppes.npcs.controllers.data.Quest; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiColorSelector.java b/src/main/java/noppes/npcs/client/gui/SubGuiColorSelector.java index 2ecc3034f..48aec618c 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiColorSelector.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiColorSelector.java @@ -1,26 +1,19 @@ package noppes.npcs.client.gui; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.io.InputStream; - -import javax.imageio.ImageIO; - import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.IResource; import net.minecraft.util.ResourceLocation; -import noppes.npcs.ModelPartData; -import noppes.npcs.client.gui.util.GuiModelInterface; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.GuiNpcTextField; import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.client.gui.util.SubGuiInterface; -import noppes.npcs.entity.EntityCustomNpc; -import noppes.npcs.entity.EntityNPCInterface; - import org.lwjgl.opengl.GL11; +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.io.InputStream; + public class SubGuiColorSelector extends SubGuiInterface implements ITextfieldListener{ private final static ResourceLocation resource = new ResourceLocation("customnpcs:textures/gui/color.png"); diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiEditText.java b/src/main/java/noppes/npcs/client/gui/SubGuiEditText.java index 02c4d65b4..2d44df4a1 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiEditText.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiEditText.java @@ -3,7 +3,6 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.GuiNpcTextField; -import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.client.gui.util.SubGuiInterface; public class SubGuiEditText extends SubGuiInterface{ diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java b/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java index 8c0e5316a..d30c28638 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java @@ -7,12 +7,7 @@ import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.global.GuiNPCQuestSelection; import noppes.npcs.client.gui.player.GuiMailmanWrite; -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.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; 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 bcd12d257..d6ec32d26 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java @@ -4,13 +4,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.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.IGuiData; -import noppes.npcs.client.gui.util.SubGuiInterface; +import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumAvailabilityFactionType; import noppes.npcs.constants.EnumDayTime; import noppes.npcs.constants.EnumPacketServer; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java index c08f83434..2ba36e16d 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java @@ -4,11 +4,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.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.client.gui.util.*; import noppes.npcs.constants.EnumAvailabilityDialog; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.controllers.data.Availability; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java index 902bb3ce1..240075cf5 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java @@ -5,11 +5,7 @@ import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.global.GuiNPCQuestSelection; -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.client.gui.util.*; import noppes.npcs.constants.EnumAvailabilityQuest; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.controllers.data.Availability; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java index c4993d393..83eccfdb6 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java @@ -1,8 +1,5 @@ package noppes.npcs.client.gui; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.client.gui.GuiButton; import net.minecraft.world.biome.BiomeGenBase; import noppes.npcs.client.gui.util.GuiCustomScroll; @@ -11,6 +8,9 @@ import noppes.npcs.client.gui.util.GuiNpcLabel; import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.SpawnData; +import java.util.ArrayList; +import java.util.List; + 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 28d1217d0..892856c0e 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcCommand.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcCommand.java @@ -1,11 +1,7 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -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.client.gui.util.*; public class SubGuiNpcCommand extends SubGuiInterface implements ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogExtra.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogExtra.java index 39e55df76..f9575a0df 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogExtra.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogExtra.java @@ -3,11 +3,7 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.GuiNpcButton; -import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; -import noppes.npcs.client.gui.util.GuiNpcLabel; -import noppes.npcs.client.gui.util.ISubGuiListener; -import noppes.npcs.client.gui.util.SubGuiInterface; +import noppes.npcs.client.gui.util.*; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.PlayerMail; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java index 41f000a03..d28d5f93d 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java @@ -4,14 +4,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.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.client.gui.util.*; import noppes.npcs.constants.EnumOptionType; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.controllers.data.Dialog; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java index 4aab1870a..a00cb9f21 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java @@ -3,13 +3,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.CustomNpcs; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.global.GuiNPCManageDialogs; import noppes.npcs.client.gui.util.*; import noppes.npcs.config.ConfigMain; -import noppes.npcs.config.ConfigScript; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.DialogImage; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java index 4a1c543f5..fcfd6becd 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java @@ -1,21 +1,15 @@ package noppes.npcs.client.gui; -import java.util.HashMap; -import java.util.Vector; - import net.minecraft.client.gui.GuiButton; import net.minecraft.util.StatCollector; import noppes.npcs.client.Client; -import noppes.npcs.client.gui.util.GuiCustomScroll; -import noppes.npcs.client.gui.util.ICustomScrollListener; -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.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.controllers.data.FactionOptions; +import java.util.HashMap; +import java.util.Vector; + public class SubGuiNpcFactionOptions extends SubGuiInterface implements IScrollData,ICustomScrollListener { private FactionOptions options; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java index 4e6ee1ef0..9a5952e07 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java @@ -2,11 +2,7 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.StatCollector; -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.client.gui.util.*; import noppes.npcs.controllers.data.Faction; public class SubGuiNpcFactionPoints 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 e6fe8416c..23b76d687 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcMovement.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcMovement.java @@ -2,11 +2,7 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.DataAI; -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.client.gui.util.*; 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/SubGuiNpcProjectiles.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcProjectiles.java index 0fda866ba..c2bbc6570 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcProjectiles.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcProjectiles.java @@ -2,13 +2,9 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.DataStats; -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; +import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumParticleType; +import noppes.npcs.constants.EnumPotionType; public class SubGuiNpcProjectiles extends SubGuiInterface implements ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java index 9810d7085..a859f9e05 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java @@ -3,12 +3,7 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.DataStats; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.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.client.gui.util.*; public class SubGuiNpcRangeProperties extends SubGuiInterface implements ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java index 63427aa77..7e40a5a35 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java @@ -2,11 +2,7 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.Resistances; -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; +import noppes.npcs.client.gui.util.*; public class SubGuiNpcResistanceProperties extends SubGuiInterface implements ISliderListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRespawn.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRespawn.java index 0779ac282..bde28b39a 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRespawn.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRespawn.java @@ -2,11 +2,7 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.DataStats; -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.client.gui.util.*; public class SubGuiNpcRespawn 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 37e4e88b6..e5faca9e9 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java @@ -1,21 +1,17 @@ package noppes.npcs.client.gui.advanced; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiScreen; +import noppes.npcs.client.Client; +import noppes.npcs.client.gui.util.*; +import noppes.npcs.constants.EnumPacketServer; +import noppes.npcs.entity.EntityNPCInterface; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Vector; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; -import noppes.npcs.client.Client; -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.EnumPacketServer; -import noppes.npcs.entity.EntityNPCInterface; - public class GuiNPCAdvancedLinkedNpc extends GuiNPCInterface2 implements IScrollData, ICustomScrollListener{ private GuiCustomScroll scroll; private List data = new ArrayList(); 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 7617508e3..e242b27e2 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java @@ -1,22 +1,18 @@ package noppes.npcs.client.gui.advanced; -import java.util.HashMap; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.GuiNPCDialogSelection; -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.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.controllers.data.DialogOption; import noppes.npcs.entity.EntityNPCInterface; +import java.util.HashMap; + public class GuiNPCDialogNpcOptions extends GuiNPCInterface2 implements GuiSelectionListener,IGuiData{ private GuiScreen parent; 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 eaa14067a..645b5b6fe 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCFactionSetup.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCFactionSetup.java @@ -1,21 +1,16 @@ package noppes.npcs.client.gui.advanced; -import java.util.HashMap; -import java.util.Vector; - import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; import noppes.npcs.client.gui.SubGuiNpcFactionOptions; -import noppes.npcs.client.gui.util.GuiCustomScroll; -import noppes.npcs.client.gui.util.ICustomScrollListener; -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.IScrollData; +import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.entity.EntityNPCInterface; +import java.util.HashMap; +import java.util.Vector; + public class GuiNPCFactionSetup extends GuiNPCInterface2 implements IScrollData,ICustomScrollListener { private GuiCustomScroll scrollFactions; 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 f52f0d72f..ab4bbefbb 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCSoundsMenu.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCSoundsMenu.java @@ -5,11 +5,7 @@ import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.GuiNpcSoundSelection; -import noppes.npcs.client.gui.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.ITextfieldListener; +import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java b/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java index 05c84d1ba..f85078f3b 100644 --- a/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java +++ b/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java @@ -19,6 +19,7 @@ import net.minecraft.util.EnumChatFormatting; 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.Client; import noppes.npcs.client.gui.custom.components.*; import noppes.npcs.client.gui.custom.interfaces.IClickListener; @@ -30,7 +31,6 @@ import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.containers.ContainerCustomGui; import noppes.npcs.scripted.gui.*; -import noppes.npcs.api.gui.ICustomGuiComponent; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiButton.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiButton.java index c3f5e4515..33e3f7afa 100644 --- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiButton.java +++ b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiButton.java @@ -11,12 +11,12 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.texture.ITextureObject; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; +import noppes.npcs.api.gui.ICustomGuiComponent; import noppes.npcs.client.ImageDownloadAlt; import noppes.npcs.client.gui.custom.GuiCustom; import noppes.npcs.client.gui.custom.interfaces.IClickListener; import noppes.npcs.client.renderer.ImageBufferDownloadAlt; import noppes.npcs.scripted.gui.ScriptGuiButton; -import noppes.npcs.api.gui.ICustomGuiComponent; import org.lwjgl.opengl.GL11; public class CustomGuiButton extends GuiButton implements IClickListener { diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLabel.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLabel.java index 9b3abd2ec..532dad5c9 100644 --- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLabel.java +++ b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLabel.java @@ -12,10 +12,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.ResourceLocation; +import noppes.npcs.api.gui.ICustomGuiComponent; import noppes.npcs.client.gui.custom.GuiCustom; import noppes.npcs.client.gui.custom.interfaces.IGuiComponent; import noppes.npcs.scripted.gui.ScriptGuiLabel; -import noppes.npcs.api.gui.ICustomGuiComponent; import org.lwjgl.opengl.GL11; import javax.imageio.ImageIO; diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLine.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLine.java index 687574fe4..c63bac363 100644 --- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLine.java +++ b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLine.java @@ -3,10 +3,10 @@ package noppes.npcs.client.gui.custom.components; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.util.ResourceLocation; +import noppes.npcs.api.gui.ICustomGuiComponent; import noppes.npcs.client.gui.custom.GuiCustom; import noppes.npcs.client.gui.custom.interfaces.IGuiComponent; import noppes.npcs.scripted.gui.ScriptGuiLine; -import noppes.npcs.api.gui.ICustomGuiComponent; import org.lwjgl.opengl.GL11; public class CustomGuiLine extends Gui implements IGuiComponent { diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiScrollComponent.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiScrollComponent.java index b71ba5b49..f92dfc205 100644 --- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiScrollComponent.java +++ b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiScrollComponent.java @@ -5,21 +5,22 @@ package noppes.npcs.client.gui.custom.components; -import java.util.Arrays; -import java.util.Iterator; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; +import noppes.npcs.api.gui.ICustomGuiComponent; import noppes.npcs.client.gui.custom.GuiCustom; import noppes.npcs.client.gui.custom.interfaces.IClickListener; import noppes.npcs.client.gui.custom.interfaces.IDataHolder; import noppes.npcs.client.gui.util.GuiCustomScroll; import noppes.npcs.scripted.gui.ScriptGuiScroll; -import noppes.npcs.api.gui.ICustomGuiComponent; import org.lwjgl.opengl.GL11; +import java.util.Arrays; +import java.util.Iterator; + public class CustomGuiScrollComponent extends GuiCustomScroll implements IDataHolder, IClickListener { GuiCustom parent; String[] hoverText; diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTextField.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTextField.java index 157c26362..009f1a985 100644 --- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTextField.java +++ b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTextField.java @@ -8,12 +8,12 @@ package noppes.npcs.client.gui.custom.components; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiTextField; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.api.gui.ICustomGuiComponent; import noppes.npcs.client.gui.custom.GuiCustom; import noppes.npcs.client.gui.custom.interfaces.IClickListener; import noppes.npcs.client.gui.custom.interfaces.IDataHolder; import noppes.npcs.client.gui.custom.interfaces.IKeyListener; import noppes.npcs.scripted.gui.ScriptGuiTextField; -import noppes.npcs.api.gui.ICustomGuiComponent; import org.lwjgl.opengl.GL11; public class CustomGuiTextField extends GuiTextField implements IKeyListener, IDataHolder, IClickListener { diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTexturedRect.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTexturedRect.java index 97c986c7c..dcf3c5db7 100644 --- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTexturedRect.java +++ b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTexturedRect.java @@ -11,12 +11,12 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.resources.IResource; import net.minecraft.util.ResourceLocation; +import noppes.npcs.api.gui.ICustomGuiComponent; import noppes.npcs.client.ImageDownloadAlt; import noppes.npcs.client.gui.custom.GuiCustom; import noppes.npcs.client.gui.custom.interfaces.IGuiComponent; import noppes.npcs.client.renderer.ImageBufferDownloadAlt; import noppes.npcs.scripted.gui.ScriptGuiTexturedRect; -import noppes.npcs.api.gui.ICustomGuiComponent; import org.lwjgl.opengl.GL11; import javax.imageio.ImageIO; 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 952d6d2fc..2926b1c2c 100644 --- a/src/main/java/noppes/npcs/client/gui/customoverlay/OverlayCustom.java +++ b/src/main/java/noppes/npcs/client/gui/customoverlay/OverlayCustom.java @@ -5,11 +5,11 @@ import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.api.overlay.ICustomOverlayComponent; 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.api.overlay.ICustomOverlayComponent; import noppes.npcs.scripted.overlay.*; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLabel.java b/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLabel.java index f81dcc11b..ce55d6438 100644 --- a/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLabel.java +++ b/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLabel.java @@ -7,9 +7,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.ResourceLocation; +import noppes.npcs.api.overlay.ICustomOverlayComponent; import noppes.npcs.client.gui.customoverlay.OverlayCustom; import noppes.npcs.client.gui.customoverlay.interfaces.IOverlayComponent; -import noppes.npcs.api.overlay.ICustomOverlayComponent; import noppes.npcs.scripted.overlay.ScriptOverlayLabel; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLine.java b/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLine.java index 1aef10799..40826ec89 100644 --- a/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLine.java +++ b/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLine.java @@ -4,9 +4,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.ResourceLocation; +import noppes.npcs.api.overlay.ICustomOverlayComponent; import noppes.npcs.client.gui.customoverlay.OverlayCustom; import noppes.npcs.client.gui.customoverlay.interfaces.IOverlayComponent; -import noppes.npcs.api.overlay.ICustomOverlayComponent; import noppes.npcs.scripted.overlay.ScriptOverlayLine; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayTexturedRect.java b/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayTexturedRect.java index 39409e12c..1dd320a13 100644 --- a/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayTexturedRect.java +++ b/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayTexturedRect.java @@ -6,11 +6,11 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.resources.IResource; import net.minecraft.util.ResourceLocation; +import noppes.npcs.api.overlay.ICustomOverlayComponent; import noppes.npcs.client.ImageDownloadAlt; import noppes.npcs.client.gui.customoverlay.OverlayCustom; import noppes.npcs.client.gui.customoverlay.interfaces.IOverlayComponent; import noppes.npcs.client.renderer.ImageBufferDownloadAlt; -import noppes.npcs.api.overlay.ICustomOverlayComponent; import noppes.npcs.scripted.overlay.ScriptOverlayTexturedRect; import org.lwjgl.opengl.GL11; 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 ad8888012..c66fbc557 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java @@ -1,25 +1,18 @@ package noppes.npcs.client.gui.global; -import java.util.HashMap; -import java.util.Vector; - import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; import noppes.npcs.client.CustomNpcResourceListener; -import noppes.npcs.client.gui.util.GuiContainerNPCInterface2; -import noppes.npcs.client.gui.util.GuiCustomScroll; -import noppes.npcs.client.gui.util.ICustomScrollListener; -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.IScrollData; -import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.containers.ContainerManageBanks; import noppes.npcs.controllers.data.Bank; import noppes.npcs.entity.EntityNPCInterface; +import java.util.HashMap; +import java.util.Vector; + public class GuiNPCManageBanks extends GuiContainerNPCInterface2 implements IScrollData,ICustomScrollListener,ITextfieldListener, IGuiData { private GuiCustomScroll scroll; 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 5252bc50a..77cd3d0c8 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java @@ -1,30 +1,19 @@ package noppes.npcs.client.gui.global; -import java.util.HashMap; -import java.util.Vector; - import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.*; -import noppes.npcs.client.gui.util.GuiCustomScroll; -import noppes.npcs.client.gui.util.ICustomScrollListener; -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.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.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.DialogCategory; import noppes.npcs.entity.EntityNPCInterface; +import java.util.HashMap; +import java.util.Vector; + public class GuiNPCManageDialogs extends GuiNPCInterface2 implements IScrollData, ISubGuiListener, GuiSelectionListener,ICustomScrollListener,ITextfieldListener, IGuiData { private GuiCustomScroll scroll; 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 0a0f756dd..d744c9239 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java @@ -1,30 +1,20 @@ package noppes.npcs.client.gui.global; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Vector; - import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; import noppes.npcs.client.gui.SubGuiColorSelector; import noppes.npcs.client.gui.SubGuiNpcFactionPoints; -import noppes.npcs.client.gui.util.GuiCustomScroll; -import noppes.npcs.client.gui.util.ICustomScrollListener; -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.client.gui.util.ISubGuiListener; -import noppes.npcs.client.gui.util.ITextfieldListener; -import noppes.npcs.client.gui.util.SubGuiInterface; +import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.controllers.data.Faction; import noppes.npcs.entity.EntityNPCInterface; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Vector; + public class GuiNPCManageFactions extends GuiNPCInterface2 implements IScrollData,ICustomScrollListener,ITextfieldListener, IGuiData, ISubGuiListener { private GuiCustomScroll scrollFactions; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinkedNpc.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinkedNpc.java index 3eeaf2d99..303fb9368 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinkedNpc.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinkedNpc.java @@ -1,23 +1,18 @@ package noppes.npcs.client.gui.global; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Vector; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import noppes.npcs.client.Client; import noppes.npcs.client.gui.SubGuiEditText; -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.IScrollData; -import noppes.npcs.client.gui.util.ISubGuiListener; -import noppes.npcs.client.gui.util.SubGuiInterface; +import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.entity.EntityNPCInterface; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Vector; + public class GuiNPCManageLinkedNpc extends GuiNPCInterface2 implements IScrollData, ISubGuiListener{ private GuiCustomScroll scroll; private List data = new ArrayList(); 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 2bda9c993..d6f9a4373 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java @@ -1,8 +1,5 @@ package noppes.npcs.client.gui.global; -import java.util.HashMap; -import java.util.Vector; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.nbt.NBTTagCompound; @@ -14,27 +11,15 @@ import noppes.npcs.client.gui.SubGuiNpcTextArea; import noppes.npcs.client.gui.questtypes.GuiNpcQuestTypeDialog; import noppes.npcs.client.gui.questtypes.GuiNpcQuestTypeKill; import noppes.npcs.client.gui.questtypes.GuiNpcQuestTypeLocation; -import noppes.npcs.client.gui.util.GuiCustomScroll; -import noppes.npcs.client.gui.util.ICustomScrollListener; -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.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.EnumPacketServer; -import noppes.npcs.constants.EnumQuestCompletion; -import noppes.npcs.constants.EnumQuestRepeat; -import noppes.npcs.constants.EnumQuestType; +import noppes.npcs.client.gui.util.*; +import noppes.npcs.constants.*; import noppes.npcs.controllers.data.Quest; import noppes.npcs.controllers.data.QuestCategory; import noppes.npcs.entity.EntityNPCInterface; +import java.util.HashMap; +import java.util.Vector; + public class GuiNPCManageQuest extends GuiNPCInterface2 implements IScrollData, ISubGuiListener, GuiSelectionListener,ICustomScrollListener,ITextfieldListener, IGuiData { private GuiCustomScroll scroll; 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 2f48ac98b..f3e8a0013 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTags.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTags.java @@ -9,9 +9,7 @@ import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.controllers.data.Tag; import noppes.npcs.entity.EntityNPCInterface; -import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.Vector; public class GuiNPCManageTags extends GuiNPCInterface2 implements IScrollData,ICustomScrollListener,ITextfieldListener, IGuiData, ISubGuiListener diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTransporters.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTransporters.java index 5d613744a..78d04026e 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTransporters.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTransporters.java @@ -1,8 +1,5 @@ package noppes.npcs.client.gui.global; -import java.util.HashMap; -import java.util.Vector; - import net.minecraft.client.gui.GuiButton; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; @@ -15,6 +12,9 @@ import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.entity.EntityNPCInterface; +import java.util.HashMap; +import java.util.Vector; + public class GuiNPCManageTransporters extends GuiNPCInterface implements IScrollData { diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCQuestSelection.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCQuestSelection.java index ca95d5ebf..158278c0d 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCQuestSelection.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCQuestSelection.java @@ -1,20 +1,16 @@ package noppes.npcs.client.gui.global; -import java.util.HashMap; -import java.util.Vector; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; -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.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.entity.EntityNPCInterface; +import java.util.HashMap; +import java.util.Vector; + public class GuiNPCQuestSelection extends GuiNPCInterface implements IScrollData { private GuiNPCStringSlot slot; 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 018f32e6a..e9b821b4b 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java @@ -1,23 +1,17 @@ package noppes.npcs.client.gui.global; +import net.minecraft.client.gui.GuiButton; +import noppes.npcs.client.Client; +import noppes.npcs.client.gui.util.*; +import noppes.npcs.constants.EnumPacketServer; +import noppes.npcs.constants.EnumPlayerData; +import noppes.npcs.entity.EntityNPCInterface; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Vector; -import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.Client; -import noppes.npcs.client.gui.util.GuiCustomScroll; -import noppes.npcs.client.gui.util.ICustomScrollListener; -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.IScrollData; -import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.constants.EnumPlayerData; -import noppes.npcs.entity.EntityNPCInterface; - public class GuiNpcManagePlayerData extends GuiNPCInterface2 implements IScrollData,ICustomScrollListener { private GuiCustomScroll scroll; 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 ed8cf2fc2..373fa679c 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java @@ -1,31 +1,21 @@ package noppes.npcs.client.gui.global; -import java.util.HashMap; -import java.util.Vector; - import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; -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.ITextfieldListener; +import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.containers.ContainerManageRecipes; import noppes.npcs.controllers.data.RecipeCarpentry; import noppes.npcs.entity.EntityNPCInterface; - import org.lwjgl.opengl.GL11; +import java.util.HashMap; +import java.util.Vector; + public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IScrollData, IGuiData, ICustomScrollListener,ITextfieldListener{ private GuiCustomScroll scroll; private HashMap data = new HashMap(); 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 2d52bd8d0..1086bc3c0 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java @@ -1,8 +1,5 @@ package noppes.npcs.client.gui.global; -import java.util.HashMap; -import java.util.Vector; - import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; @@ -10,22 +7,14 @@ import noppes.npcs.client.Client; import noppes.npcs.client.gui.GuiNpcMobSpawnerSelector; import noppes.npcs.client.gui.SubGuiNpcBiomes; import noppes.npcs.client.gui.SubGuiSpawningOptions; -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.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.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.controllers.data.SpawnData; import noppes.npcs.entity.EntityNPCInterface; +import java.util.HashMap; +import java.util.Vector; + public class GuiNpcNaturalSpawns extends GuiNPCInterface2 implements IGuiData, IScrollData, ITextfieldListener, ICustomScrollListener, ISliderListener{ private GuiCustomScroll scroll; 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 072b5ee07..647e3361a 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcQuestReward.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcQuestReward.java @@ -3,15 +3,10 @@ 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.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.client.gui.util.*; import noppes.npcs.containers.ContainerNpcQuestReward; import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; - import org.lwjgl.opengl.GL11; public class GuiNpcQuestReward extends GuiContainerNPCInterface implements ITextfieldListener diff --git a/src/main/java/noppes/npcs/client/gui/global/SubGuiNpcQuestAdvanced.java b/src/main/java/noppes/npcs/client/gui/global/SubGuiNpcQuestAdvanced.java index 557afa0dd..425c425db 100644 --- a/src/main/java/noppes/npcs/client/gui/global/SubGuiNpcQuestAdvanced.java +++ b/src/main/java/noppes/npcs/client/gui/global/SubGuiNpcQuestAdvanced.java @@ -5,11 +5,7 @@ import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiMailmanSendSetup; import noppes.npcs.client.gui.SubGuiNpcCommand; import noppes.npcs.client.gui.SubGuiNpcFactionOptions; -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.client.gui.util.*; import noppes.npcs.controllers.data.PlayerMail; import noppes.npcs.controllers.data.Quest; 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 2a37f8b40..f37ee68c9 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCGlobalMainMenu.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCGlobalMainMenu.java @@ -3,8 +3,6 @@ package noppes.npcs.client.gui.mainmenu; import net.minecraft.client.gui.GuiButton; import noppes.npcs.NoppesStringUtils; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.advanced.GuiNPCLinesMenu; -import noppes.npcs.client.gui.global.GuiNPCManageLinkedNpc; import noppes.npcs.client.gui.global.GuiNpcManagePlayerData; import noppes.npcs.client.gui.global.GuiNpcNaturalSpawns; import noppes.npcs.client.gui.util.GuiNPCInterface2; 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 6348803eb..730c4206c 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCInv.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCInv.java @@ -1,28 +1,21 @@ package noppes.npcs.client.gui.mainmenu; -import java.util.HashMap; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; import noppes.npcs.client.Client; import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.containers.ContainerNPCInv; import noppes.npcs.entity.EntityNPCInterface; - import org.lwjgl.opengl.GL11; +import java.util.HashMap; + public class GuiNPCInv extends GuiContainerNPCInterface2 implements IGuiData, ITextfieldListener { private HashMap chances = new HashMap(); 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 dd95ceab9..e54840f77 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAI.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAI.java @@ -5,12 +5,7 @@ import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.DataAI; import noppes.npcs.client.Client; import noppes.npcs.client.gui.SubGuiNpcMovement; -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.*; import noppes.npcs.constants.EnumNavType; import noppes.npcs.constants.EnumPacketServer; 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 972f0790c..b92dbe2e5 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java @@ -5,20 +5,8 @@ import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NoppesStringUtils; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; -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.GuiNPCNightSetup; -import noppes.npcs.client.gui.advanced.GuiNPCSoundsMenu; -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.advanced.*; +import noppes.npcs.client.gui.roles.*; 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 0f94863fa..773fab862 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java @@ -1,10 +1,8 @@ package noppes.npcs.client.gui.mainmenu; import com.mojang.authlib.GameProfile; - import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.CustomNpcs; import noppes.npcs.DataDisplay; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; 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 18e0c719e..b3aaa507f 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java @@ -5,18 +5,8 @@ import net.minecraft.entity.EnumCreatureAttribute; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.DataStats; import noppes.npcs.client.Client; -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.client.gui.*; +import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java b/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java index b7a48ac2f..d10a28b9a 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java @@ -1,14 +1,5 @@ package noppes.npcs.client.gui.model; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -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 net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; @@ -23,15 +14,15 @@ import net.minecraft.nbt.NBTTagByte; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import noppes.npcs.client.Client; -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.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.controllers.PixelmonHelper; import noppes.npcs.entity.*; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.*; + public class GuiCreationScreen extends GuiModelInterface implements ICustomScrollListener{ public HashMap> data = new HashMap>(); 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 2bdaf605e..40eaf34f5 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiEntitySelection.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiEntitySelection.java @@ -1,13 +1,10 @@ package noppes.npcs.client.gui.model; -import java.util.Collections; -import java.util.Vector; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.NPCRendererHelper; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RendererLivingEntity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLivingBase; @@ -17,9 +14,11 @@ 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 org.lwjgl.opengl.GL11; +import java.util.Collections; +import java.util.Vector; + public class GuiEntitySelection extends GuiNPCInterface { private GuiNPCStringSlot slot; diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiModelColor.java b/src/main/java/noppes/npcs/client/gui/model/GuiModelColor.java index e053b0e8f..efe34d234 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiModelColor.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiModelColor.java @@ -1,11 +1,5 @@ package noppes.npcs.client.gui.model; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.io.InputStream; - -import javax.imageio.ImageIO; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.IResource; @@ -15,9 +9,13 @@ import noppes.npcs.client.gui.util.GuiModelInterface; import noppes.npcs.client.gui.util.GuiNpcTextField; import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.entity.EntityCustomNpc; - import org.lwjgl.opengl.GL11; +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.io.InputStream; + public class GuiModelColor extends GuiModelInterface implements ITextfieldListener{ private GuiScreen parent; 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 ac1cfcd01..752b58c10 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiModelScale.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiModelScale.java @@ -4,11 +4,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import noppes.npcs.ModelData; import noppes.npcs.ModelPartConfig; -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.client.gui.util.*; import noppes.npcs.entity.EntityCustomNpc; public class GuiModelScale extends GuiModelInterface implements ISliderListener{ diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiPresetSelection.java b/src/main/java/noppes/npcs/client/gui/model/GuiPresetSelection.java index eb4d99397..cf792e4d4 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiPresetSelection.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiPresetSelection.java @@ -1,8 +1,5 @@ package noppes.npcs.client.gui.model; -import java.util.Collections; -import java.util.Vector; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; @@ -19,9 +16,11 @@ 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.EntityCustomNpc; - import org.lwjgl.opengl.GL11; +import java.util.Collections; +import java.util.Vector; + public class GuiPresetSelection extends GuiNPCInterface { private GuiNPCStringSlot slot; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiBook.java b/src/main/java/noppes/npcs/client/gui/player/GuiBook.java index d66206f45..9ec122271 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiBook.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiBook.java @@ -1,5 +1,7 @@ package noppes.npcs.client.gui.player; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; @@ -15,15 +17,11 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.constants.EnumPlayerPacket; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiBook extends GuiScreen { diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiCrate.java b/src/main/java/noppes/npcs/client/gui/player/GuiCrate.java index d5d62d854..6ab456672 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiCrate.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiCrate.java @@ -1,18 +1,15 @@ package noppes.npcs.client.gui.player; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; -import net.minecraft.inventory.ContainerChest; import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.containers.ContainerCrate; - import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiCrate extends GuiContainer { diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiDialogImage.java b/src/main/java/noppes/npcs/client/gui/player/GuiDialogImage.java index 0d0d224ea..d8d3266d8 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiDialogImage.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiDialogImage.java @@ -3,12 +3,10 @@ package noppes.npcs.client.gui.player; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.ITextureObject; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.resources.IResource; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.ImageDownloadAlt; -import noppes.npcs.client.gui.customoverlay.OverlayCustom; import noppes.npcs.client.renderer.ImageBufferDownloadAlt; import noppes.npcs.controllers.data.DialogImage; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java b/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java index dd3606cf7..2a18a7bd6 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java @@ -1,9 +1,5 @@ package noppes.npcs.client.gui.player; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.FontRenderer; @@ -16,6 +12,7 @@ import net.minecraft.util.IChatComponent; import net.minecraft.util.ResourceLocation; import noppes.npcs.NoppesStringUtils; import noppes.npcs.NoppesUtilPlayer; +import noppes.npcs.api.handler.data.IDialogImage; import noppes.npcs.client.ClientProxy; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.TextBlockClient; @@ -28,13 +25,15 @@ import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.DialogImage; import noppes.npcs.controllers.data.DialogOption; import noppes.npcs.entity.EntityNPCInterface; - -import noppes.npcs.api.handler.data.IDialogImage; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose { private Dialog dialog; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiFaction.java b/src/main/java/noppes/npcs/client/gui/player/GuiFaction.java index 5b4ea3590..a26e43ec2 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiFaction.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiFaction.java @@ -1,7 +1,5 @@ package noppes.npcs.client.gui.player; -import java.util.ArrayList; - import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -15,12 +13,12 @@ import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.constants.EnumPlayerPacket; import noppes.npcs.controllers.data.Faction; import noppes.npcs.controllers.data.PlayerFactionData; - import org.lwjgl.opengl.GL11; - import tconstruct.client.tabs.InventoryTabFactions; import tconstruct.client.tabs.TabRegistry; +import java.util.ArrayList; + public class GuiFaction extends GuiNPCInterface implements IGuiData{ private int xSize; 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 5306b4def..f3028e3df 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiMailbox.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiMailbox.java @@ -1,10 +1,5 @@ package noppes.npcs.client.gui.player; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; @@ -12,16 +7,16 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.client.NoppesUtil; -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.client.gui.util.*; import noppes.npcs.constants.EnumPlayerPacket; import noppes.npcs.controllers.data.PlayerMail; import noppes.npcs.controllers.data.PlayerMailData; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + public class GuiMailbox extends GuiNPCInterface implements IGuiData, ICustomScrollListener, GuiYesNoCallback{ private GuiCustomScroll scroll; 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 46909fd8c..d17b799c9 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java @@ -1,5 +1,7 @@ package noppes.npcs.client.gui.player; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; @@ -9,31 +11,16 @@ 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.ChatAllowedCharacters; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.*; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.client.NoppesUtil; -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.client.gui.util.*; import noppes.npcs.constants.EnumPlayerPacket; import noppes.npcs.containers.ContainerMail; import noppes.npcs.controllers.data.PlayerMail; - import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiMailmanWrite extends GuiContainerNPCInterface implements ITextfieldListener, IGuiError, IGuiClose, GuiYesNoCallback { diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiNPCBankChest.java b/src/main/java/noppes/npcs/client/gui/player/GuiNPCBankChest.java index 25fafefb9..3b86a26b9 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiNPCBankChest.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiNPCBankChest.java @@ -15,7 +15,6 @@ import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.constants.EnumPlayerPacket; import noppes.npcs.containers.ContainerNPCBankInterface; import noppes.npcs.entity.EntityNPCInterface; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiNPCTrader.java b/src/main/java/noppes/npcs/client/gui/player/GuiNPCTrader.java index 799d019ab..a0e3f44cb 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiNPCTrader.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiNPCTrader.java @@ -1,7 +1,6 @@ package noppes.npcs.client.gui.player; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -11,7 +10,6 @@ import noppes.npcs.client.gui.util.GuiContainerNPCInterface; import noppes.npcs.containers.ContainerNPCTrader; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleTrader; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiNpcCarpentryBench.java b/src/main/java/noppes/npcs/client/gui/player/GuiNpcCarpentryBench.java index d4cfc5ca3..776510cb0 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiNpcCarpentryBench.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiNpcCarpentryBench.java @@ -1,7 +1,6 @@ package noppes.npcs.client.gui.player; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.resources.I18n; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import noppes.npcs.client.CustomNpcResourceListener; @@ -9,7 +8,6 @@ import noppes.npcs.client.gui.util.GuiContainerNPCInterface; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.containers.ContainerCarpentryBench; import noppes.npcs.controllers.RecipeController; - import org.lwjgl.opengl.GL11; public class GuiNpcCarpentryBench extends GuiContainerNPCInterface diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiNpcFollower.java b/src/main/java/noppes/npcs/client/gui/player/GuiNpcFollower.java index acb032a81..a51ad56d5 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiNpcFollower.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiNpcFollower.java @@ -15,7 +15,6 @@ import noppes.npcs.constants.EnumPlayerPacket; import noppes.npcs.containers.ContainerNPCFollower; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleFollower; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiNpcFollowerHire.java b/src/main/java/noppes/npcs/client/gui/player/GuiNpcFollowerHire.java index 7d1a1aec8..174c394bc 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiNpcFollowerHire.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiNpcFollowerHire.java @@ -13,7 +13,6 @@ import noppes.npcs.constants.EnumPlayerPacket; import noppes.npcs.containers.ContainerNPCFollowerHire; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleFollower; - import org.lwjgl.opengl.GL11; public class GuiNpcFollowerHire extends GuiContainerNPCInterface diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiQuestCompletion.java b/src/main/java/noppes/npcs/client/gui/player/GuiQuestCompletion.java index cb37aa3e5..698badc81 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiQuestCompletion.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiQuestCompletion.java @@ -3,16 +3,13 @@ package noppes.npcs.client.gui.player; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.TextBlockClient; 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.ITopButtonListener; -import noppes.npcs.constants.EnumPlayerPacket; import noppes.npcs.controllers.data.Quest; - import org.lwjgl.opengl.GL11; public class GuiQuestCompletion extends GuiNPCInterface implements ITopButtonListener{ diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiQuestLog.java b/src/main/java/noppes/npcs/client/gui/player/GuiQuestLog.java index 4fce0cb4a..cedbe2804 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiQuestLog.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiQuestLog.java @@ -1,10 +1,5 @@ package noppes.npcs.client.gui.player; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; @@ -20,12 +15,15 @@ import noppes.npcs.client.TextBlockClient; import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.constants.EnumPlayerPacket; - import org.lwjgl.opengl.GL11; - import tconstruct.client.tabs.InventoryTabQuests; import tconstruct.client.tabs.TabRegistry; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; + public class GuiQuestLog extends GuiNPCInterface implements ITopButtonListener,ICustomScrollListener, IGuiData{ private final ResourceLocation resource = new ResourceLocation("customnpcs","textures/gui/standardbg.png"); 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 0348bba47..d3fb503b7 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiRecipes.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiRecipes.java @@ -1,11 +1,7 @@ package noppes.npcs.client.gui.player; -import java.util.ArrayList; -import java.util.List; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.RenderHelper; @@ -17,10 +13,13 @@ import noppes.npcs.client.gui.util.GuiButtonNextPage; import noppes.npcs.client.gui.util.GuiNPCInterface; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.GuiNpcLabel; -import noppes.npcs.controllers.data.RecipeCarpentry; import noppes.npcs.controllers.RecipeController; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import noppes.npcs.controllers.data.RecipeCarpentry; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import java.util.ArrayList; +import java.util.List; @SideOnly(Side.CLIENT) public class GuiRecipes extends GuiNPCInterface 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 0b102bd21..cdad6e814 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiTransportSelection.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiTransportSelection.java @@ -1,23 +1,17 @@ package noppes.npcs.client.gui.player; -import java.util.HashMap; -import java.util.Vector; - import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import noppes.npcs.NoppesUtilPlayer; -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.ITopButtonListener; -import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumPlayerPacket; import noppes.npcs.entity.EntityNPCInterface; - import org.lwjgl.opengl.GL11; +import java.util.HashMap; +import java.util.Vector; + public class GuiTransportSelection extends GuiNPCInterface implements ITopButtonListener,IScrollData{ private final ResourceLocation resource = new ResourceLocation("customnpcs","textures/gui/smallbg.png"); diff --git a/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionInv.java b/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionInv.java index f4dec90c3..d002b3bd1 100644 --- a/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionInv.java +++ b/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionInv.java @@ -1,19 +1,14 @@ package noppes.npcs.client.gui.player.companion; import net.minecraft.client.gui.GuiButton; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import noppes.npcs.CustomItems; import noppes.npcs.CustomNpcs; import noppes.npcs.client.gui.util.GuiContainerNPCInterface; -import noppes.npcs.client.gui.util.GuiMenuTopIconButton; -import noppes.npcs.constants.EnumCompanionJobs; import noppes.npcs.constants.EnumCompanionTalent; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.containers.ContainerNPCCompanion; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleCompanion; - import org.lwjgl.opengl.GL11; public class GuiNpcCompanionInv extends GuiContainerNPCInterface{ 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 125e6a14d..b393299e2 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 @@ -9,11 +9,7 @@ import noppes.npcs.CustomItems; import noppes.npcs.CustomNpcs; import noppes.npcs.NoppesStringUtils; import noppes.npcs.NoppesUtilPlayer; -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.client.gui.util.*; 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/companion/GuiNpcCompanionTalents.java b/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionTalents.java index 5d4a66ac4..99740d703 100644 --- a/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionTalents.java +++ b/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionTalents.java @@ -1,10 +1,5 @@ package noppes.npcs.client.gui.player.companion; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiButton; @@ -25,11 +20,13 @@ import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumPlayerPacket; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleCompanion; - import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import java.util.HashMap; +import java.util.Map; + public class GuiNpcCompanionTalents extends GuiNPCInterface{ private RoleCompanion role; private Map talents = new HashMap(); diff --git a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeDialog.java b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeDialog.java index f4e7694cb..e2001ef10 100644 --- a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeDialog.java +++ b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeDialog.java @@ -1,7 +1,5 @@ package noppes.npcs.client.gui.questtypes; -import java.util.HashMap; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.nbt.NBTTagCompound; @@ -17,6 +15,8 @@ import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.quests.QuestDialog; +import java.util.HashMap; + public class GuiNpcQuestTypeDialog extends SubGuiInterface implements GuiSelectionListener, IGuiData { private GuiScreen parent; 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 87a3297f3..b1da79ffa 100644 --- a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeItem.java +++ b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeItem.java @@ -4,17 +4,11 @@ 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.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.client.gui.util.*; import noppes.npcs.containers.ContainerNpcQuestTypeItem; import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.quests.QuestItem; - import org.lwjgl.opengl.GL11; public class GuiNpcQuestTypeItem extends GuiContainerNPCInterface implements ITextfieldListener 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 f903a3d77..6112b0c03 100644 --- a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeKill.java +++ b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeKill.java @@ -1,26 +1,20 @@ package noppes.npcs.client.gui.questtypes; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - import net.minecraft.client.gui.GuiButton; 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.GuiCustomScroll; -import noppes.npcs.client.gui.util.ICustomScrollListener; -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.client.gui.util.*; import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.quests.QuestKill; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + public class GuiNpcQuestTypeKill extends SubGuiInterface implements ITextfieldListener, ICustomScrollListener { private GuiScreen parent; 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 879ee0eae..47fb986f4 100644 --- a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeLocation.java +++ b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeLocation.java @@ -2,11 +2,7 @@ package noppes.npcs.client.gui.questtypes; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -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.client.gui.util.*; import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.quests.QuestLocation; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBankSetup.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBankSetup.java index 10b433b1f..38f12c120 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBankSetup.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBankSetup.java @@ -1,20 +1,20 @@ package noppes.npcs.client.gui.roles; -import java.util.HashMap; -import java.util.Vector; - import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; import noppes.npcs.client.gui.util.GuiCustomScroll; -import noppes.npcs.client.gui.util.ICustomScrollListener; import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.ICustomScrollListener; import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.controllers.data.Bank; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleBank; +import java.util.HashMap; +import java.util.Vector; + public class GuiNpcBankSetup extends GuiNPCInterface2 implements IScrollData,ICustomScrollListener { 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 865965a66..0fdac6fd8 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcCompanion.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcCompanion.java @@ -1,25 +1,19 @@ package noppes.npcs.client.gui.roles; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; import noppes.npcs.client.gui.player.companion.GuiNpcCompanionTalents.GuiTalent; -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.client.gui.util.*; import noppes.npcs.constants.EnumCompanionStage; import noppes.npcs.constants.EnumCompanionTalent; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleCompanion; +import java.util.ArrayList; +import java.util.List; + public class GuiNpcCompanion extends GuiNPCInterface2 implements ITextfieldListener, ISliderListener{ private RoleCompanion role; private List talents = new ArrayList(); 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 c8f64f800..2a7d7934c 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java @@ -6,13 +6,7 @@ import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiNpcAvailability; import noppes.npcs.client.gui.global.GuiNPCQuestSelection; -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.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobConversation; 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 80ae2f7d1..5b94d1189 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerJob.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerJob.java @@ -1,19 +1,15 @@ package noppes.npcs.client.gui.roles; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; -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.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobFollower; +import java.util.ArrayList; +import java.util.List; + public class GuiNpcFollowerJob extends GuiNPCInterface2 implements ICustomScrollListener { private JobFollower job; 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 86ad48590..1c0e2cd20 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerSetup.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerSetup.java @@ -1,22 +1,18 @@ package noppes.npcs.client.gui.roles; -import java.util.HashMap; - 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.Client; -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.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.containers.ContainerNPCFollowerSetup; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleFollower; +import java.util.HashMap; + public class GuiNpcFollowerSetup extends GuiContainerNPCInterface2 { diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcGuard.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcGuard.java index 7ae29d8df..b5365e465 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcGuard.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcGuard.java @@ -1,16 +1,9 @@ package noppes.npcs.client.gui.roles; -import java.util.ArrayList; -import java.util.List; - -import javax.management.relation.RoleStatus; - import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.StatCollector; -import net.minecraft.world.biome.BiomeGenBase; import noppes.npcs.client.Client; import noppes.npcs.client.gui.util.GuiCustomScroll; import noppes.npcs.client.gui.util.GuiNPCInterface2; @@ -20,6 +13,9 @@ import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobGuard; +import java.util.ArrayList; +import java.util.List; + public class GuiNpcGuard extends GuiNPCInterface2{ private JobGuard role; private GuiCustomScroll scroll1; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcItemGiver.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcItemGiver.java index cd51ccc11..4d3e7eb6a 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcItemGiver.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcItemGiver.java @@ -1,8 +1,5 @@ package noppes.npcs.client.gui.roles; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; @@ -16,6 +13,9 @@ import noppes.npcs.containers.ContainerNpcItemGiver; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobItemGiver; +import java.util.ArrayList; +import java.util.List; + public class GuiNpcItemGiver extends GuiContainerNPCInterface2 { private JobItemGiver role; 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 376288e50..fddb4bd91 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcSpawner.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcSpawner.java @@ -5,13 +5,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import noppes.npcs.client.Client; import noppes.npcs.client.gui.GuiNpcMobSpawnerSelector; -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.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; 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 84532cbcf..812a7721f 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTraderSetup.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTraderSetup.java @@ -6,16 +6,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.Client; import noppes.npcs.client.CustomNpcResourceListener; -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.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.containers.ContainerNPCTraderSetup; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleTrader; - import org.lwjgl.opengl.GL11; public class GuiNpcTraderSetup extends GuiContainerNPCInterface2 implements ITextfieldListener{ 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 523ebc295..c093be695 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java @@ -1,22 +1,16 @@ package noppes.npcs.client.gui.roles; -import java.util.HashMap; -import java.util.Vector; - import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; -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.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.controllers.data.TransportLocation; import noppes.npcs.entity.EntityNPCInterface; +import java.util.HashMap; +import java.util.Vector; + public class GuiNpcTransporter extends GuiNPCInterface2 implements IScrollData, IGuiData{ private GuiCustomScroll scroll; public TransportLocation location = new TransportLocation(); 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 7963f09f9..44dbb739d 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/SubGuiNpcConversationLine.java +++ b/src/main/java/noppes/npcs/client/gui/roles/SubGuiNpcConversationLine.java @@ -3,11 +3,7 @@ package noppes.npcs.client.gui.roles; import net.minecraft.client.gui.GuiButton; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.GuiNpcSoundSelection; -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.client.gui.util.*; public class SubGuiNpcConversationLine extends SubGuiInterface implements ITextfieldListener{ public String line; diff --git a/src/main/java/noppes/npcs/client/gui/script/EventGuiScriptList.java b/src/main/java/noppes/npcs/client/gui/script/EventGuiScriptList.java index e3ee8d057..b29d22ae7 100644 --- a/src/main/java/noppes/npcs/client/gui/script/EventGuiScriptList.java +++ b/src/main/java/noppes/npcs/client/gui/script/EventGuiScriptList.java @@ -5,15 +5,16 @@ package noppes.npcs.client.gui.script; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.controllers.ScriptContainer; 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.SubGuiInterface; +import noppes.npcs.controllers.ScriptContainer; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; public class EventGuiScriptList extends SubGuiInterface { private GuiCustomScroll scroll1; 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 9a9083e42..5751032ef 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptAllNPCs.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptAllNPCs.java @@ -3,7 +3,6 @@ package noppes.npcs.client.gui.script; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.ScriptController; import noppes.npcs.controllers.data.NPCDataScript; public class GuiScriptAllNPCs extends GuiScriptInterface { 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 de7047c3f..c7cf46ba6 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptForge.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptForge.java @@ -8,7 +8,6 @@ package noppes.npcs.client.gui.script; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.ScriptController; import noppes.npcs.controllers.data.ForgeDataScript; public class GuiScriptForge extends GuiScriptInterface { 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 e262a2c10..43e5f95e0 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java @@ -5,11 +5,6 @@ package noppes.npcs.client.gui.script; -import java.io.IOException; -import java.lang.reflect.Modifier; -import java.util.*; -import java.util.Map.Entry; - import com.google.common.reflect.ClassPath; import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.common.gameevent.TickEvent; @@ -26,19 +21,24 @@ import net.minecraftforge.event.world.ChunkDataEvent; import net.minecraftforge.event.world.ChunkEvent; import net.minecraftforge.event.world.ChunkWatchEvent; import net.minecraftforge.event.world.WorldEvent; -import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.NoppesStringUtils; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.swing.GuiJTextArea; import noppes.npcs.client.gui.util.*; -import noppes.npcs.controllers.data.IScriptHandler; +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.controllers.data.NPCDataScript; import noppes.npcs.controllers.data.PlayerDataScript; import noppes.npcs.scripted.item.ScriptCustomItem; import org.apache.commons.lang3.StringUtils; +import java.io.IOException; +import java.lang.reflect.Modifier; +import java.util.*; +import java.util.Map.Entry; + public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallback, IGuiData, ITextChangeListener, ICustomScrollListener, IJTextAreaListener, ITextfieldListener { private int activeTab = 0; public IScriptHandler handler; diff --git a/src/main/java/noppes/npcs/client/gui/swing/GuiJTextArea.java b/src/main/java/noppes/npcs/client/gui/swing/GuiJTextArea.java index 65ac9eb8a..a71a34d71 100644 --- a/src/main/java/noppes/npcs/client/gui/swing/GuiJTextArea.java +++ b/src/main/java/noppes/npcs/client/gui/swing/GuiJTextArea.java @@ -1,20 +1,12 @@ package noppes.npcs.client.gui.swing; +import noppes.npcs.client.gui.util.IJTextAreaListener; +import org.lwjgl.opengl.Display; + +import javax.swing.*; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; -import javax.swing.JDialog; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; -import javax.swing.ScrollPaneConstants; -import javax.swing.border.EtchedBorder; -import javax.swing.border.TitledBorder; - -import noppes.npcs.client.gui.util.IJTextAreaListener; - -import org.lwjgl.opengl.Display; - public class GuiJTextArea extends JDialog implements WindowListener{ public IJTextAreaListener listener; private JTextArea area; diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiButtonBiDirectional.java b/src/main/java/noppes/npcs/client/gui/util/GuiButtonBiDirectional.java index 4e4016234..b703dfff9 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiButtonBiDirectional.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiButtonBiDirectional.java @@ -2,7 +2,6 @@ package noppes.npcs.client.gui.util; import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; public class GuiButtonBiDirectional extends GuiNpcButton{ diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiButtonNextPage.java b/src/main/java/noppes/npcs/client/gui/util/GuiButtonNextPage.java index 97b5ed159..a8617ec1e 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiButtonNextPage.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiButtonNextPage.java @@ -1,11 +1,8 @@ package noppes.npcs.client.gui.util; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreenBook; import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; public class GuiButtonNextPage extends GuiNpcButton{ private final boolean field_146151_o; diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiContainerNPCInterface.java b/src/main/java/noppes/npcs/client/gui/util/GuiContainerNPCInterface.java index c1430fd42..93e03317a 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiContainerNPCInterface.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiContainerNPCInterface.java @@ -1,8 +1,5 @@ package noppes.npcs.client.gui.util; -import java.util.ArrayList; -import java.util.HashMap; - import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.gui.FontRenderer; @@ -17,12 +14,14 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import noppes.npcs.containers.ContainerEmpty; import noppes.npcs.entity.EntityNPCInterface; - import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import java.util.ArrayList; +import java.util.HashMap; + public abstract class GuiContainerNPCInterface extends GuiContainer { public boolean drawDefaultBackground = false; diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiContainerNPCInterface2.java b/src/main/java/noppes/npcs/client/gui/util/GuiContainerNPCInterface2.java index a801434bd..e4f93ced8 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiContainerNPCInterface2.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiContainerNPCInterface2.java @@ -1,23 +1,8 @@ package noppes.npcs.client.gui.util; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; -import noppes.npcs.client.Client; -import noppes.npcs.client.NoppesUtil; -import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.entity.EntityNPCInterface; - import org.lwjgl.opengl.GL11; public abstract class GuiContainerNPCInterface2 extends GuiContainerNPCInterface 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 f29428838..42fa49dca 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java @@ -1,17 +1,16 @@ package noppes.npcs.client.gui.util; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import org.lwjgl.input.Mouse; +import org.lwjgl.opengl.GL11; + import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.List; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; - -import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; - public class GuiCustomScroll extends GuiScreen { public static final ResourceLocation resource = new ResourceLocation("customnpcs","textures/gui/misc.png"); 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 be2fed849..8ed276b6b 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiHoverText.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiHoverText.java @@ -1,15 +1,12 @@ package noppes.npcs.client.gui.util; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; + import java.util.ArrayList; import java.util.List; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - public class GuiHoverText extends GuiScreen{ private int x, y; public int id; diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiMenuSideButton.java b/src/main/java/noppes/npcs/client/gui/util/GuiMenuSideButton.java index a56cc4cd5..506e30075 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiMenuSideButton.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiMenuSideButton.java @@ -2,9 +2,7 @@ package noppes.npcs.client.gui.util; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; public class GuiMenuSideButton extends GuiNpcButton{ diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiMenuTopButton.java b/src/main/java/noppes/npcs/client/gui/util/GuiMenuTopButton.java index 36801735b..48ad1b389 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiMenuTopButton.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiMenuTopButton.java @@ -3,10 +3,8 @@ package noppes.npcs.client.gui.util; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; - import org.lwjgl.opengl.GL11; public class GuiMenuTopButton extends GuiNpcButton diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiMenuTopIconButton.java b/src/main/java/noppes/npcs/client/gui/util/GuiMenuTopIconButton.java index c7a7668a7..e2bf4005c 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiMenuTopIconButton.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiMenuTopIconButton.java @@ -1,9 +1,5 @@ package noppes.npcs.client.gui.util; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; @@ -12,10 +8,13 @@ import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; + public class GuiMenuTopIconButton extends GuiMenuTopButton{ private static final ResourceLocation resource = new ResourceLocation("textures/gui/container/creative_inventory/tabs.png"); protected static RenderItem itemRender = new RenderItem(); diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiModelInterface.java b/src/main/java/noppes/npcs/client/gui/util/GuiModelInterface.java index 026199a82..6bac8bd2b 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiModelInterface.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiModelInterface.java @@ -1,19 +1,14 @@ package noppes.npcs.client.gui.util; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.ModelData; -import noppes.npcs.ModelDataShared; import noppes.npcs.client.EntityUtil; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.entity.EntityCustomNpc; - import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java index e8e9b87e3..d83eca7c1 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java @@ -1,11 +1,5 @@ package noppes.npcs.client.gui.util; -import java.awt.Toolkit; -import java.awt.Window; -import java.net.URI; -import java.util.ArrayList; -import java.util.HashMap; - import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.gui.FontRenderer; @@ -16,13 +10,17 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.ResourceLocation; import noppes.npcs.entity.EntityNPCInterface; - import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.Display; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import java.awt.*; +import java.net.URI; +import java.util.ArrayList; +import java.util.HashMap; + public abstract class GuiNPCInterface extends GuiScreen { public static Window AWTWindow; diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface2.java b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface2.java index bbb9a9a47..267f4916f 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface2.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface2.java @@ -1,20 +1,7 @@ package noppes.npcs.client.gui.util; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; -import noppes.npcs.client.Client; -import noppes.npcs.client.NoppesUtil; -import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.entity.EntityNPCInterface; - import org.lwjgl.opengl.GL11; public abstract class GuiNPCInterface2 extends GuiNPCInterface 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 8e577c5c9..3c8030217 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiNPCStringSlot.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiNPCStringSlot.java @@ -1,16 +1,10 @@ package noppes.npcs.client.gui.util; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Vector; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiSlot; import net.minecraft.client.renderer.Tessellator; -import noppes.npcs.entity.EntityNPCInterface; + +import java.util.*; public class GuiNPCStringSlot extends GuiSlot { diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNpcMenu.java b/src/main/java/noppes/npcs/client/gui/util/GuiNpcMenu.java index fef629e78..9e1bb274b 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiNpcMenu.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiNpcMenu.java @@ -12,7 +12,6 @@ import noppes.npcs.client.NoppesUtil; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.entity.EntityNPCInterface; - import org.lwjgl.input.Keyboard; public class GuiNpcMenu implements GuiYesNoCallback{ diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNpcSlider.java b/src/main/java/noppes/npcs/client/gui/util/GuiNpcSlider.java index ccb0ab861..74b2d383e 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiNpcSlider.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiNpcSlider.java @@ -4,7 +4,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import noppes.npcs.NoppesStringUtils; - import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNpcTextArea.java b/src/main/java/noppes/npcs/client/gui/util/GuiNpcTextArea.java index 7e322740a..df16e487b 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiNpcTextArea.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiNpcTextArea.java @@ -1,8 +1,5 @@ package noppes.npcs.client.gui.util; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; @@ -10,11 +7,13 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.MathHelper; import noppes.npcs.client.ClientProxy; import noppes.npcs.client.ClientProxy.FontContainer; - import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; +import java.util.ArrayList; +import java.util.List; + public class GuiNpcTextArea extends GuiNpcTextField implements IGui{ public boolean inMenu = true; public boolean numbersOnly = false; diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiTextArea.java b/src/main/java/noppes/npcs/client/gui/util/GuiTextArea.java index 792431708..b89aebd47 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiTextArea.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiTextArea.java @@ -5,25 +5,20 @@ package noppes.npcs.client.gui.util; -import java.awt.Font; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.regex.Matcher; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.util.ChatAllowedCharacters; -import net.minecraftforge.client.GuiIngameForge; -import noppes.npcs.CustomNpcs; -import noppes.npcs.NoppesStringUtils; import noppes.npcs.client.gui.util.TextContainer.LineData; import noppes.npcs.config.ConfigClient; import noppes.npcs.config.TrueTypeFont; import org.lwjgl.input.Mouse; +import java.awt.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.regex.Matcher; + public class GuiTextArea extends Gui implements IGui, IKeyListener, IMouseListener { public int id; public int x; diff --git a/src/main/java/noppes/npcs/client/gui/util/TextContainer.java b/src/main/java/noppes/npcs/client/gui/util/TextContainer.java index 8d8fc3b6d..608e4a3d8 100644 --- a/src/main/java/noppes/npcs/client/gui/util/TextContainer.java +++ b/src/main/java/noppes/npcs/client/gui/util/TextContainer.java @@ -5,13 +5,14 @@ package noppes.npcs.client.gui.util; +import noppes.npcs.config.TrueTypeFont; + import java.util.ArrayList; import java.util.Comparator; import java.util.Iterator; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import noppes.npcs.config.TrueTypeFont; public class TextContainer { private static final char colorChar = '\uffff'; diff --git a/src/main/java/noppes/npcs/client/model/ModelMPM.java b/src/main/java/noppes/npcs/client/model/ModelMPM.java index 33de2011e..cb8db1427 100644 --- a/src/main/java/noppes/npcs/client/model/ModelMPM.java +++ b/src/main/java/noppes/npcs/client/model/ModelMPM.java @@ -1,7 +1,5 @@ package noppes.npcs.client.model; -import java.util.Random; - import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBiped; @@ -12,6 +10,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import noppes.npcs.*; +import noppes.npcs.api.ISkinOverlay; import noppes.npcs.client.model.animation.AniCrawling; import noppes.npcs.client.model.animation.AniHug; import noppes.npcs.client.model.part.*; @@ -21,10 +20,10 @@ import noppes.npcs.client.renderer.RenderNPCInterface; import noppes.npcs.constants.EnumAnimation; import noppes.npcs.controllers.data.SkinOverlay; import noppes.npcs.entity.EntityCustomNpc; - -import noppes.npcs.api.ISkinOverlay; import org.lwjgl.opengl.GL11; +import java.util.Random; + import static noppes.npcs.client.ClientProxy.bindTexture; public class ModelMPM extends ModelNPCMale{ diff --git a/src/main/java/noppes/npcs/client/model/ModelNPCMale.java b/src/main/java/noppes/npcs/client/model/ModelNPCMale.java index 710831bbd..18f2d0b3c 100644 --- a/src/main/java/noppes/npcs/client/model/ModelNPCMale.java +++ b/src/main/java/noppes/npcs/client/model/ModelNPCMale.java @@ -1,23 +1,17 @@ package noppes.npcs.client.model; -import net.minecraft.client.Minecraft; -import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; import noppes.npcs.CustomNpcs; import noppes.npcs.client.model.util.ModelScaleRenderer; import noppes.npcs.constants.EnumAnimation; import noppes.npcs.entity.EntityNPCInterface; - import org.lwjgl.opengl.GL11; -import static noppes.npcs.client.ClientProxy.bindTexture; - public class ModelNPCMale extends ModelBiped { public boolean isDancing; diff --git a/src/main/java/noppes/npcs/client/model/ModelNpcCrystal.java b/src/main/java/noppes/npcs/client/model/ModelNpcCrystal.java index 1abe9ee83..5af36e85d 100644 --- a/src/main/java/noppes/npcs/client/model/ModelNpcCrystal.java +++ b/src/main/java/noppes/npcs/client/model/ModelNpcCrystal.java @@ -5,8 +5,6 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.MathHelper; -import noppes.npcs.entity.EntityNpcCrystal; - import org.lwjgl.opengl.GL11; public class ModelNpcCrystal extends ModelBase diff --git a/src/main/java/noppes/npcs/client/model/ModelNpcDragon.java b/src/main/java/noppes/npcs/client/model/ModelNpcDragon.java index 6d9a93945..c2e73ba59 100644 --- a/src/main/java/noppes/npcs/client/model/ModelNpcDragon.java +++ b/src/main/java/noppes/npcs/client/model/ModelNpcDragon.java @@ -6,7 +6,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.MathHelper; import noppes.npcs.entity.EntityNpcDragon; - import org.lwjgl.opengl.GL11; public class ModelNpcDragon extends ModelBase diff --git a/src/main/java/noppes/npcs/client/model/ModelNpcSlime.java b/src/main/java/noppes/npcs/client/model/ModelNpcSlime.java index ce53f7469..2da8bc315 100644 --- a/src/main/java/noppes/npcs/client/model/ModelNpcSlime.java +++ b/src/main/java/noppes/npcs/client/model/ModelNpcSlime.java @@ -1,13 +1,11 @@ package noppes.npcs.client.model; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; +import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class ModelNpcSlime extends ModelBase diff --git a/src/main/java/noppes/npcs/client/model/ModelPony.java b/src/main/java/noppes/npcs/client/model/ModelPony.java index 59505a28a..6efac6dbf 100644 --- a/src/main/java/noppes/npcs/client/model/ModelPony.java +++ b/src/main/java/noppes/npcs/client/model/ModelPony.java @@ -1,11 +1,5 @@ package noppes.npcs.client.model; -import java.awt.Color; -import java.awt.image.BufferedImage; -import java.io.IOException; - -import javax.imageio.ImageIO; - import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -20,9 +14,13 @@ import noppes.npcs.client.model.util.ModelPlaneRenderer; import noppes.npcs.constants.EnumAnimation; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.entity.EntityNpcPony; - import org.lwjgl.opengl.GL11; +import javax.imageio.ImageIO; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.IOException; + public class ModelPony extends ModelBase { diff --git a/src/main/java/noppes/npcs/client/model/ModelSkirtArmor.java b/src/main/java/noppes/npcs/client/model/ModelSkirtArmor.java index 765898942..39b9754ab 100644 --- a/src/main/java/noppes/npcs/client/model/ModelSkirtArmor.java +++ b/src/main/java/noppes/npcs/client/model/ModelSkirtArmor.java @@ -1,15 +1,10 @@ package noppes.npcs.client.model; -import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; -import noppes.npcs.ModelData; -import noppes.npcs.ModelPartData; import noppes.npcs.client.model.util.ModelPlaneRenderer; - import org.lwjgl.opengl.GL11; public class ModelSkirtArmor extends ModelBiped { diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCampfire.java b/src/main/java/noppes/npcs/client/model/blocks/ModelCampfire.java index 913366d37..db434ec89 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCampfire.java +++ b/src/main/java/noppes/npcs/client/model/blocks/ModelCampfire.java @@ -8,7 +8,6 @@ package noppes.npcs.client.model.blocks; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; public class ModelCampfire extends ModelBase { ModelRenderer Rock1; diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelPedestal.java b/src/main/java/noppes/npcs/client/model/blocks/ModelPedestal.java index 5097f0d1c..ec0defb30 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelPedestal.java +++ b/src/main/java/noppes/npcs/client/model/blocks/ModelPedestal.java @@ -1,10 +1,9 @@ package noppes.npcs.client.model.blocks; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; +import org.lwjgl.opengl.GL11; public class ModelPedestal extends ModelBase { ModelRenderer Main_Block; diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelTallLamp.java b/src/main/java/noppes/npcs/client/model/blocks/ModelTallLamp.java index e3ddacff2..1dbbeba38 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelTallLamp.java +++ b/src/main/java/noppes/npcs/client/model/blocks/ModelTallLamp.java @@ -3,7 +3,6 @@ package noppes.npcs.client.model.blocks; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; public class ModelTallLamp extends ModelBase { diff --git a/src/main/java/noppes/npcs/client/model/part/ModelBeard.java b/src/main/java/noppes/npcs/client/model/part/ModelBeard.java index 03ff0e74a..420c5006e 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelBeard.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelBeard.java @@ -1,7 +1,6 @@ package noppes.npcs.client.model.part; import net.minecraft.entity.Entity; -import net.minecraft.util.ResourceLocation; import noppes.npcs.ModelData; import noppes.npcs.ModelPartData; import noppes.npcs.client.model.ModelMPM; diff --git a/src/main/java/noppes/npcs/client/model/part/ModelClaws.java b/src/main/java/noppes/npcs/client/model/part/ModelClaws.java index 5722aeb2d..3abef9802 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelClaws.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelClaws.java @@ -1,12 +1,10 @@ package noppes.npcs.client.model.part; -import net.minecraft.util.ResourceLocation; import noppes.npcs.ModelData; import noppes.npcs.ModelPartData; import noppes.npcs.client.model.ModelMPM; import noppes.npcs.client.model.util.Model2DRenderer; import noppes.npcs.client.model.util.ModelPartInterface; -import noppes.npcs.entity.EntityCustomNpc; public class ModelClaws extends ModelPartInterface { diff --git a/src/main/java/noppes/npcs/client/model/part/ModelDuckBeak.java b/src/main/java/noppes/npcs/client/model/part/ModelDuckBeak.java index acadd0262..5bd1b7a8e 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelDuckBeak.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelDuckBeak.java @@ -1,12 +1,8 @@ package noppes.npcs.client.model.part; -import org.lwjgl.opengl.GL11; - -import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; import noppes.npcs.client.model.ModelMPM; -import noppes.npcs.client.model.util.ModelPartInterface; +import org.lwjgl.opengl.GL11; public class ModelDuckBeak extends ModelRenderer { ModelRenderer Top3; diff --git a/src/main/java/noppes/npcs/client/model/part/ModelEars.java b/src/main/java/noppes/npcs/client/model/part/ModelEars.java index 71ab3920b..877b83950 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelEars.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelEars.java @@ -1,7 +1,6 @@ package noppes.npcs.client.model.part; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.util.ResourceLocation; import noppes.npcs.ModelData; import noppes.npcs.ModelPartData; import noppes.npcs.client.model.ModelMPM; diff --git a/src/main/java/noppes/npcs/client/model/part/ModelFin.java b/src/main/java/noppes/npcs/client/model/part/ModelFin.java index c8f79c9fc..42f715504 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelFin.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelFin.java @@ -1,6 +1,5 @@ package noppes.npcs.client.model.part; -import net.minecraft.util.ResourceLocation; import noppes.npcs.ModelData; import noppes.npcs.ModelPartData; import noppes.npcs.client.model.ModelMPM; diff --git a/src/main/java/noppes/npcs/client/model/part/ModelHair.java b/src/main/java/noppes/npcs/client/model/part/ModelHair.java index 55dc378f7..4a4c12389 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelHair.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelHair.java @@ -2,7 +2,6 @@ package noppes.npcs.client.model.part; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraft.util.ResourceLocation; import noppes.npcs.ModelData; import noppes.npcs.ModelPartData; import noppes.npcs.client.model.ModelMPM; diff --git a/src/main/java/noppes/npcs/client/model/part/ModelHorns.java b/src/main/java/noppes/npcs/client/model/part/ModelHorns.java index 0b7fe1612..30c31ff73 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelHorns.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelHorns.java @@ -2,15 +2,14 @@ package noppes.npcs.client.model.part; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraft.util.ResourceLocation; -import noppes.npcs.ModelPartData; import noppes.npcs.ModelData; +import noppes.npcs.ModelPartData; import noppes.npcs.client.model.ModelMPM; -import noppes.npcs.client.model.util.ModelPartInterface; import noppes.npcs.client.model.part.horns.ModelAntennasBack; import noppes.npcs.client.model.part.horns.ModelAntennasFront; import noppes.npcs.client.model.part.horns.ModelAntlerHorns; import noppes.npcs.client.model.part.horns.ModelBullHorns; +import noppes.npcs.client.model.util.ModelPartInterface; public class ModelHorns extends ModelPartInterface { private ModelRenderer bull; diff --git a/src/main/java/noppes/npcs/client/model/part/ModelLegs.java b/src/main/java/noppes/npcs/client/model/part/ModelLegs.java index 1209fc518..1ede81e50 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelLegs.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelLegs.java @@ -1,12 +1,8 @@ package noppes.npcs.client.model.part; -import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; import noppes.npcs.ModelPartData; import noppes.npcs.client.ClientProxy; import noppes.npcs.client.model.ModelMPM; @@ -17,7 +13,6 @@ import noppes.npcs.client.model.part.legs.ModelNagaLegs; import noppes.npcs.client.model.util.ModelScaleRenderer; import noppes.npcs.constants.EnumAnimation; import noppes.npcs.entity.EntityCustomNpc; - import org.lwjgl.opengl.GL11; public class ModelLegs extends ModelScaleRenderer{ diff --git a/src/main/java/noppes/npcs/client/model/part/ModelMohawk.java b/src/main/java/noppes/npcs/client/model/part/ModelMohawk.java index ec402e9c5..2d9b1e291 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelMohawk.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelMohawk.java @@ -1,7 +1,6 @@ package noppes.npcs.client.model.part; import net.minecraft.entity.Entity; -import net.minecraft.util.ResourceLocation; import noppes.npcs.ModelData; import noppes.npcs.ModelPartData; import noppes.npcs.client.model.ModelMPM; diff --git a/src/main/java/noppes/npcs/client/model/part/ModelSkirt.java b/src/main/java/noppes/npcs/client/model/part/ModelSkirt.java index 09d03200d..b3489a624 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelSkirt.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelSkirt.java @@ -1,10 +1,5 @@ package noppes.npcs.client.model.part; -import java.util.List; - -import org.lwjgl.opengl.GL11; - -import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; @@ -12,8 +7,8 @@ import noppes.npcs.ModelData; import noppes.npcs.ModelPartData; import noppes.npcs.client.model.ModelMPM; import noppes.npcs.client.model.util.ModelPartInterface; -import noppes.npcs.client.model.util.ModelPlane; import noppes.npcs.client.model.util.ModelPlaneRenderer; +import org.lwjgl.opengl.GL11; public class ModelSkirt extends ModelPartInterface { private ModelPlaneRenderer Shape1; diff --git a/src/main/java/noppes/npcs/client/model/part/ModelSnout.java b/src/main/java/noppes/npcs/client/model/part/ModelSnout.java index b15165f2c..6157cea71 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelSnout.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelSnout.java @@ -2,7 +2,6 @@ package noppes.npcs.client.model.part; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraft.util.ResourceLocation; import noppes.npcs.ModelData; import noppes.npcs.ModelPartData; import noppes.npcs.client.model.ModelMPM; 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 86c056087..87c3bad53 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelTail.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelTail.java @@ -1,8 +1,6 @@ package noppes.npcs.client.model.part; -import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.MathHelper; @@ -14,7 +12,6 @@ import noppes.npcs.client.model.part.tails.*; import noppes.npcs.client.model.util.ModelScaleRenderer; import noppes.npcs.constants.EnumAnimation; import noppes.npcs.entity.EntityCustomNpc; - import org.lwjgl.opengl.GL11; public class ModelTail extends ModelScaleRenderer { diff --git a/src/main/java/noppes/npcs/client/model/part/ModelWings.java b/src/main/java/noppes/npcs/client/model/part/ModelWings.java index 6984e7d17..f5eece043 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelWings.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelWings.java @@ -2,7 +2,6 @@ package noppes.npcs.client.model.part; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; import noppes.npcs.ModelData; import noppes.npcs.ModelPartData; import noppes.npcs.client.model.ModelMPM; diff --git a/src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasBack.java b/src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasBack.java index 45dc32564..f6b701c49 100644 --- a/src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasBack.java +++ b/src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasBack.java @@ -1,8 +1,6 @@ package noppes.npcs.client.model.part.horns; -import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; import noppes.npcs.client.model.ModelMPM; public class ModelAntennasBack extends ModelRenderer { diff --git a/src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasFront.java b/src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasFront.java index e0aadfe73..c3c06c772 100644 --- a/src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasFront.java +++ b/src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasFront.java @@ -1,8 +1,6 @@ package noppes.npcs.client.model.part.horns; -import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; import noppes.npcs.client.model.ModelMPM; public class ModelAntennasFront extends ModelRenderer { diff --git a/src/main/java/noppes/npcs/client/model/part/horns/ModelAntlerHorns.java b/src/main/java/noppes/npcs/client/model/part/horns/ModelAntlerHorns.java index 6d0142f74..447d49b86 100644 --- a/src/main/java/noppes/npcs/client/model/part/horns/ModelAntlerHorns.java +++ b/src/main/java/noppes/npcs/client/model/part/horns/ModelAntlerHorns.java @@ -1,8 +1,6 @@ package noppes.npcs.client.model.part.horns; -import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; import noppes.npcs.client.model.ModelMPM; public class ModelAntlerHorns extends ModelRenderer { diff --git a/src/main/java/noppes/npcs/client/model/part/legs/ModelMermaidLegs.java b/src/main/java/noppes/npcs/client/model/part/legs/ModelMermaidLegs.java index 9de42c1a7..3767566f4 100644 --- a/src/main/java/noppes/npcs/client/model/part/legs/ModelMermaidLegs.java +++ b/src/main/java/noppes/npcs/client/model/part/legs/ModelMermaidLegs.java @@ -4,11 +4,6 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; -import noppes.npcs.CustomNpcs; -import noppes.npcs.ModelData; -import noppes.npcs.constants.EnumAnimation; -import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.entity.EntityCustomNpc; public class ModelMermaidLegs extends ModelRenderer { diff --git a/src/main/java/noppes/npcs/client/model/part/legs/ModelMermaidLegs2.java b/src/main/java/noppes/npcs/client/model/part/legs/ModelMermaidLegs2.java index ed1ea7b16..ed69d0ac9 100644 --- a/src/main/java/noppes/npcs/client/model/part/legs/ModelMermaidLegs2.java +++ b/src/main/java/noppes/npcs/client/model/part/legs/ModelMermaidLegs2.java @@ -4,8 +4,6 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; -import noppes.npcs.ModelData; -import noppes.npcs.constants.EnumAnimation; public class ModelMermaidLegs2 extends ModelRenderer { diff --git a/src/main/java/noppes/npcs/client/model/part/legs/ModelNagaLegs.java b/src/main/java/noppes/npcs/client/model/part/legs/ModelNagaLegs.java index f45c8699f..5b34f1683 100644 --- a/src/main/java/noppes/npcs/client/model/part/legs/ModelNagaLegs.java +++ b/src/main/java/noppes/npcs/client/model/part/legs/ModelNagaLegs.java @@ -5,7 +5,6 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; import noppes.npcs.client.model.util.ModelPlaneRenderer; - import org.lwjgl.opengl.GL11; public class ModelNagaLegs extends ModelRenderer{ diff --git a/src/main/java/noppes/npcs/client/model/part/tails/ModelFeatherTail.java b/src/main/java/noppes/npcs/client/model/part/tails/ModelFeatherTail.java index 5f2feac0c..9a27cf380 100644 --- a/src/main/java/noppes/npcs/client/model/part/tails/ModelFeatherTail.java +++ b/src/main/java/noppes/npcs/client/model/part/tails/ModelFeatherTail.java @@ -1,9 +1,7 @@ package noppes.npcs.client.model.part.tails; -import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; public class ModelFeatherTail extends ModelRenderer { ModelRenderer feather1; diff --git a/src/main/java/noppes/npcs/client/model/part/tails/ModelRodentTail.java b/src/main/java/noppes/npcs/client/model/part/tails/ModelRodentTail.java index bd9a1d811..46327032c 100644 --- a/src/main/java/noppes/npcs/client/model/part/tails/ModelRodentTail.java +++ b/src/main/java/noppes/npcs/client/model/part/tails/ModelRodentTail.java @@ -1,8 +1,6 @@ package noppes.npcs.client.model.part.tails; -import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; import noppes.npcs.client.model.ModelMPM; public class ModelRodentTail extends ModelRenderer { diff --git a/src/main/java/noppes/npcs/client/model/part/tails/ModelTailFin.java b/src/main/java/noppes/npcs/client/model/part/tails/ModelTailFin.java index b89691ea0..24b2571fe 100644 --- a/src/main/java/noppes/npcs/client/model/part/tails/ModelTailFin.java +++ b/src/main/java/noppes/npcs/client/model/part/tails/ModelTailFin.java @@ -1,7 +1,6 @@ package noppes.npcs.client.model.part.tails; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; import noppes.npcs.client.model.ModelMPM; public class ModelTailFin extends ModelRenderer { diff --git a/src/main/java/noppes/npcs/client/model/util/Model2DRenderer.java b/src/main/java/noppes/npcs/client/model/util/Model2DRenderer.java index 264fa1ccf..72c59888c 100644 --- a/src/main/java/noppes/npcs/client/model/util/Model2DRenderer.java +++ b/src/main/java/noppes/npcs/client/model/util/Model2DRenderer.java @@ -1,16 +1,14 @@ package noppes.npcs.client.model.util; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; - import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - public class Model2DRenderer extends ModelRenderer { private boolean compiled; diff --git a/src/main/java/noppes/npcs/client/model/util/ModelPartInterface.java b/src/main/java/noppes/npcs/client/model/util/ModelPartInterface.java index f9e7db40c..b9651f217 100644 --- a/src/main/java/noppes/npcs/client/model/util/ModelPartInterface.java +++ b/src/main/java/noppes/npcs/client/model/util/ModelPartInterface.java @@ -1,8 +1,6 @@ package noppes.npcs.client.model.util; -import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; @@ -11,7 +9,6 @@ import noppes.npcs.ModelPartData; import noppes.npcs.client.ClientProxy; import noppes.npcs.client.model.ModelMPM; import noppes.npcs.entity.EntityCustomNpc; - import org.lwjgl.opengl.GL11; public abstract class ModelPartInterface extends ModelRenderer { diff --git a/src/main/java/noppes/npcs/client/model/util/ModelRenderPassHelper.java b/src/main/java/noppes/npcs/client/model/util/ModelRenderPassHelper.java index ce027f32f..55eb67962 100644 --- a/src/main/java/noppes/npcs/client/model/util/ModelRenderPassHelper.java +++ b/src/main/java/noppes/npcs/client/model/util/ModelRenderPassHelper.java @@ -5,7 +5,6 @@ import net.minecraft.client.renderer.entity.NPCRendererHelper; import net.minecraft.client.renderer.entity.RendererLivingEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.init.Blocks; public class ModelRenderPassHelper extends ModelBase{ diff --git a/src/main/java/noppes/npcs/client/model/util/ModelScaleRenderer.java b/src/main/java/noppes/npcs/client/model/util/ModelScaleRenderer.java index f8edf5aec..c2083652e 100644 --- a/src/main/java/noppes/npcs/client/model/util/ModelScaleRenderer.java +++ b/src/main/java/noppes/npcs/client/model/util/ModelScaleRenderer.java @@ -6,7 +6,6 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.Tessellator; import noppes.npcs.ModelPartConfig; - import org.lwjgl.opengl.GL11; public class ModelScaleRenderer extends ModelRenderer { diff --git a/src/main/java/noppes/npcs/client/renderer/ImageBufferDownloadAlt.java b/src/main/java/noppes/npcs/client/renderer/ImageBufferDownloadAlt.java index ca25d7008..2fe78bcce 100644 --- a/src/main/java/noppes/npcs/client/renderer/ImageBufferDownloadAlt.java +++ b/src/main/java/noppes/npcs/client/renderer/ImageBufferDownloadAlt.java @@ -1,11 +1,10 @@ package noppes.npcs.client.renderer; -import java.awt.Graphics; +import net.minecraft.client.renderer.ImageBufferDownload; + +import java.awt.*; import java.awt.image.BufferedImage; import java.awt.image.DataBufferInt; -import java.awt.image.ImageObserver; - -import net.minecraft.client.renderer.ImageBufferDownload; public class ImageBufferDownloadAlt extends ImageBufferDownload { private int imageData[]; diff --git a/src/main/java/noppes/npcs/client/renderer/NpcItemRenderer.java b/src/main/java/noppes/npcs/client/renderer/NpcItemRenderer.java index 243533499..624ed82c7 100644 --- a/src/main/java/noppes/npcs/client/renderer/NpcItemRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/NpcItemRenderer.java @@ -1,19 +1,15 @@ package noppes.npcs.client.renderer; -import javax.swing.Icon; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; import noppes.npcs.items.ItemRenderInterface; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; diff --git a/src/main/java/noppes/npcs/client/renderer/RenderCNPCHand.java b/src/main/java/noppes/npcs/client/renderer/RenderCNPCHand.java index ffaf64cad..e28f32c26 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderCNPCHand.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderCNPCHand.java @@ -3,8 +3,10 @@ package noppes.npcs.client.renderer; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.entity.EntityPlayerSP; -import net.minecraft.client.renderer.*; -import net.minecraft.item.*; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; diff --git a/src/main/java/noppes/npcs/client/renderer/RenderCNPCPlayer.java b/src/main/java/noppes/npcs/client/renderer/RenderCNPCPlayer.java index 1ad300edb..dca2d2c78 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderCNPCPlayer.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderCNPCPlayer.java @@ -1,4 +1,5 @@ package noppes.npcs.client.renderer; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; @@ -8,7 +9,6 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.entity.Entity; @@ -18,7 +18,6 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.RenderPlayerEvent; import noppes.npcs.client.Client; -import noppes.npcs.client.ClientEventHandler; import noppes.npcs.controllers.data.SkinOverlay; import org.lwjgl.opengl.GL11; import org.lwjgl.util.glu.Project; diff --git a/src/main/java/noppes/npcs/client/renderer/RenderCustomNpc.java b/src/main/java/noppes/npcs/client/renderer/RenderCustomNpc.java index 0406ceabe..ce98937ee 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderCustomNpc.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderCustomNpc.java @@ -1,8 +1,5 @@ package noppes.npcs.client.renderer; -import java.lang.reflect.Method; - -import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.NPCRendererHelper; import net.minecraft.client.renderer.entity.RenderManager; @@ -10,16 +7,15 @@ import net.minecraft.client.renderer.entity.RendererLivingEntity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.boss.BossStatus; import noppes.npcs.client.model.ModelMPM; import noppes.npcs.client.model.util.ModelRenderPassHelper; -import noppes.npcs.constants.EnumStandingType; import noppes.npcs.controllers.PixelmonHelper; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; - import org.lwjgl.opengl.GL11; +import java.lang.reflect.Method; + public class RenderCustomNpc extends RenderNPCHumanMale{ private RendererLivingEntity renderEntity; diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java index ef63d5492..abd10c726 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java @@ -1,11 +1,6 @@ package noppes.npcs.client.renderer; -import static net.minecraftforge.client.IItemRenderer.ItemRenderType.EQUIPPED; -import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D; - import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderBlocks; @@ -14,8 +9,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.*; -import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.client.MinecraftForgeClient; @@ -24,9 +17,11 @@ import noppes.npcs.client.model.ModelNPCMale; import noppes.npcs.constants.EnumAnimation; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; - import org.lwjgl.opengl.GL11; +import static net.minecraftforge.client.IItemRenderer.ItemRenderType.EQUIPPED; +import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D; + public class RenderNPCHumanMale extends RenderNPCInterface { diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java index dd42f0058..cb6a66e94 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java @@ -1,12 +1,7 @@ package noppes.npcs.client.renderer; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.security.MessageDigest; -import java.util.Map; - +import com.mojang.authlib.minecraft.MinecraftProfileTexture; +import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.gui.FontRenderer; @@ -24,6 +19,7 @@ import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.boss.BossStatus; import net.minecraft.util.ResourceLocation; +import noppes.npcs.api.ISkinOverlay; import noppes.npcs.client.ImageDownloadAlt; import noppes.npcs.client.model.ModelMPM; import noppes.npcs.constants.EnumAnimation; @@ -31,14 +27,15 @@ import noppes.npcs.constants.EnumStandingType; import noppes.npcs.controllers.data.SkinOverlay; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; - -import noppes.npcs.api.ISkinOverlay; import org.lwjgl.opengl.GL11; -import com.mojang.authlib.minecraft.MinecraftProfileTexture; -import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; - import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.security.MessageDigest; +import java.util.Map; public class RenderNPCInterface extends RenderLiving{ diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java index ccc76d5a7..95125d420 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java @@ -1,11 +1,5 @@ package noppes.npcs.client.renderer; -import java.awt.Color; -import java.awt.image.BufferedImage; -import java.io.IOException; - -import javax.imageio.ImageIO; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelRenderer; @@ -24,9 +18,13 @@ import noppes.npcs.client.model.ModelPony; import noppes.npcs.client.model.ModelPonyArmor; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.entity.EntityNpcPony; - import org.lwjgl.opengl.GL11; +import javax.imageio.ImageIO; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.IOException; + public class RenderNPCPony extends RenderNPCInterface { diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNpcCrystal.java b/src/main/java/noppes/npcs/client/renderer/RenderNpcCrystal.java index 895387071..9f703b1ef 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNpcCrystal.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNpcCrystal.java @@ -1,8 +1,6 @@ package noppes.npcs.client.renderer; -import net.minecraft.entity.Entity; import noppes.npcs.client.model.ModelNpcCrystal; -import noppes.npcs.entity.EntityNpcCrystal; public class RenderNpcCrystal extends RenderNPCInterface { diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNpcDragon.java b/src/main/java/noppes/npcs/client/renderer/RenderNpcDragon.java index 19e381a40..a393936ac 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNpcDragon.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNpcDragon.java @@ -1,9 +1,8 @@ package noppes.npcs.client.renderer; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.model.ModelBase; import noppes.npcs.entity.EntityNPCInterface; +import org.lwjgl.opengl.GL11; public class RenderNpcDragon extends RenderNPCInterface{ diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNpcSlime.java b/src/main/java/noppes/npcs/client/renderer/RenderNpcSlime.java index c7df89f98..526977631 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNpcSlime.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNpcSlime.java @@ -3,7 +3,6 @@ package noppes.npcs.client.renderer; import net.minecraft.client.model.ModelBase; import net.minecraft.entity.EntityLivingBase; import noppes.npcs.entity.EntityNPCInterface; - import org.lwjgl.opengl.GL11; public class RenderNpcSlime extends RenderNPCInterface diff --git a/src/main/java/noppes/npcs/client/renderer/RenderProjectile.java b/src/main/java/noppes/npcs/client/renderer/RenderProjectile.java index 33e1ff51f..c18bef3d7 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderProjectile.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderProjectile.java @@ -1,5 +1,7 @@ package noppes.npcs.client.renderer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; @@ -17,13 +19,9 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import noppes.npcs.entity.EntityProjectile; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class RenderProjectile extends Render { diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java index d397e1712..7d5946da4 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java @@ -1,5 +1,6 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; @@ -12,12 +13,9 @@ import noppes.npcs.blocks.BlockBanner; import noppes.npcs.blocks.tiles.TileBanner; import noppes.npcs.client.model.blocks.ModelBanner; import noppes.npcs.client.model.blocks.ModelBannerFlag; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class BlockBannerRenderer extends BlockRendererInterface{ private final ModelBanner model = new ModelBanner(); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBarrelRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBarrelRenderer.java index 72ab706e1..ef07179b1 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBarrelRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBarrelRenderer.java @@ -1,5 +1,6 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; @@ -10,12 +11,9 @@ import noppes.npcs.blocks.BlockBarrel; import noppes.npcs.blocks.tiles.TileColorable; import noppes.npcs.client.model.blocks.ModelBarrel; import noppes.npcs.client.model.blocks.ModelBarrelLit; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class BlockBarrelRenderer extends BlockRendererInterface{ private final ModelBarrel model = new ModelBarrel(); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBeamRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBeamRenderer.java index d60d66d5a..3ba3222d4 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBeamRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBeamRenderer.java @@ -1,5 +1,6 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.tileentity.TileEntity; @@ -9,13 +10,9 @@ import noppes.npcs.blocks.BlockRotated; import noppes.npcs.blocks.tiles.TileColorable; import noppes.npcs.blocks.tiles.TileShelf; import noppes.npcs.client.model.blocks.ModelBeam; -import noppes.npcs.client.model.blocks.ModelShelf; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class BlockBeamRenderer extends BlockRendererInterface{ private final ModelBeam model = new ModelBeam(); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBigSignRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBigSignRenderer.java index 127d95504..eb66276f9 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBigSignRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBigSignRenderer.java @@ -1,5 +1,6 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -13,12 +14,9 @@ import noppes.npcs.blocks.BlockBigSign; import noppes.npcs.blocks.tiles.TileBigSign; import noppes.npcs.client.TextBlockClient; import noppes.npcs.client.model.blocks.ModelBigSign; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class BlockBigSignRenderer extends BlockRendererInterface{ private final ModelBigSign model = new ModelBigSign(); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBloodRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBloodRenderer.java index bb6ec7314..556502c00 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBloodRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBloodRenderer.java @@ -1,11 +1,10 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; import noppes.npcs.CustomItems; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; public class BlockBloodRenderer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBookRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBookRenderer.java index 3e273d21c..22d3e2ac6 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBookRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBookRenderer.java @@ -1,5 +1,6 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBook; @@ -8,17 +9,12 @@ import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import noppes.npcs.CustomItems; -import noppes.npcs.blocks.BlockCrate; import noppes.npcs.blocks.BlockRotated; import noppes.npcs.blocks.tiles.TileColorable; -import noppes.npcs.client.model.blocks.ModelCrate; import noppes.npcs.client.model.blocks.ModelInk; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class BlockBookRenderer extends BlockRendererInterface{ private final ModelInk ink = new ModelInk(); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBorderRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBorderRenderer.java index d2cf7ca1c..774e96e17 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBorderRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBorderRenderer.java @@ -1,17 +1,15 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockBorder; import noppes.npcs.blocks.tiles.TileBorder; - import org.lwjgl.opengl.GL11; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class BlockBorderRenderer implements ISimpleBlockRenderingHandler{ public BlockBorderRenderer(){ ((BlockBorder)CustomItems.border).renderId = RenderingRegistry.getNextAvailableRenderId(); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCampfireRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCampfireRenderer.java index 0853f3d53..9c451f0ca 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCampfireRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCampfireRenderer.java @@ -1,20 +1,17 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockRotated; import noppes.npcs.blocks.tiles.TileColorable; import noppes.npcs.client.model.blocks.ModelCampfire; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class BlockCampfireRenderer extends BlockRendererInterface{ private final ModelCampfire model = new ModelCampfire(); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCandleRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCandleRenderer.java index e032b216f..32fb6fbeb 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCandleRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCandleRenderer.java @@ -1,5 +1,7 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; @@ -13,13 +15,9 @@ import noppes.npcs.blocks.tiles.TileCandle; import noppes.npcs.client.model.blocks.ModelCandle; import noppes.npcs.client.model.blocks.ModelCandleCeiling; import noppes.npcs.client.model.blocks.ModelCandleWall; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class BlockCandleRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler{ private final ModelCandle model = new ModelCandle(); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java index fa978b9ce..7df7b2a19 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java @@ -1,5 +1,7 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -10,12 +12,8 @@ import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockCarpentryBench; import noppes.npcs.client.model.blocks.ModelAnvil; import noppes.npcs.client.model.blocks.ModelCarpentryBench; - import org.lwjgl.opengl.GL11; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class BlockCarpentryBenchRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler{ private final ModelCarpentryBench model = new ModelCarpentryBench(); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java index 94d1a371f..ff1a09ab7 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java @@ -1,39 +1,16 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderFireball; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.projectile.EntityFireball; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.IBlockAccess; import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockChair; -import noppes.npcs.blocks.tiles.TileBanner; import noppes.npcs.blocks.tiles.TileColorable; -import noppes.npcs.client.model.blocks.ModelBanner; -import noppes.npcs.client.model.blocks.ModelBannerFlag; -import noppes.npcs.client.model.blocks.ModelCarpentryBench; import noppes.npcs.client.model.blocks.ModelChair; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class BlockChairRenderer extends BlockRendererInterface{ private final ModelChair model = new ModelChair(); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoodRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoodRenderer.java index b38135520..f2cd94a0c 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoodRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoodRenderer.java @@ -1,26 +1,20 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockCouchWood; import noppes.npcs.blocks.tiles.TileCouchWood; -import noppes.npcs.blocks.tiles.TileCouchWool; import noppes.npcs.client.model.blocks.ModelCouchWoodLeft; import noppes.npcs.client.model.blocks.ModelCouchWoodMiddle; import noppes.npcs.client.model.blocks.ModelCouchWoodRight; import noppes.npcs.client.model.blocks.ModelCouchWoodSingle; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class BlockCouchWoodRenderer extends BlockRendererInterface{ private final ModelBase model = new ModelCouchWoodMiddle(); 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 f0ff68951..6c75e9d38 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java @@ -1,29 +1,17 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockCouchWool; import noppes.npcs.blocks.tiles.TileCouchWool; -import noppes.npcs.client.model.blocks.ModelCouchCorner; -import noppes.npcs.client.model.blocks.ModelCouchCornerWool; -import noppes.npcs.client.model.blocks.ModelCouchLeft; -import noppes.npcs.client.model.blocks.ModelCouchLeftWool; -import noppes.npcs.client.model.blocks.ModelCouchMiddle; -import noppes.npcs.client.model.blocks.ModelCouchMiddleWool; -import noppes.npcs.client.model.blocks.ModelCouchRight; -import noppes.npcs.client.model.blocks.ModelCouchRightWool; - +import noppes.npcs.client.model.blocks.*; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class BlockCouchWoolRenderer extends BlockRendererInterface{ private final ModelBase model = new ModelCouchMiddle(); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCrateRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCrateRenderer.java index 38e8b088f..1ac0bae6c 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCrateRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCrateRenderer.java @@ -1,5 +1,6 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.tileentity.TileEntity; @@ -7,12 +8,9 @@ import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockCrate; import noppes.npcs.blocks.tiles.TileColorable; import noppes.npcs.client.model.blocks.ModelCrate; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class BlockCrateRenderer extends BlockRendererInterface{ private final ModelCrate model = new ModelCrate(); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockLampRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockLampRenderer.java index 4909c469a..513b04aa7 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockLampRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockLampRenderer.java @@ -1,5 +1,7 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; @@ -13,13 +15,9 @@ import noppes.npcs.blocks.tiles.TileLamp; import noppes.npcs.client.model.blocks.ModelLamp; import noppes.npcs.client.model.blocks.ModelLampCeiling; import noppes.npcs.client.model.blocks.ModelLampWall; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class BlockLampRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler{ private final ModelLamp model = new ModelLamp(); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockMailboxRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockMailboxRenderer.java index 931ff65ed..6a93b68f6 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockMailboxRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockMailboxRenderer.java @@ -1,5 +1,7 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -10,12 +12,8 @@ import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockMailbox; import noppes.npcs.client.model.blocks.ModelMailboxUS; import noppes.npcs.client.model.blocks.ModelMailboxWow; - import org.lwjgl.opengl.GL11; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class BlockMailboxRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler{ private final ModelMailboxUS model = new ModelMailboxUS(); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockPedestalRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockPedestalRenderer.java index ccc168b60..7ee33ab8d 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockPedestalRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockPedestalRenderer.java @@ -1,5 +1,6 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; @@ -13,12 +14,9 @@ import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockRotated; import noppes.npcs.blocks.tiles.TilePedestal; import noppes.npcs.client.model.blocks.ModelPedestal; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class BlockPedestalRenderer extends BlockRendererInterface{ private final ModelPedestal model = new ModelPedestal(); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockShelfRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockShelfRenderer.java index b06dcb3d4..536651edd 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockShelfRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockShelfRenderer.java @@ -1,23 +1,18 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import noppes.npcs.CustomItems; -import noppes.npcs.blocks.BlockChair; import noppes.npcs.blocks.BlockRotated; import noppes.npcs.blocks.tiles.TileColorable; import noppes.npcs.blocks.tiles.TileShelf; import noppes.npcs.client.model.blocks.ModelShelf; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class BlockShelfRenderer extends BlockRendererInterface{ private final ModelShelf model = new ModelShelf(); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockSignRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockSignRenderer.java index 5d108f5b1..84274ef1c 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockSignRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockSignRenderer.java @@ -1,5 +1,6 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; @@ -10,12 +11,9 @@ import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockRotated; import noppes.npcs.blocks.tiles.TileSign; import noppes.npcs.client.model.blocks.ModelSign; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class BlockSignRenderer extends BlockRendererInterface{ private final ModelSign model = new ModelSign(); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java index 5957e1e1c..42f72ad0a 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java @@ -1,5 +1,6 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.tileentity.TileEntity; @@ -7,12 +8,9 @@ import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockStool; import noppes.npcs.blocks.tiles.TileColorable; import noppes.npcs.client.model.blocks.ModelStool; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class BlockStoolRenderer extends BlockRendererInterface{ private final ModelStool model = new ModelStool(); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockTableRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockTableRenderer.java index f6be246c8..9a492bf4c 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockTableRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockTableRenderer.java @@ -1,19 +1,15 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.IBlockAccess; import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockTable; import noppes.npcs.blocks.tiles.TileColorable; import noppes.npcs.client.model.blocks.ModelTable; - import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import cpw.mods.fml.client.registry.RenderingRegistry; public class BlockTableRenderer extends BlockRendererInterface{ diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockTallLampRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockTallLampRenderer.java index 94f357a11..a0bc00673 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockTallLampRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockTallLampRenderer.java @@ -1,5 +1,6 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.tileentity.TileEntity; @@ -9,12 +10,9 @@ import noppes.npcs.blocks.BlockTallLamp; import noppes.npcs.blocks.tiles.TileTallLamp; import noppes.npcs.client.model.blocks.ModelTallLamp; import noppes.npcs.client.model.blocks.ModelTallLampTop; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class BlockTallLampRenderer extends BlockRendererInterface{ private final ModelTallLamp model = new ModelTallLamp(); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockTombstoneRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockTombstoneRenderer.java index 8d88ab7e2..3c2dafcf4 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockTombstoneRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockTombstoneRenderer.java @@ -1,5 +1,6 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -12,12 +13,9 @@ import noppes.npcs.client.TextBlockClient; import noppes.npcs.client.model.blocks.ModelTombstone1; import noppes.npcs.client.model.blocks.ModelTombstone2; import noppes.npcs.client.model.blocks.ModelTombstone3; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class BlockTombstoneRenderer extends BlockRendererInterface{ private final ModelTombstone1 model = new ModelTombstone1(); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockWallBannerRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockWallBannerRenderer.java index b7ce9a88a..e905571b8 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockWallBannerRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockWallBannerRenderer.java @@ -1,5 +1,6 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; @@ -11,12 +12,9 @@ import noppes.npcs.blocks.BlockWallBanner; import noppes.npcs.blocks.tiles.TileWallBanner; import noppes.npcs.client.model.blocks.ModelWallBanner; import noppes.npcs.client.model.blocks.ModelWallBannerFlag; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class BlockWallBannerRenderer extends BlockRendererInterface{ private final ModelWallBanner model = new ModelWallBanner(); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockWeaponRackRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockWeaponRackRenderer.java index 3328adf71..616e87ad6 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockWeaponRackRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockWeaponRackRenderer.java @@ -1,5 +1,6 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; @@ -11,12 +12,9 @@ import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockWeaponRack; import noppes.npcs.blocks.tiles.TileWeaponRack; import noppes.npcs.client.model.blocks.ModelWeaponRack; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class BlockWeaponRackRenderer extends BlockRendererInterface{ private final ModelWeaponRack model = new ModelWeaponRack(); diff --git a/src/main/java/noppes/npcs/config/GlyphCache.java b/src/main/java/noppes/npcs/config/GlyphCache.java index 6c3f38f01..e6565b6f3 100644 --- a/src/main/java/noppes/npcs/config/GlyphCache.java +++ b/src/main/java/noppes/npcs/config/GlyphCache.java @@ -1,12 +1,11 @@ package noppes.npcs.config; -import java.awt.AlphaComposite; -import java.awt.Color; -import java.awt.Font; -import java.awt.Graphics2D; -import java.awt.GraphicsEnvironment; -import java.awt.Rectangle; -import java.awt.RenderingHints; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GLAllocation; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; + +import java.awt.*; import java.awt.font.FontRenderContext; import java.awt.font.GlyphVector; import java.awt.geom.Point2D; @@ -15,17 +14,8 @@ 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 net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GLAllocation; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; +import java.util.*; /** * @author https://github.com/secretdataz/BetterFonts diff --git a/src/main/java/noppes/npcs/config/LoadConfiguration.java b/src/main/java/noppes/npcs/config/LoadConfiguration.java index 2a946108b..f415674b7 100644 --- a/src/main/java/noppes/npcs/config/LoadConfiguration.java +++ b/src/main/java/noppes/npcs/config/LoadConfiguration.java @@ -1,15 +1,6 @@ package noppes.npcs.config; -import noppes.npcs.CustomNpcs; -import noppes.npcs.config.legacy.ConfigProp; -import noppes.npcs.config.legacy.LegacyConfig; - -import java.io.BufferedWriter; import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.lang.reflect.Field; -import java.util.LinkedList; public class LoadConfiguration { public static File mainConfigFile; diff --git a/src/main/java/noppes/npcs/config/StringCache.java b/src/main/java/noppes/npcs/config/StringCache.java index 499c7c4c4..7af59be79 100644 --- a/src/main/java/noppes/npcs/config/StringCache.java +++ b/src/main/java/noppes/npcs/config/StringCache.java @@ -1,7 +1,11 @@ package noppes.npcs.config; -import java.awt.Font; -import java.awt.Point; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; + +import java.awt.*; import java.awt.font.GlyphVector; import java.lang.ref.WeakReference; import java.text.Bidi; @@ -10,12 +14,6 @@ import java.util.Arrays; import java.util.List; import java.util.WeakHashMap; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - /** * @author https://github.com/secretdataz/BetterFonts diff --git a/src/main/java/noppes/npcs/config/TrueTypeFont.java b/src/main/java/noppes/npcs/config/TrueTypeFont.java index 15cbd65dd..600040a9b 100644 --- a/src/main/java/noppes/npcs/config/TrueTypeFont.java +++ b/src/main/java/noppes/npcs/config/TrueTypeFont.java @@ -5,23 +5,6 @@ package noppes.npcs.config; -import java.awt.Font; -import java.awt.FontFormatException; -import java.awt.FontMetrics; -import java.awt.Graphics2D; -import java.awt.GraphicsEnvironment; -import java.awt.RenderingHints; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureUtil; @@ -29,6 +12,13 @@ import net.minecraft.util.ResourceLocation; import noppes.npcs.util.LRUHashMap; import org.lwjgl.opengl.GL11; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.io.InputStream; +import java.util.List; +import java.util.*; + public class TrueTypeFont { private static final int MaxWidth = 512; private static final List allFonts = Arrays.asList(GraphicsEnvironment.getLocalGraphicsEnvironment().getAllFonts()); diff --git a/src/main/java/noppes/npcs/config/legacy/LegacyLoader.java b/src/main/java/noppes/npcs/config/legacy/LegacyLoader.java index 2a4ea58bf..17e0e8c13 100644 --- a/src/main/java/noppes/npcs/config/legacy/LegacyLoader.java +++ b/src/main/java/noppes/npcs/config/legacy/LegacyLoader.java @@ -1,17 +1,12 @@ package noppes.npcs.config.legacy; -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 noppes.npcs.LogWriter; + +import java.io.*; import java.lang.reflect.Field; import java.util.HashMap; import java.util.LinkedList; -import noppes.npcs.LogWriter; - public class LegacyLoader { private boolean updateFile = false; private File dir; diff --git a/src/main/java/noppes/npcs/constants/EnumCompanionTalent.java b/src/main/java/noppes/npcs/constants/EnumCompanionTalent.java index d83169377..0cc2f6996 100644 --- a/src/main/java/noppes/npcs/constants/EnumCompanionTalent.java +++ b/src/main/java/noppes/npcs/constants/EnumCompanionTalent.java @@ -4,7 +4,6 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import noppes.npcs.CustomItems; -import noppes.npcs.roles.RoleCompanion; public enum EnumCompanionTalent { INVENTORY(CustomItems.satchel), ARMOR(Items.iron_chestplate), diff --git a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java index 1abf5cb16..968f3ccdb 100644 --- a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java +++ b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java @@ -3,18 +3,13 @@ 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.Container; -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.inventory.*; import net.minecraft.item.ItemStack; import net.minecraft.network.play.server.S2FPacketSetSlot; import net.minecraft.world.World; import noppes.npcs.CustomItems; -import noppes.npcs.controllers.data.RecipeCarpentry; import noppes.npcs.controllers.RecipeController; +import noppes.npcs.controllers.data.RecipeCarpentry; public class ContainerCarpentryBench extends Container { diff --git a/src/main/java/noppes/npcs/containers/ContainerCustomGui.java b/src/main/java/noppes/npcs/containers/ContainerCustomGui.java index a920cf11b..b241cd803 100644 --- a/src/main/java/noppes/npcs/containers/ContainerCustomGui.java +++ b/src/main/java/noppes/npcs/containers/ContainerCustomGui.java @@ -5,7 +5,6 @@ package noppes.npcs.containers; -import java.util.Iterator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; @@ -13,11 +12,13 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import noppes.npcs.EventHooks; -import noppes.npcs.scripted.NpcAPI; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.gui.IItemSlot; -import noppes.npcs.scripted.gui.ScriptGui; import noppes.npcs.client.gui.custom.components.CustomGuiSlot; +import noppes.npcs.scripted.NpcAPI; +import noppes.npcs.scripted.gui.ScriptGui; + +import java.util.Iterator; public class ContainerCustomGui extends Container { public ScriptGui customGui; diff --git a/src/main/java/noppes/npcs/containers/ContainerMail.java b/src/main/java/noppes/npcs/containers/ContainerMail.java index b6b268225..f7cc16e83 100644 --- a/src/main/java/noppes/npcs/containers/ContainerMail.java +++ b/src/main/java/noppes/npcs/containers/ContainerMail.java @@ -1,7 +1,5 @@ package noppes.npcs.containers; -import java.util.Iterator; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -9,6 +7,8 @@ import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.PlayerMail; import noppes.npcs.controllers.data.PlayerMailData; +import java.util.Iterator; + public class ContainerMail extends ContainerNpcInterface{ private static final String __OBFID = "CL_00001742"; public static PlayerMail staticmail = new PlayerMail(); diff --git a/src/main/java/noppes/npcs/containers/ContainerManageRecipes.java b/src/main/java/noppes/npcs/containers/ContainerManageRecipes.java index 905cfd3b1..a881df2ce 100644 --- a/src/main/java/noppes/npcs/containers/ContainerManageRecipes.java +++ b/src/main/java/noppes/npcs/containers/ContainerManageRecipes.java @@ -1,9 +1,5 @@ package noppes.npcs.containers; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryBasic; @@ -12,6 +8,10 @@ import net.minecraft.item.ItemStack; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.controllers.data.RecipeCarpentry; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + public class ContainerManageRecipes extends Container { private InventoryBasic craftingMatrix; diff --git a/src/main/java/noppes/npcs/containers/ContainerMerchantAdd.java b/src/main/java/noppes/npcs/containers/ContainerMerchantAdd.java index ff79b04cc..e1cdeb1f5 100644 --- a/src/main/java/noppes/npcs/containers/ContainerMerchantAdd.java +++ b/src/main/java/noppes/npcs/containers/ContainerMerchantAdd.java @@ -1,19 +1,15 @@ package noppes.npcs.containers; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.IMerchant; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryBasic; -import net.minecraft.inventory.InventoryMerchant; import net.minecraft.inventory.Slot; -import net.minecraft.inventory.SlotMerchantResult; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ContainerMerchantAdd extends ContainerNpcInterface { diff --git a/src/main/java/noppes/npcs/containers/ContainerNPCBankInterface.java b/src/main/java/noppes/npcs/containers/ContainerNPCBankInterface.java index acca8a9aa..f803e1762 100644 --- a/src/main/java/noppes/npcs/containers/ContainerNPCBankInterface.java +++ b/src/main/java/noppes/npcs/containers/ContainerNPCBankInterface.java @@ -5,8 +5,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import noppes.npcs.NpcMiscInventory; -import noppes.npcs.controllers.data.PlayerBankData; import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.PlayerBankData; public class ContainerNPCBankInterface extends ContainerNpcInterface { diff --git a/src/main/java/noppes/npcs/containers/ContainerNPCCompanion.java b/src/main/java/noppes/npcs/containers/ContainerNPCCompanion.java index e46f2eb2d..aebbd004a 100644 --- a/src/main/java/noppes/npcs/containers/ContainerNPCCompanion.java +++ b/src/main/java/noppes/npcs/containers/ContainerNPCCompanion.java @@ -1,13 +1,11 @@ package noppes.npcs.containers; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import noppes.npcs.constants.EnumCompanionTalent; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleCompanion; -import noppes.npcs.roles.RoleFollower; public class ContainerNPCCompanion extends ContainerNpcInterface{ public InventoryNPC currencyMatrix; diff --git a/src/main/java/noppes/npcs/containers/ContainerNPCFollower.java b/src/main/java/noppes/npcs/containers/ContainerNPCFollower.java index 2aec6ce31..8e0a1168c 100644 --- a/src/main/java/noppes/npcs/containers/ContainerNPCFollower.java +++ b/src/main/java/noppes/npcs/containers/ContainerNPCFollower.java @@ -1,7 +1,6 @@ package noppes.npcs.containers; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/containers/ContainerNPCFollowerHire.java b/src/main/java/noppes/npcs/containers/ContainerNPCFollowerHire.java index e185357b7..b623a28d5 100644 --- a/src/main/java/noppes/npcs/containers/ContainerNPCFollowerHire.java +++ b/src/main/java/noppes/npcs/containers/ContainerNPCFollowerHire.java @@ -5,7 +5,6 @@ package noppes.npcs.containers; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryBasic; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/noppes/npcs/containers/SlotCompanionWeapon.java b/src/main/java/noppes/npcs/containers/SlotCompanionWeapon.java index d6965a4ca..7d5257f5d 100644 --- a/src/main/java/noppes/npcs/containers/SlotCompanionWeapon.java +++ b/src/main/java/noppes/npcs/containers/SlotCompanionWeapon.java @@ -2,11 +2,7 @@ package noppes.npcs.containers; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemSword; -import net.minecraft.util.IIcon; import noppes.npcs.roles.RoleCompanion; class SlotCompanionWeapon extends Slot{ diff --git a/src/main/java/noppes/npcs/controllers/BankController.java b/src/main/java/noppes/npcs/controllers/BankController.java index 45c7da78c..37154930f 100644 --- a/src/main/java/noppes/npcs/controllers/BankController.java +++ b/src/main/java/noppes/npcs/controllers/BankController.java @@ -1,17 +1,17 @@ package noppes.npcs.controllers; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.HashMap; - import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcs; import noppes.npcs.controllers.data.Bank; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.HashMap; + public class BankController { public HashMap banks; private String filePath = ""; diff --git a/src/main/java/noppes/npcs/controllers/ChunkController.java b/src/main/java/noppes/npcs/controllers/ChunkController.java index ed457de54..db9319b5d 100644 --- a/src/main/java/noppes/npcs/controllers/ChunkController.java +++ b/src/main/java/noppes/npcs/controllers/ChunkController.java @@ -1,9 +1,5 @@ package noppes.npcs.controllers; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; import net.minecraft.world.ChunkCoordIntPair; @@ -17,6 +13,10 @@ import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumJobType; import noppes.npcs.entity.EntityNPCInterface; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; + public class ChunkController implements LoadingCallback{ public static ChunkController instance; diff --git a/src/main/java/noppes/npcs/controllers/CustomGuiController.java b/src/main/java/noppes/npcs/controllers/CustomGuiController.java index 43e5f9d68..1b9b1e8f9 100644 --- a/src/main/java/noppes/npcs/controllers/CustomGuiController.java +++ b/src/main/java/noppes/npcs/controllers/CustomGuiController.java @@ -6,16 +6,16 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcs; import noppes.npcs.Server; +import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.api.item.IItemStack; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumScriptType; import noppes.npcs.containers.ContainerCustomGui; +import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.event.CustomGuiEvent; import noppes.npcs.scripted.gui.ScriptGui; -import noppes.npcs.api.entity.IPlayer; -import noppes.npcs.api.item.IItemStack; import noppes.npcs.scripted.overlay.ScriptOverlay; -import noppes.npcs.scripted.NpcAPI; import java.io.IOException; diff --git a/src/main/java/noppes/npcs/controllers/DialogController.java b/src/main/java/noppes/npcs/controllers/DialogController.java index cb503ee2c..2544965e3 100644 --- a/src/main/java/noppes/npcs/controllers/DialogController.java +++ b/src/main/java/noppes/npcs/controllers/DialogController.java @@ -1,24 +1,24 @@ package noppes.npcs.controllers; -import java.io.File; -import java.io.FileInputStream; -import java.util.*; - import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.NoppesStringUtils; +import noppes.npcs.api.handler.IDialogHandler; +import noppes.npcs.api.handler.data.IDialog; +import noppes.npcs.api.handler.data.IDialogCategory; import noppes.npcs.constants.EnumOptionType; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.DialogCategory; import noppes.npcs.controllers.data.DialogOption; -import noppes.npcs.api.handler.IDialogHandler; -import noppes.npcs.api.handler.data.IDialog; -import noppes.npcs.api.handler.data.IDialogCategory; import noppes.npcs.util.NBTJsonUtil; +import java.io.File; +import java.io.FileInputStream; +import java.util.*; + public class DialogController implements IDialogHandler { public HashMap categories = new HashMap(); public HashMap dialogs = new HashMap(); diff --git a/src/main/java/noppes/npcs/controllers/FactionController.java b/src/main/java/noppes/npcs/controllers/FactionController.java index ece191a30..1281470cd 100644 --- a/src/main/java/noppes/npcs/controllers/FactionController.java +++ b/src/main/java/noppes/npcs/controllers/FactionController.java @@ -1,25 +1,20 @@ package noppes.npcs.controllers; -import java.io.BufferedInputStream; -import java.io.DataInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.zip.GZIPInputStream; - import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; -import noppes.npcs.controllers.data.Faction; import noppes.npcs.api.handler.IFactionHandler; import noppes.npcs.api.handler.data.IFaction; +import noppes.npcs.controllers.data.Faction; + +import java.io.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.zip.GZIPInputStream; public class FactionController implements IFactionHandler { public HashMap factions; diff --git a/src/main/java/noppes/npcs/controllers/GlobalDataController.java b/src/main/java/noppes/npcs/controllers/GlobalDataController.java index d02912009..8e992de95 100644 --- a/src/main/java/noppes/npcs/controllers/GlobalDataController.java +++ b/src/main/java/noppes/npcs/controllers/GlobalDataController.java @@ -1,16 +1,16 @@ package noppes.npcs.controllers; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.util.HashMap; - import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcs; import noppes.npcs.roles.JobItemGiver; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.util.HashMap; + public class GlobalDataController { public static GlobalDataController instance; diff --git a/src/main/java/noppes/npcs/controllers/LinkedNpcController.java b/src/main/java/noppes/npcs/controllers/LinkedNpcController.java index a66c0a4a4..3685affd6 100644 --- a/src/main/java/noppes/npcs/controllers/LinkedNpcController.java +++ b/src/main/java/noppes/npcs/controllers/LinkedNpcController.java @@ -1,21 +1,20 @@ package noppes.npcs.controllers; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcs; +import noppes.npcs.LogWriter; +import noppes.npcs.NBTTags; +import noppes.npcs.entity.EntityCustomNpc; +import noppes.npcs.entity.EntityNPCInterface; +import noppes.npcs.util.JsonException; +import noppes.npcs.util.NBTJsonUtil; + import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.CustomNpcs; -import noppes.npcs.LogWriter; -import noppes.npcs.NBTTags; -import noppes.npcs.NoppesUtilServer; -import noppes.npcs.entity.EntityCustomNpc; -import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.util.JsonException; -import noppes.npcs.util.NBTJsonUtil; - public class LinkedNpcController { public static LinkedNpcController Instance; public List list = new ArrayList(); diff --git a/src/main/java/noppes/npcs/controllers/PixelmonHelper.java b/src/main/java/noppes/npcs/controllers/PixelmonHelper.java index 24508bc46..2037deeee 100644 --- a/src/main/java/noppes/npcs/controllers/PixelmonHelper.java +++ b/src/main/java/noppes/npcs/controllers/PixelmonHelper.java @@ -1,13 +1,6 @@ package noppes.npcs.controllers; -import java.lang.reflect.Array; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; - +import cpw.mods.fml.common.Loader; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; @@ -22,11 +15,14 @@ import noppes.npcs.LogWriter; import noppes.npcs.constants.EnumJobType; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobSpawner; -import noppes.npcs.scripted.constants.JobType; - import org.apache.logging.log4j.LogManager; -import cpw.mods.fml.common.Loader; +import java.lang.reflect.Array; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; public class PixelmonHelper { public static boolean Enabled = false; diff --git a/src/main/java/noppes/npcs/controllers/PlayerDataController.java b/src/main/java/noppes/npcs/controllers/PlayerDataController.java index ee1976176..a0f0ea617 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerDataController.java +++ b/src/main/java/noppes/npcs/controllers/PlayerDataController.java @@ -1,13 +1,5 @@ package noppes.npcs.controllers; -import java.io.File; -import java.io.FileInputStream; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.Executor; -import java.util.concurrent.Executors; - -import cpw.mods.fml.common.FMLLog; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; @@ -20,6 +12,13 @@ import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.data.PlayerMail; import noppes.npcs.util.NBTJsonUtil; +import java.io.File; +import java.io.FileInputStream; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; + public class PlayerDataController { public static PlayerDataController instance; diff --git a/src/main/java/noppes/npcs/controllers/PlayerQuestController.java b/src/main/java/noppes/npcs/controllers/PlayerQuestController.java index 55bb6cba8..6cd53c755 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerQuestController.java +++ b/src/main/java/noppes/npcs/controllers/PlayerQuestController.java @@ -1,7 +1,5 @@ package noppes.npcs.controllers; -import java.util.Vector; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.ChatComponentTranslation; @@ -18,6 +16,8 @@ import noppes.npcs.controllers.data.Quest; import noppes.npcs.controllers.data.QuestData; import noppes.npcs.quests.QuestDialog; +import java.util.Vector; + public class PlayerQuestController { public static boolean hasActiveQuests(EntityPlayer player){ diff --git a/src/main/java/noppes/npcs/controllers/QuestController.java b/src/main/java/noppes/npcs/controllers/QuestController.java index 959053783..92197bca0 100644 --- a/src/main/java/noppes/npcs/controllers/QuestController.java +++ b/src/main/java/noppes/npcs/controllers/QuestController.java @@ -1,22 +1,22 @@ package noppes.npcs.controllers; -import java.io.File; -import java.io.FileInputStream; -import java.util.*; - import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.NoppesStringUtils; -import noppes.npcs.controllers.data.Quest; -import noppes.npcs.controllers.data.QuestCategory; import noppes.npcs.api.handler.IQuestHandler; import noppes.npcs.api.handler.data.IQuest; import noppes.npcs.api.handler.data.IQuestCategory; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.QuestCategory; import noppes.npcs.util.NBTJsonUtil; +import java.io.File; +import java.io.FileInputStream; +import java.util.*; + public class QuestController implements IQuestHandler { public HashMap categories = new HashMap(); public HashMap quests = new HashMap(); diff --git a/src/main/java/noppes/npcs/controllers/RecipeController.java b/src/main/java/noppes/npcs/controllers/RecipeController.java index ec407b3ed..fdc4f4112 100644 --- a/src/main/java/noppes/npcs/controllers/RecipeController.java +++ b/src/main/java/noppes/npcs/controllers/RecipeController.java @@ -1,11 +1,5 @@ package noppes.npcs.controllers; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.*; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; @@ -13,10 +7,16 @@ import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcs; -import noppes.npcs.controllers.data.RecipeCarpentry; -import noppes.npcs.controllers.data.RecipesDefault; import noppes.npcs.api.handler.IRecipeHandler; import noppes.npcs.api.handler.data.IRecipe; +import noppes.npcs.controllers.data.RecipeCarpentry; +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.*; public class RecipeController implements IRecipeHandler { private static Collection prevRecipes; diff --git a/src/main/java/noppes/npcs/controllers/ScriptContainer.java b/src/main/java/noppes/npcs/controllers/ScriptContainer.java index c512bc643..2da00d2df 100644 --- a/src/main/java/noppes/npcs/controllers/ScriptContainer.java +++ b/src/main/java/noppes/npcs/controllers/ScriptContainer.java @@ -5,21 +5,20 @@ package noppes.npcs.controllers; +import cpw.mods.fml.common.eventhandler.Event; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.NBTTags; +import noppes.npcs.config.ConfigScript; +import noppes.npcs.constants.EnumScriptType; +import noppes.npcs.controllers.data.IScriptHandler; +import noppes.npcs.scripted.NpcAPI; + +import javax.script.*; import java.io.PrintWriter; import java.io.StringWriter; import java.lang.reflect.Method; import java.util.*; import java.util.function.Predicate; -import javax.script.*; - -import cpw.mods.fml.common.eventhandler.Event; -import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.CustomNpcs; -import noppes.npcs.NBTTags; -import noppes.npcs.config.ConfigScript; -import noppes.npcs.controllers.data.IScriptHandler; -import noppes.npcs.constants.EnumScriptType; -import noppes.npcs.scripted.NpcAPI; 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 b4ec557c5..cfd6047ab 100644 --- a/src/main/java/noppes/npcs/controllers/ScriptController.java +++ b/src/main/java/noppes/npcs/controllers/ScriptController.java @@ -1,26 +1,7 @@ package noppes.npcs.controllers; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.script.ScriptEngine; -import javax.script.ScriptEngineFactory; -import javax.script.ScriptEngineManager; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityMob; -import net.minecraft.entity.passive.EntityAnimal; -import net.minecraft.entity.passive.EntityTameable; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; @@ -32,11 +13,21 @@ import noppes.npcs.controllers.data.ForgeDataScript; import noppes.npcs.controllers.data.NPCDataScript; import noppes.npcs.controllers.data.PlayerDataScript; import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.scripted.entity.*; import noppes.npcs.scripted.ScriptWorld; import noppes.npcs.util.JsonException; import noppes.npcs.util.NBTJsonUtil; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; + +import javax.script.ScriptEngine; +import javax.script.ScriptEngineFactory; +import javax.script.ScriptEngineManager; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class ScriptController { diff --git a/src/main/java/noppes/npcs/controllers/ServerCloneController.java b/src/main/java/noppes/npcs/controllers/ServerCloneController.java index c963f324f..e29d26ea1 100644 --- a/src/main/java/noppes/npcs/controllers/ServerCloneController.java +++ b/src/main/java/noppes/npcs/controllers/ServerCloneController.java @@ -1,12 +1,5 @@ package noppes.npcs.controllers; -import java.io.File; -import java.io.FileInputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import net.minecraft.command.ICommandSender; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; @@ -17,14 +10,21 @@ import net.minecraft.util.ChatComponentText; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.NoppesUtilServer; +import noppes.npcs.api.IPos; +import noppes.npcs.api.IWorld; +import noppes.npcs.api.entity.IEntity; +import noppes.npcs.api.handler.ICloneHandler; import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.api.IPos; -import noppes.npcs.api.handler.ICloneHandler; -import noppes.npcs.api.entity.IEntity; -import noppes.npcs.api.IWorld; import noppes.npcs.util.NBTJsonUtil; +import java.io.File; +import java.io.FileInputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class ServerCloneController implements ICloneHandler { public static ServerCloneController Instance; diff --git a/src/main/java/noppes/npcs/controllers/SpawnController.java b/src/main/java/noppes/npcs/controllers/SpawnController.java index 2246210c3..a4c8df58e 100644 --- a/src/main/java/noppes/npcs/controllers/SpawnController.java +++ b/src/main/java/noppes/npcs/controllers/SpawnController.java @@ -1,27 +1,18 @@ package noppes.npcs.controllers; -import java.io.BufferedInputStream; -import java.io.DataInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.zip.GZIPInputStream; - import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.WeightedRandom; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; -import noppes.npcs.controllers.data.SpawnData; 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.util.zip.GZIPInputStream; public class SpawnController implements INaturalSpawnsHandler { public HashMap> biomes = new HashMap>() ; diff --git a/src/main/java/noppes/npcs/controllers/TagController.java b/src/main/java/noppes/npcs/controllers/TagController.java index 5872bc57e..22dde79f3 100644 --- a/src/main/java/noppes/npcs/controllers/TagController.java +++ b/src/main/java/noppes/npcs/controllers/TagController.java @@ -7,7 +7,6 @@ import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.api.handler.ITagHandler; import noppes.npcs.api.handler.data.ITag; -import noppes.npcs.controllers.data.Faction; import noppes.npcs.controllers.data.Tag; import java.io.*; diff --git a/src/main/java/noppes/npcs/controllers/TransportController.java b/src/main/java/noppes/npcs/controllers/TransportController.java index 277260c6a..1d76c6167 100644 --- a/src/main/java/noppes/npcs/controllers/TransportController.java +++ b/src/main/java/noppes/npcs/controllers/TransportController.java @@ -1,5 +1,18 @@ package noppes.npcs.controllers; +import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import noppes.npcs.CustomNpcs; +import noppes.npcs.LogWriter; +import noppes.npcs.api.handler.ITransportHandler; +import noppes.npcs.api.handler.data.ITransportCategory; +import noppes.npcs.constants.EnumRoleType; +import noppes.npcs.controllers.data.TransportCategory; +import noppes.npcs.controllers.data.TransportLocation; +import noppes.npcs.entity.EntityNPCInterface; +import noppes.npcs.roles.RoleTransporter; + import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -8,19 +21,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import net.minecraft.nbt.CompressedStreamTools; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import noppes.npcs.CustomNpcs; -import noppes.npcs.LogWriter; -import noppes.npcs.constants.EnumRoleType; -import noppes.npcs.controllers.data.TransportCategory; -import noppes.npcs.controllers.data.TransportLocation; -import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.roles.RoleTransporter; -import noppes.npcs.api.handler.ITransportHandler; -import noppes.npcs.api.handler.data.ITransportCategory; - public class TransportController implements ITransportHandler { private HashMap locations = new HashMap(); public HashMap categories = new HashMap(); diff --git a/src/main/java/noppes/npcs/controllers/data/Animation.java b/src/main/java/noppes/npcs/controllers/data/Animation.java index 712131857..fa1f01929 100644 --- a/src/main/java/noppes/npcs/controllers/data/Animation.java +++ b/src/main/java/noppes/npcs/controllers/data/Animation.java @@ -2,10 +2,8 @@ package noppes.npcs.controllers.data; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import noppes.npcs.ModelPartData; import java.util.ArrayList; -import java.util.HashMap; public class Animation { diff --git a/src/main/java/noppes/npcs/controllers/data/Availability.java b/src/main/java/noppes/npcs/controllers/data/Availability.java index 2b7c0a332..6c27a7c2a 100644 --- a/src/main/java/noppes/npcs/controllers/data/Availability.java +++ b/src/main/java/noppes/npcs/controllers/data/Availability.java @@ -5,17 +5,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import noppes.npcs.ICompatibilty; import noppes.npcs.VersionCompatibility; -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.api.entity.IPlayer; +import noppes.npcs.api.handler.data.IAvailability; +import noppes.npcs.constants.*; import noppes.npcs.controllers.FactionController; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.PlayerQuestController; import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.api.handler.data.IAvailability; -import noppes.npcs.api.entity.IPlayer; public class Availability implements ICompatibilty, IAvailability { public int version = VersionCompatibility.ModRev; diff --git a/src/main/java/noppes/npcs/controllers/data/Bank.java b/src/main/java/noppes/npcs/controllers/data/Bank.java index 249ac338e..fd0d4a906 100644 --- a/src/main/java/noppes/npcs/controllers/data/Bank.java +++ b/src/main/java/noppes/npcs/controllers/data/Bank.java @@ -1,11 +1,11 @@ package noppes.npcs.controllers.data; -import java.util.HashMap; - import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NBTTags; import noppes.npcs.NpcMiscInventory; +import java.util.HashMap; + public class Bank { public int id = -1; diff --git a/src/main/java/noppes/npcs/controllers/data/BankData.java b/src/main/java/noppes/npcs/controllers/data/BankData.java index a135acbc9..021a523ce 100644 --- a/src/main/java/noppes/npcs/controllers/data/BankData.java +++ b/src/main/java/noppes/npcs/controllers/data/BankData.java @@ -1,7 +1,5 @@ package noppes.npcs.controllers.data; -import java.util.HashMap; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; @@ -18,6 +16,8 @@ import noppes.npcs.containers.ContainerNPCBankInterface; import noppes.npcs.controllers.BankController; import noppes.npcs.entity.EntityNPCInterface; +import java.util.HashMap; + public class BankData { public HashMap itemSlots; public HashMap upgradedSlots; diff --git a/src/main/java/noppes/npcs/controllers/data/DataScript.java b/src/main/java/noppes/npcs/controllers/data/DataScript.java index 16e082bbc..1ac6ced05 100644 --- a/src/main/java/noppes/npcs/controllers/data/DataScript.java +++ b/src/main/java/noppes/npcs/controllers/data/DataScript.java @@ -1,9 +1,5 @@ package noppes.npcs.controllers.data; -import java.util.*; - -import javax.script.ScriptEngine; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.relauncher.Side; @@ -12,23 +8,25 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; import net.minecraft.world.WorldServer; -import noppes.npcs.CustomNpcs; import noppes.npcs.EventHooks; import noppes.npcs.LogWriter; +import noppes.npcs.api.IWorld; +import noppes.npcs.api.entity.ICustomNpc; import noppes.npcs.config.ConfigDebug; import noppes.npcs.config.ConfigScript; import noppes.npcs.constants.EnumScriptType; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.scripted.entity.ScriptNpc; +import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.ScriptWorld; import noppes.npcs.scripted.constants.EntityType; import noppes.npcs.scripted.constants.JobType; import noppes.npcs.scripted.constants.RoleType; -import noppes.npcs.api.entity.ICustomNpc; -import noppes.npcs.api.IWorld; -import noppes.npcs.scripted.NpcAPI; +import noppes.npcs.scripted.entity.ScriptNpc; + +import javax.script.ScriptEngine; +import java.util.*; public class DataScript implements IScriptHandler { public List scripts = new ArrayList(); diff --git a/src/main/java/noppes/npcs/controllers/data/DataTransform.java b/src/main/java/noppes/npcs/controllers/data/DataTransform.java index 363e9aed7..e7990ec85 100644 --- a/src/main/java/noppes/npcs/controllers/data/DataTransform.java +++ b/src/main/java/noppes/npcs/controllers/data/DataTransform.java @@ -1,21 +1,15 @@ package noppes.npcs.controllers.data; -import java.util.Set; - import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.DataAI; -import noppes.npcs.DataAdvanced; -import noppes.npcs.DataDisplay; -import noppes.npcs.DataInventory; -import noppes.npcs.DataStats; import noppes.npcs.NBTTags; -import noppes.npcs.NoppesUtilServer; import noppes.npcs.constants.EnumAnimation; import noppes.npcs.constants.EnumJobType; import noppes.npcs.constants.EnumRoleType; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; +import java.util.Set; + public class DataTransform { public NBTTagCompound display; public NBTTagCompound ai; diff --git a/src/main/java/noppes/npcs/controllers/data/Dialog.java b/src/main/java/noppes/npcs/controllers/data/Dialog.java index 88090edb0..979b97f37 100644 --- a/src/main/java/noppes/npcs/controllers/data/Dialog.java +++ b/src/main/java/noppes/npcs/controllers/data/Dialog.java @@ -1,22 +1,20 @@ package noppes.npcs.controllers.data; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import noppes.npcs.CustomNpcs; import noppes.npcs.ICompatibilty; import noppes.npcs.VersionCompatibility; -import noppes.npcs.config.ConfigDebug; +import noppes.npcs.api.handler.data.*; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumOptionType; import noppes.npcs.controllers.DialogController; import noppes.npcs.controllers.QuestController; import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.api.handler.data.*; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; public class Dialog implements ICompatibilty, IDialog { public int version = VersionCompatibility.ModRev; diff --git a/src/main/java/noppes/npcs/controllers/data/DialogCategory.java b/src/main/java/noppes/npcs/controllers/data/DialogCategory.java index 57f46da07..ef2dbd4c8 100644 --- a/src/main/java/noppes/npcs/controllers/data/DialogCategory.java +++ b/src/main/java/noppes/npcs/controllers/data/DialogCategory.java @@ -1,14 +1,14 @@ package noppes.npcs.controllers.data; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.api.handler.data.IDialog; import noppes.npcs.api.handler.data.IDialogCategory; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + public class DialogCategory implements IDialogCategory { public int id = -1; diff --git a/src/main/java/noppes/npcs/controllers/data/Faction.java b/src/main/java/noppes/npcs/controllers/data/Faction.java index 6b9ff2d42..c0696f886 100644 --- a/src/main/java/noppes/npcs/controllers/data/Faction.java +++ b/src/main/java/noppes/npcs/controllers/data/Faction.java @@ -1,17 +1,17 @@ package noppes.npcs.controllers.data; -import java.util.ArrayList; -import java.util.HashSet; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NBTTags; +import noppes.npcs.api.entity.ICustomNpc; +import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.api.handler.data.IFaction; import noppes.npcs.controllers.FactionController; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.api.handler.data.IFaction; -import noppes.npcs.api.entity.ICustomNpc; -import noppes.npcs.api.entity.IPlayer; + +import java.util.ArrayList; +import java.util.HashSet; public class Faction implements IFaction { public String name = ""; diff --git a/src/main/java/noppes/npcs/controllers/data/ForgeDataScript.java b/src/main/java/noppes/npcs/controllers/data/ForgeDataScript.java index 4c34d4c5b..1c22e57ba 100644 --- a/src/main/java/noppes/npcs/controllers/data/ForgeDataScript.java +++ b/src/main/java/noppes/npcs/controllers/data/ForgeDataScript.java @@ -5,24 +5,18 @@ package noppes.npcs.controllers.data; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; -import java.util.Map.Entry; - import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.CustomNpcs; import noppes.npcs.EventHooks; -import noppes.npcs.config.ConfigMain; -import noppes.npcs.config.ConfigScript; -import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.NBTTags; +import noppes.npcs.config.ConfigScript; import noppes.npcs.constants.EnumScriptType; +import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; +import java.util.*; +import java.util.Map.Entry; + public class ForgeDataScript implements IScriptHandler { private List scripts = new ArrayList(); private String scriptLanguage = "ECMAScript"; diff --git a/src/main/java/noppes/npcs/controllers/data/Frame.java b/src/main/java/noppes/npcs/controllers/data/Frame.java index 29d0be081..76395d2a9 100644 --- a/src/main/java/noppes/npcs/controllers/data/Frame.java +++ b/src/main/java/noppes/npcs/controllers/data/Frame.java @@ -2,7 +2,6 @@ package noppes.npcs.controllers.data; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import noppes.npcs.constants.EnumAnimationPart; import java.util.ArrayList; diff --git a/src/main/java/noppes/npcs/controllers/data/FramePart.java b/src/main/java/noppes/npcs/controllers/data/FramePart.java index 41597d48f..c4df784db 100644 --- a/src/main/java/noppes/npcs/controllers/data/FramePart.java +++ b/src/main/java/noppes/npcs/controllers/data/FramePart.java @@ -1,17 +1,8 @@ package noppes.npcs.controllers.data; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.Vec3; import noppes.npcs.constants.EnumAnimationPart; -import javax.vecmath.Vector3f; -import java.util.ArrayList; -import java.util.Vector; - - public class FramePart { public EnumAnimationPart part; @@ -113,7 +104,7 @@ public class FramePart { compound.setString("Part", part.toString()); compound.setIntArray("Rotation", rotation); compound.setIntArray("Pivot", pivot); - + if(customized){ compound.setFloat("Speed", speed); compound.setBoolean("Smooth", smooth); diff --git a/src/main/java/noppes/npcs/controllers/data/IScriptHandler.java b/src/main/java/noppes/npcs/controllers/data/IScriptHandler.java index 504507d7b..a88218eae 100644 --- a/src/main/java/noppes/npcs/controllers/data/IScriptHandler.java +++ b/src/main/java/noppes/npcs/controllers/data/IScriptHandler.java @@ -5,12 +5,13 @@ package noppes.npcs.controllers.data; -import java.util.List; -import java.util.Map; import cpw.mods.fml.common.eventhandler.Event; import noppes.npcs.constants.EnumScriptType; import noppes.npcs.controllers.ScriptContainer; +import java.util.List; +import java.util.Map; + public interface IScriptHandler { void callScript(EnumScriptType var1, Event var2); diff --git a/src/main/java/noppes/npcs/controllers/data/Lines.java b/src/main/java/noppes/npcs/controllers/data/Lines.java index 94e8c9559..b649b2cb4 100644 --- a/src/main/java/noppes/npcs/controllers/data/Lines.java +++ b/src/main/java/noppes/npcs/controllers/data/Lines.java @@ -1,13 +1,13 @@ package noppes.npcs.controllers.data; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Random; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - public class Lines { private static final Random random = new Random(); private int lastLine = -1; diff --git a/src/main/java/noppes/npcs/controllers/data/NPCDataScript.java b/src/main/java/noppes/npcs/controllers/data/NPCDataScript.java index 903ff3ae3..a006a2b0d 100644 --- a/src/main/java/noppes/npcs/controllers/data/NPCDataScript.java +++ b/src/main/java/noppes/npcs/controllers/data/NPCDataScript.java @@ -4,15 +4,14 @@ import com.google.common.base.Preconditions; import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; -import noppes.npcs.CustomNpcs; import noppes.npcs.NBTTags; +import noppes.npcs.api.entity.ICustomNpc; import noppes.npcs.config.ConfigScript; import noppes.npcs.constants.EnumScriptType; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.api.entity.ICustomNpc; import javax.annotation.CheckForNull; import java.lang.reflect.Array; diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerBankData.java b/src/main/java/noppes/npcs/controllers/data/PlayerBankData.java index ca84dffbe..41fed1fbb 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerBankData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerBankData.java @@ -1,11 +1,11 @@ package noppes.npcs.controllers.data; -import java.util.HashMap; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import noppes.npcs.controllers.BankController; import noppes.npcs.api.handler.IPlayerBankData; +import noppes.npcs.controllers.BankController; + +import java.util.HashMap; public class PlayerBankData implements IPlayerBankData { private final PlayerData parent; diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerData.java b/src/main/java/noppes/npcs/controllers/data/PlayerData.java index ec5ff1aff..ab6da4b99 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerData.java @@ -9,6 +9,8 @@ import net.minecraftforge.common.IExtendedEntityProperties; import noppes.npcs.AnimationDataShared; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; +import noppes.npcs.api.entity.ICustomNpc; +import noppes.npcs.api.handler.*; import noppes.npcs.constants.EnumRoleType; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.entity.EntityCustomNpc; @@ -17,8 +19,6 @@ import noppes.npcs.entity.data.DataSkinOverlays; import noppes.npcs.entity.data.DataTimers; import noppes.npcs.roles.RoleCompanion; import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.api.entity.ICustomNpc; -import noppes.npcs.api.handler.*; import noppes.npcs.util.NBTJsonUtil; import java.io.File; diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java b/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java index 6f7f1f7b7..1d0be6c8d 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java @@ -3,26 +3,25 @@ // (powered by Fernflower decompiler) // package noppes.npcs.controllers.data; -import java.lang.reflect.Array; -import java.util.*; -import java.util.Map.Entry; + import com.google.common.base.Preconditions; +import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; -import cpw.mods.fml.common.eventhandler.Event; -import noppes.npcs.CustomNpcs; import noppes.npcs.EventHooks; -import noppes.npcs.config.ConfigClient; -import noppes.npcs.config.ConfigScript; -import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.NBTTags; +import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.config.ConfigScript; import noppes.npcs.constants.EnumScriptType; +import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.api.entity.IPlayer; import javax.annotation.CheckForNull; +import java.lang.reflect.Array; +import java.util.*; +import java.util.Map.Entry; public class PlayerDataScript implements IScriptHandler { public List scripts = new ArrayList(); diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerDialogData.java b/src/main/java/noppes/npcs/controllers/data/PlayerDialogData.java index 5c8147eef..acf39a090 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerDialogData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerDialogData.java @@ -1,11 +1,11 @@ package noppes.npcs.controllers.data; -import java.util.HashSet; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.api.handler.IPlayerDialogData; +import java.util.HashSet; + public class PlayerDialogData implements IPlayerDialogData { private final PlayerData parent; public HashSet dialogsRead = new HashSet(); diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerFactionData.java b/src/main/java/noppes/npcs/controllers/data/PlayerFactionData.java index 8d2f27b9f..6ddeb8f12 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerFactionData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerFactionData.java @@ -1,17 +1,17 @@ package noppes.npcs.controllers.data; -import java.util.HashMap; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.EventHooks; +import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.api.handler.IPlayerFactionData; import noppes.npcs.controllers.FactionController; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.event.FactionEvent; -import noppes.npcs.api.entity.IPlayer; -import noppes.npcs.api.handler.IPlayerFactionData; + +import java.util.HashMap; public class PlayerFactionData implements IPlayerFactionData { private final PlayerData parent; diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerItemGiverData.java b/src/main/java/noppes/npcs/controllers/data/PlayerItemGiverData.java index 758483b26..2141842d0 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerItemGiverData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerItemGiverData.java @@ -1,16 +1,16 @@ package noppes.npcs.controllers.data; -import java.util.ArrayList; -import java.util.HashMap; - import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NBTTags; -import noppes.npcs.controllers.GlobalDataController; -import noppes.npcs.roles.JobItemGiver; import noppes.npcs.api.handler.IPlayerItemGiverData; import noppes.npcs.api.jobs.IJobItemGiver; +import noppes.npcs.controllers.GlobalDataController; +import noppes.npcs.roles.JobItemGiver; import noppes.npcs.scripted.roles.ScriptJobItemGiver; +import java.util.ArrayList; +import java.util.HashMap; + public class PlayerItemGiverData implements IPlayerItemGiverData { private final PlayerData parent; private HashMap itemgivers = new HashMap(); diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerMail.java b/src/main/java/noppes/npcs/controllers/data/PlayerMail.java index 8530e5d66..2cc901d22 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerMail.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerMail.java @@ -7,10 +7,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.controllers.QuestController; -import noppes.npcs.scripted.NpcAPI; import noppes.npcs.api.handler.data.IPlayerMail; import noppes.npcs.api.item.IItemStack; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.scripted.NpcAPI; import java.util.ArrayList; diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerMailData.java b/src/main/java/noppes/npcs/controllers/data/PlayerMailData.java index 090d416d2..3861376ad 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerMailData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerMailData.java @@ -1,12 +1,12 @@ package noppes.npcs.controllers.data; -import java.util.ArrayList; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.api.handler.IPlayerMailData; import noppes.npcs.api.handler.data.IPlayerMail; +import java.util.ArrayList; + public class PlayerMailData implements IPlayerMailData { private final PlayerData parent; public ArrayList playermail = new ArrayList(); diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java b/src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java index b480bf323..45400d870 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java @@ -1,9 +1,5 @@ package noppes.npcs.controllers.data; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; @@ -11,7 +7,8 @@ import net.minecraft.nbt.NBTTagList; import noppes.npcs.EventHooks; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.Server; -import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.api.handler.IPlayerQuestData; +import noppes.npcs.api.handler.data.IQuest; import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumQuestCompletion; import noppes.npcs.constants.EnumQuestType; @@ -20,8 +17,10 @@ import noppes.npcs.controllers.QuestController; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.quests.QuestInterface; import noppes.npcs.quests.QuestItem; -import noppes.npcs.api.handler.IPlayerQuestData; -import noppes.npcs.api.handler.data.IQuest; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; public class PlayerQuestData implements IPlayerQuestData { private final PlayerData parent; diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerTransportData.java b/src/main/java/noppes/npcs/controllers/data/PlayerTransportData.java index a2479a3d1..0893c31eb 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerTransportData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerTransportData.java @@ -1,13 +1,13 @@ package noppes.npcs.controllers.data; -import java.util.ArrayList; -import java.util.HashSet; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import noppes.npcs.controllers.TransportController; import noppes.npcs.api.handler.IPlayerTransportData; import noppes.npcs.api.handler.data.ITransportLocation; +import noppes.npcs.controllers.TransportController; + +import java.util.ArrayList; +import java.util.HashSet; public class PlayerTransportData implements IPlayerTransportData { private final PlayerData parent; diff --git a/src/main/java/noppes/npcs/controllers/data/Quest.java b/src/main/java/noppes/npcs/controllers/data/Quest.java index b0e419ccd..3c73aa382 100644 --- a/src/main/java/noppes/npcs/controllers/data/Quest.java +++ b/src/main/java/noppes/npcs/controllers/data/Quest.java @@ -4,24 +4,20 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.*; +import noppes.npcs.api.IContainer; +import noppes.npcs.api.entity.IPlayer; +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.constants.EnumPacketClient; import noppes.npcs.constants.EnumQuestCompletion; import noppes.npcs.constants.EnumQuestRepeat; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.QuestController; -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.*; import noppes.npcs.scripted.CustomNPCsException; -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.IContainer; -import noppes.npcs.api.entity.IPlayer; import noppes.npcs.scripted.NpcAPI; public class Quest implements ICompatibilty, IQuest { diff --git a/src/main/java/noppes/npcs/controllers/data/QuestCategory.java b/src/main/java/noppes/npcs/controllers/data/QuestCategory.java index c3cdc6c18..774fef513 100644 --- a/src/main/java/noppes/npcs/controllers/data/QuestCategory.java +++ b/src/main/java/noppes/npcs/controllers/data/QuestCategory.java @@ -1,14 +1,14 @@ package noppes.npcs.controllers.data; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.api.handler.data.IQuest; import noppes.npcs.api.handler.data.IQuestCategory; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + public class QuestCategory implements IQuestCategory { public HashMap quests; public int id = -1; diff --git a/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java b/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java index dc4d2ac70..766766149 100644 --- a/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java +++ b/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java @@ -1,8 +1,5 @@ package noppes.npcs.controllers.data; -import java.io.IOException; -import java.util.HashMap; - import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; @@ -13,8 +10,11 @@ import net.minecraft.world.World; import noppes.npcs.NBTTags; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.controllers.RecipeController; import noppes.npcs.api.handler.data.IRecipe; +import noppes.npcs.controllers.RecipeController; + +import java.io.IOException; +import java.util.HashMap; public class RecipeCarpentry extends ShapedRecipes implements IRecipe { public int id = -1; diff --git a/src/main/java/noppes/npcs/controllers/data/RecipesDefault.java b/src/main/java/noppes/npcs/controllers/data/RecipesDefault.java index 8a2d51937..69462386a 100644 --- a/src/main/java/noppes/npcs/controllers/data/RecipesDefault.java +++ b/src/main/java/noppes/npcs/controllers/data/RecipesDefault.java @@ -6,7 +6,6 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import noppes.npcs.CustomItems; -import noppes.npcs.CustomNpcs; import noppes.npcs.config.ConfigMain; import noppes.npcs.controllers.RecipeController; diff --git a/src/main/java/noppes/npcs/controllers/data/SkinOverlay.java b/src/main/java/noppes/npcs/controllers/data/SkinOverlay.java index 04dc72d81..4149c7812 100644 --- a/src/main/java/noppes/npcs/controllers/data/SkinOverlay.java +++ b/src/main/java/noppes/npcs/controllers/data/SkinOverlay.java @@ -2,8 +2,8 @@ package noppes.npcs.controllers.data; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; -import noppes.npcs.entity.data.DataSkinOverlays; import noppes.npcs.api.ISkinOverlay; +import noppes.npcs.entity.data.DataSkinOverlays; public class SkinOverlay implements ISkinOverlay { public DataSkinOverlays parent; diff --git a/src/main/java/noppes/npcs/controllers/data/SpawnData.java b/src/main/java/noppes/npcs/controllers/data/SpawnData.java index 0bbf4e44b..f3296cc27 100644 --- a/src/main/java/noppes/npcs/controllers/data/SpawnData.java +++ b/src/main/java/noppes/npcs/controllers/data/SpawnData.java @@ -1,20 +1,20 @@ package noppes.npcs.controllers.data; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.WeightedRandom; import noppes.npcs.NBTTags; -import noppes.npcs.controllers.ServerCloneController; -import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.NpcAPI; import noppes.npcs.api.IWorld; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.handler.data.INaturalSpawn; +import noppes.npcs.controllers.ServerCloneController; +import noppes.npcs.scripted.CustomNPCsException; +import noppes.npcs.scripted.NpcAPI; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; public class SpawnData extends WeightedRandom.Item implements INaturalSpawn { public List biomes = new ArrayList(); diff --git a/src/main/java/noppes/npcs/controllers/data/TransportCategory.java b/src/main/java/noppes/npcs/controllers/data/TransportCategory.java index 7721db6ba..4a14ce184 100644 --- a/src/main/java/noppes/npcs/controllers/data/TransportCategory.java +++ b/src/main/java/noppes/npcs/controllers/data/TransportCategory.java @@ -1,15 +1,15 @@ package noppes.npcs.controllers.data; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import noppes.npcs.api.handler.data.ITransportCategory; +import noppes.npcs.api.handler.data.ITransportLocation; +import noppes.npcs.controllers.TransportController; + import java.util.HashMap; import java.util.Map; import java.util.Vector; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import noppes.npcs.controllers.TransportController; -import noppes.npcs.api.handler.data.ITransportCategory; -import noppes.npcs.api.handler.data.ITransportLocation; - public class TransportCategory implements ITransportCategory { public int id = -1; public String title = ""; diff --git a/src/main/java/noppes/npcs/controllers/data/TransportLocation.java b/src/main/java/noppes/npcs/controllers/data/TransportLocation.java index bc40ac52d..ce21b6758 100644 --- a/src/main/java/noppes/npcs/controllers/data/TransportLocation.java +++ b/src/main/java/noppes/npcs/controllers/data/TransportLocation.java @@ -1,10 +1,10 @@ package noppes.npcs.controllers.data; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.controllers.TransportController; -import noppes.npcs.scripted.NpcAPI; import noppes.npcs.api.IPos; import noppes.npcs.api.handler.data.ITransportLocation; +import noppes.npcs.controllers.TransportController; +import noppes.npcs.scripted.NpcAPI; public class TransportLocation implements ITransportLocation { public int id = -1; diff --git a/src/main/java/noppes/npcs/enchants/EnchantInterface.java b/src/main/java/noppes/npcs/enchants/EnchantInterface.java index bff45ea85..96bd406e5 100644 --- a/src/main/java/noppes/npcs/enchants/EnchantInterface.java +++ b/src/main/java/noppes/npcs/enchants/EnchantInterface.java @@ -5,10 +5,8 @@ import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.EnumEnchantmentType; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.EnumHelper; -import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.config.ConfigMain; -import noppes.npcs.items.ItemStaff; public abstract class EnchantInterface extends Enchantment{ diff --git a/src/main/java/noppes/npcs/entity/EntityCustomNpc.java b/src/main/java/noppes/npcs/entity/EntityCustomNpc.java index 12d36575c..7fc3ca108 100644 --- a/src/main/java/noppes/npcs/entity/EntityCustomNpc.java +++ b/src/main/java/noppes/npcs/entity/EntityCustomNpc.java @@ -1,7 +1,6 @@ package noppes.npcs.entity; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityFlying; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/noppes/npcs/entity/EntityDialogNpc.java b/src/main/java/noppes/npcs/entity/EntityDialogNpc.java index c100de45f..69190e655 100644 --- a/src/main/java/noppes/npcs/entity/EntityDialogNpc.java +++ b/src/main/java/noppes/npcs/entity/EntityDialogNpc.java @@ -1,7 +1,5 @@ package noppes.npcs.entity; -import java.util.UUID; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/src/main/java/noppes/npcs/entity/EntityItemScripted.java b/src/main/java/noppes/npcs/entity/EntityItemScripted.java index 8d663b4ba..6d43d5f4a 100644 --- a/src/main/java/noppes/npcs/entity/EntityItemScripted.java +++ b/src/main/java/noppes/npcs/entity/EntityItemScripted.java @@ -1,7 +1,5 @@ package noppes.npcs.entity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/noppes/npcs/entity/EntityMagicProjectile.java b/src/main/java/noppes/npcs/entity/EntityMagicProjectile.java index a09acbac5..26ef17ac3 100644 --- a/src/main/java/noppes/npcs/entity/EntityMagicProjectile.java +++ b/src/main/java/noppes/npcs/entity/EntityMagicProjectile.java @@ -1,6 +1,5 @@ package noppes.npcs.entity; -import net.minecraft.entity.EntityList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; diff --git a/src/main/java/noppes/npcs/entity/EntityNPCGolem.java b/src/main/java/noppes/npcs/entity/EntityNPCGolem.java index 371f1c925..cb74d847a 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCGolem.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCGolem.java @@ -4,7 +4,6 @@ package noppes.npcs.entity; -import net.minecraft.entity.monster.EntityIronGolem; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import noppes.npcs.ModelData; diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java index b8346e7b0..00ba566b3 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java @@ -1,10 +1,7 @@ package noppes.npcs.entity; +import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import io.netty.buffer.ByteBuf; - -import java.io.IOException; -import java.util.*; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.command.ICommandSender; @@ -29,25 +26,18 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.pathfinding.PathNavigate; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -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.util.*; 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.ai.*; import noppes.npcs.ai.EntityAIMoveIndoors; import noppes.npcs.ai.EntityAIPanic; import noppes.npcs.ai.EntityAIWander; import noppes.npcs.ai.EntityAIWatchClosest; +import noppes.npcs.ai.*; import noppes.npcs.ai.pathfinder.FlyingMoveHelper; import noppes.npcs.ai.pathfinder.PathNavigateFlying; import noppes.npcs.ai.selector.NPCAttackSelector; @@ -55,29 +45,24 @@ import noppes.npcs.ai.target.EntityAIClearTarget; import noppes.npcs.ai.target.EntityAIClosestTarget; import noppes.npcs.ai.target.EntityAIOwnerHurtByTarget; import noppes.npcs.ai.target.EntityAIOwnerHurtTarget; +import noppes.npcs.api.entity.ICustomNpc; +import noppes.npcs.api.item.IItemStack; import noppes.npcs.client.EntityUtil; import noppes.npcs.config.ConfigMain; -import noppes.npcs.constants.EnumAnimation; -import noppes.npcs.constants.EnumJobType; -import noppes.npcs.constants.EnumMovingType; -import noppes.npcs.constants.EnumNavType; -import noppes.npcs.constants.EnumPacketClient; -import noppes.npcs.constants.EnumPotionType; -import noppes.npcs.constants.EnumRoleType; -import noppes.npcs.constants.EnumStandingType; -import noppes.npcs.controllers.data.*; +import noppes.npcs.constants.*; import noppes.npcs.controllers.FactionController; import noppes.npcs.controllers.LinkedNpcController; import noppes.npcs.controllers.LinkedNpcController.LinkedData; import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.*; import noppes.npcs.entity.data.DataTimers; import noppes.npcs.roles.*; import noppes.npcs.scripted.entity.ScriptNpc; -import noppes.npcs.scripted.event.*; -import noppes.npcs.api.entity.ICustomNpc; -import noppes.npcs.api.item.IItemStack; +import noppes.npcs.scripted.event.NpcEvent; import noppes.npcs.util.GameProfileAlt; -import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; + +import java.io.IOException; +import java.util.*; public abstract class EntityNPCInterface extends EntityCreature implements IEntityAdditionalSpawnData, ICommandSender, IRangedAttackMob, IBossDisplayData{ public ICustomNpc wrappedNPC; diff --git a/src/main/java/noppes/npcs/entity/EntityNpcPony.java b/src/main/java/noppes/npcs/entity/EntityNpcPony.java index 27f657ed2..7b8032421 100644 --- a/src/main/java/noppes/npcs/entity/EntityNpcPony.java +++ b/src/main/java/noppes/npcs/entity/EntityNpcPony.java @@ -1,6 +1,5 @@ package noppes.npcs.entity; -import net.minecraft.entity.passive.EntityVillager; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; diff --git a/src/main/java/noppes/npcs/entity/EntityProjectile.java b/src/main/java/noppes/npcs/entity/EntityProjectile.java index e0a1d0b21..05a9e32d2 100644 --- a/src/main/java/noppes/npcs/entity/EntityProjectile.java +++ b/src/main/java/noppes/npcs/entity/EntityProjectile.java @@ -1,9 +1,7 @@ package noppes.npcs.entity; -import java.util.Iterator; -import java.util.List; -import java.util.UUID; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -22,22 +20,18 @@ 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.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.*; 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; import noppes.npcs.constants.EnumParticleType; import noppes.npcs.constants.EnumPotionType; import noppes.npcs.util.IProjectileCallback; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Iterator; +import java.util.List; +import java.util.UUID; public class EntityProjectile extends EntityThrowable { diff --git a/src/main/java/noppes/npcs/entity/data/DataSkinOverlays.java b/src/main/java/noppes/npcs/entity/data/DataSkinOverlays.java index cc5a4ab86..e9d51495c 100644 --- a/src/main/java/noppes/npcs/entity/data/DataSkinOverlays.java +++ b/src/main/java/noppes/npcs/entity/data/DataSkinOverlays.java @@ -2,15 +2,15 @@ package noppes.npcs.entity.data; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import noppes.npcs.CustomNpcs; import noppes.npcs.Server; +import noppes.npcs.api.ISkinOverlay; +import noppes.npcs.api.handler.IOverlayHandler; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.data.SkinOverlay; import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.api.ISkinOverlay; -import noppes.npcs.api.handler.IOverlayHandler; + import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/noppes/npcs/entity/data/DataTimers.java b/src/main/java/noppes/npcs/entity/data/DataTimers.java index 9bcb37275..5dd521dd7 100644 --- a/src/main/java/noppes/npcs/entity/data/DataTimers.java +++ b/src/main/java/noppes/npcs/entity/data/DataTimers.java @@ -5,18 +5,18 @@ package noppes.npcs.entity.data; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.EventHooks; -import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.api.ITimers; import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.CustomNPCsException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; + public class DataTimers implements ITimers { private final Object parent; private HashMap timers = new HashMap<>(); diff --git a/src/main/java/noppes/npcs/entity/old/EntityNPCElfFemale.java b/src/main/java/noppes/npcs/entity/old/EntityNPCElfFemale.java index f544cb391..ee56f2d1b 100644 --- a/src/main/java/noppes/npcs/entity/old/EntityNPCElfFemale.java +++ b/src/main/java/noppes/npcs/entity/old/EntityNPCElfFemale.java @@ -7,7 +7,6 @@ package noppes.npcs.entity.old; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import noppes.npcs.ModelData; -import noppes.npcs.constants.EnumAnimation; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/entity/old/EntityNPCElfMale.java b/src/main/java/noppes/npcs/entity/old/EntityNPCElfMale.java index 2d4ebcb26..0d56843da 100644 --- a/src/main/java/noppes/npcs/entity/old/EntityNPCElfMale.java +++ b/src/main/java/noppes/npcs/entity/old/EntityNPCElfMale.java @@ -7,7 +7,6 @@ package noppes.npcs.entity.old; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import noppes.npcs.ModelData; -import noppes.npcs.constants.EnumAnimation; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/entity/old/EntityNPCFurryMale.java b/src/main/java/noppes/npcs/entity/old/EntityNPCFurryMale.java index 7eb484286..78b6ad0c9 100644 --- a/src/main/java/noppes/npcs/entity/old/EntityNPCFurryMale.java +++ b/src/main/java/noppes/npcs/entity/old/EntityNPCFurryMale.java @@ -8,7 +8,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import noppes.npcs.ModelData; import noppes.npcs.ModelPartData; -import noppes.npcs.client.controllers.Preset; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/entity/old/EntityNPCVillager.java b/src/main/java/noppes/npcs/entity/old/EntityNPCVillager.java index 6862a5d9c..6d7f1aa47 100644 --- a/src/main/java/noppes/npcs/entity/old/EntityNPCVillager.java +++ b/src/main/java/noppes/npcs/entity/old/EntityNPCVillager.java @@ -4,7 +4,6 @@ package noppes.npcs.entity.old; -import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/noppes/npcs/entity/old/EntityNpcEnderchibi.java b/src/main/java/noppes/npcs/entity/old/EntityNpcEnderchibi.java index d9969d542..83923b2b0 100644 --- a/src/main/java/noppes/npcs/entity/old/EntityNpcEnderchibi.java +++ b/src/main/java/noppes/npcs/entity/old/EntityNpcEnderchibi.java @@ -8,7 +8,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import noppes.npcs.ModelData; import noppes.npcs.ModelPartData; -import noppes.npcs.client.NoppesUtil; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/items/ItemCrossbow.java b/src/main/java/noppes/npcs/items/ItemCrossbow.java index c0f9e7634..6e54298aa 100644 --- a/src/main/java/noppes/npcs/items/ItemCrossbow.java +++ b/src/main/java/noppes/npcs/items/ItemCrossbow.java @@ -3,13 +3,11 @@ package noppes.npcs.items; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.EnumAction; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import noppes.npcs.CustomItems; import noppes.npcs.entity.EntityProjectile; - import org.lwjgl.opengl.GL11; public class ItemCrossbow extends ItemNpcInterface{ diff --git a/src/main/java/noppes/npcs/items/ItemDaggerReversed.java b/src/main/java/noppes/npcs/items/ItemDaggerReversed.java index 0a1281eb9..09668c12a 100644 --- a/src/main/java/noppes/npcs/items/ItemDaggerReversed.java +++ b/src/main/java/noppes/npcs/items/ItemDaggerReversed.java @@ -1,7 +1,6 @@ package noppes.npcs.items; import net.minecraft.client.renderer.texture.IIconRegister; - import org.lwjgl.opengl.GL11; public class ItemDaggerReversed extends ItemDagger{ diff --git a/src/main/java/noppes/npcs/items/ItemElementalStaff.java b/src/main/java/noppes/npcs/items/ItemElementalStaff.java index 4fe9a182f..846e24255 100644 --- a/src/main/java/noppes/npcs/items/ItemElementalStaff.java +++ b/src/main/java/noppes/npcs/items/ItemElementalStaff.java @@ -1,8 +1,5 @@ package noppes.npcs.items; -import java.awt.Color; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; @@ -12,6 +9,9 @@ import noppes.npcs.CustomItems; import noppes.npcs.CustomNpcs; import noppes.npcs.constants.EnumNpcToolMaterial; +import java.awt.*; +import java.util.List; + public class ItemElementalStaff extends ItemStaff{ public ItemElementalStaff(int par1, EnumNpcToolMaterial material) { super(par1,material); diff --git a/src/main/java/noppes/npcs/items/ItemGun.java b/src/main/java/noppes/npcs/items/ItemGun.java index ee5910505..9a99a1e73 100644 --- a/src/main/java/noppes/npcs/items/ItemGun.java +++ b/src/main/java/noppes/npcs/items/ItemGun.java @@ -1,6 +1,5 @@ package noppes.npcs.items; -import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; @@ -10,13 +9,11 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; import noppes.npcs.CustomItems; -import noppes.npcs.CustomNpcs; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumNpcToolMaterial; import noppes.npcs.enchants.EnchantInterface; import noppes.npcs.entity.EntityProjectile; import noppes.npcs.util.IProjectileCallback; - import org.lwjgl.opengl.GL11; public class ItemGun extends ItemNpcInterface implements IProjectileCallback{ diff --git a/src/main/java/noppes/npcs/items/ItemGunChainsaw.java b/src/main/java/noppes/npcs/items/ItemGunChainsaw.java index 781b29acd..9ac87e920 100644 --- a/src/main/java/noppes/npcs/items/ItemGunChainsaw.java +++ b/src/main/java/noppes/npcs/items/ItemGunChainsaw.java @@ -1,9 +1,8 @@ package noppes.npcs.items; -import org.lwjgl.opengl.GL11; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; +import org.lwjgl.opengl.GL11; public class ItemGunChainsaw extends ItemNpcWeaponInterface{ diff --git a/src/main/java/noppes/npcs/items/ItemKunai.java b/src/main/java/noppes/npcs/items/ItemKunai.java index 03cd38662..1e8ae7a5e 100644 --- a/src/main/java/noppes/npcs/items/ItemKunai.java +++ b/src/main/java/noppes/npcs/items/ItemKunai.java @@ -4,7 +4,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import noppes.npcs.entity.EntityProjectile; - import org.lwjgl.opengl.GL11; public class ItemKunai extends ItemNpcWeaponInterface{ diff --git a/src/main/java/noppes/npcs/items/ItemKunaiReversed.java b/src/main/java/noppes/npcs/items/ItemKunaiReversed.java index 826092df4..cdd948603 100644 --- a/src/main/java/noppes/npcs/items/ItemKunaiReversed.java +++ b/src/main/java/noppes/npcs/items/ItemKunaiReversed.java @@ -2,7 +2,6 @@ package noppes.npcs.items; import net.minecraft.client.renderer.texture.IIconRegister; import noppes.npcs.CustomItems; - import org.lwjgl.opengl.GL11; public class ItemKunaiReversed extends ItemKunai{ diff --git a/src/main/java/noppes/npcs/items/ItemMachineGun.java b/src/main/java/noppes/npcs/items/ItemMachineGun.java index fed760232..3fc1a817e 100644 --- a/src/main/java/noppes/npcs/items/ItemMachineGun.java +++ b/src/main/java/noppes/npcs/items/ItemMachineGun.java @@ -6,10 +6,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import noppes.npcs.CustomItems; -import noppes.npcs.CustomNpcs; import noppes.npcs.config.ConfigMain; import noppes.npcs.entity.EntityProjectile; - import org.lwjgl.opengl.GL11; public class ItemMachineGun extends ItemNpcInterface{ diff --git a/src/main/java/noppes/npcs/items/ItemMoneyBag.java b/src/main/java/noppes/npcs/items/ItemMoneyBag.java index 5c9414cc8..df485a1a3 100644 --- a/src/main/java/noppes/npcs/items/ItemMoneyBag.java +++ b/src/main/java/noppes/npcs/items/ItemMoneyBag.java @@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import noppes.npcs.CustomItems; -import noppes.npcs.CustomNpcs; import noppes.npcs.client.NoppesUtil; public class ItemMoneyBag extends Item{ diff --git a/src/main/java/noppes/npcs/items/ItemMounter.java b/src/main/java/noppes/npcs/items/ItemMounter.java index 1aaaa6d07..eabbc4d2d 100644 --- a/src/main/java/noppes/npcs/items/ItemMounter.java +++ b/src/main/java/noppes/npcs/items/ItemMounter.java @@ -1,13 +1,13 @@ package noppes.npcs.items; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import noppes.npcs.CustomItems; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemMounter extends Item{ diff --git a/src/main/java/noppes/npcs/items/ItemMusicClarinet.java b/src/main/java/noppes/npcs/items/ItemMusicClarinet.java index d3662fdcb..8e3ac568f 100644 --- a/src/main/java/noppes/npcs/items/ItemMusicClarinet.java +++ b/src/main/java/noppes/npcs/items/ItemMusicClarinet.java @@ -4,7 +4,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import org.lwjgl.opengl.GL11; public class ItemMusicClarinet extends ItemMusic{ diff --git a/src/main/java/noppes/npcs/items/ItemMusicOracina.java b/src/main/java/noppes/npcs/items/ItemMusicOracina.java index 9cff022c9..04c8202d4 100644 --- a/src/main/java/noppes/npcs/items/ItemMusicOracina.java +++ b/src/main/java/noppes/npcs/items/ItemMusicOracina.java @@ -4,7 +4,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import org.lwjgl.opengl.GL11; public class ItemMusicOracina extends ItemMusic{ diff --git a/src/main/java/noppes/npcs/items/ItemMusicViolin.java b/src/main/java/noppes/npcs/items/ItemMusicViolin.java index 3d8415fa6..c198d0165 100644 --- a/src/main/java/noppes/npcs/items/ItemMusicViolin.java +++ b/src/main/java/noppes/npcs/items/ItemMusicViolin.java @@ -4,7 +4,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import org.lwjgl.opengl.GL11; public class ItemMusicViolin extends ItemMusic{ diff --git a/src/main/java/noppes/npcs/items/ItemMusket.java b/src/main/java/noppes/npcs/items/ItemMusket.java index 45f6dd7aa..8555260f9 100644 --- a/src/main/java/noppes/npcs/items/ItemMusket.java +++ b/src/main/java/noppes/npcs/items/ItemMusket.java @@ -6,11 +6,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import noppes.npcs.CustomItems; -import noppes.npcs.CustomNpcs; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumParticleType; import noppes.npcs.entity.EntityProjectile; - import org.lwjgl.opengl.GL11; public class ItemMusket extends ItemNpcInterface{ diff --git a/src/main/java/noppes/npcs/items/ItemNpcArmor.java b/src/main/java/noppes/npcs/items/ItemNpcArmor.java index 955099db0..2a57d273d 100644 --- a/src/main/java/noppes/npcs/items/ItemNpcArmor.java +++ b/src/main/java/noppes/npcs/items/ItemNpcArmor.java @@ -1,12 +1,11 @@ package noppes.npcs.items; +import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import noppes.npcs.CustomItems; -import noppes.npcs.CustomNpcs; -import cpw.mods.fml.common.registry.GameRegistry; public class ItemNpcArmor extends ItemArmor{ diff --git a/src/main/java/noppes/npcs/items/ItemNpcArmorColorable.java b/src/main/java/noppes/npcs/items/ItemNpcArmorColorable.java index 6fda21c9b..275c2cc65 100644 --- a/src/main/java/noppes/npcs/items/ItemNpcArmorColorable.java +++ b/src/main/java/noppes/npcs/items/ItemNpcArmorColorable.java @@ -1,5 +1,8 @@ package noppes.npcs.items; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.item.Item; @@ -7,12 +10,7 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; import noppes.npcs.CustomItems; -import noppes.npcs.CustomNpcs; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemNpcArmorColorable extends ItemArmor{ diff --git a/src/main/java/noppes/npcs/items/ItemNpcCloner.java b/src/main/java/noppes/npcs/items/ItemNpcCloner.java index f663bf511..32cec38f9 100644 --- a/src/main/java/noppes/npcs/items/ItemNpcCloner.java +++ b/src/main/java/noppes/npcs/items/ItemNpcCloner.java @@ -1,5 +1,8 @@ package noppes.npcs.items; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -9,9 +12,6 @@ import net.minecraft.world.World; import noppes.npcs.CustomItems; import noppes.npcs.CustomNpcs; import noppes.npcs.constants.EnumGuiType; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemNpcCloner extends Item{ diff --git a/src/main/java/noppes/npcs/items/ItemNpcInterface.java b/src/main/java/noppes/npcs/items/ItemNpcInterface.java index 9598fa05d..e744687d6 100644 --- a/src/main/java/noppes/npcs/items/ItemNpcInterface.java +++ b/src/main/java/noppes/npcs/items/ItemNpcInterface.java @@ -1,19 +1,14 @@ package noppes.npcs.items; -import net.minecraft.entity.EntityLiving; +import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.client.MinecraftForgeClient; import noppes.npcs.CustomItems; import noppes.npcs.CustomNpcs; -import noppes.npcs.client.renderer.NpcItemRenderer; - import org.lwjgl.opengl.GL11; -import cpw.mods.fml.common.registry.GameRegistry; - public class ItemNpcInterface extends Item implements ItemRenderInterface{ public ItemNpcInterface(int par1) { diff --git a/src/main/java/noppes/npcs/items/ItemNpcMovingPath.java b/src/main/java/noppes/npcs/items/ItemNpcMovingPath.java index 99238198c..39b19a1fd 100644 --- a/src/main/java/noppes/npcs/items/ItemNpcMovingPath.java +++ b/src/main/java/noppes/npcs/items/ItemNpcMovingPath.java @@ -1,7 +1,8 @@ package noppes.npcs.items; -import java.util.List; - +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -12,15 +13,13 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import noppes.npcs.CustomItems; -import noppes.npcs.CustomNpcs; import noppes.npcs.CustomNpcsPermissions; import noppes.npcs.NoppesUtilServer; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.entity.EntityNPCInterface; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; diff --git a/src/main/java/noppes/npcs/items/ItemNpcScripter.java b/src/main/java/noppes/npcs/items/ItemNpcScripter.java index 636fc1fe5..c9216071e 100644 --- a/src/main/java/noppes/npcs/items/ItemNpcScripter.java +++ b/src/main/java/noppes/npcs/items/ItemNpcScripter.java @@ -1,5 +1,8 @@ package noppes.npcs.items; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -8,9 +11,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.world.World; import noppes.npcs.CustomItems; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import noppes.npcs.CustomNpcs; import noppes.npcs.config.ConfigScript; import noppes.npcs.constants.EnumGuiType; diff --git a/src/main/java/noppes/npcs/items/ItemNpcWand.java b/src/main/java/noppes/npcs/items/ItemNpcWand.java index 1eea0097d..15c427687 100644 --- a/src/main/java/noppes/npcs/items/ItemNpcWand.java +++ b/src/main/java/noppes/npcs/items/ItemNpcWand.java @@ -1,5 +1,8 @@ package noppes.npcs.items; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -15,10 +18,6 @@ import noppes.npcs.NoppesUtilServer; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.entity.EntityCustomNpc; -import noppes.npcs.entity.EntityNPCInterface; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemNpcWand extends Item{ diff --git a/src/main/java/noppes/npcs/items/ItemNpcWeaponInterface.java b/src/main/java/noppes/npcs/items/ItemNpcWeaponInterface.java index 07744e9c3..517613151 100644 --- a/src/main/java/noppes/npcs/items/ItemNpcWeaponInterface.java +++ b/src/main/java/noppes/npcs/items/ItemNpcWeaponInterface.java @@ -1,14 +1,12 @@ package noppes.npcs.items; +import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.item.Item; import net.minecraft.item.ItemSword; import noppes.npcs.CustomItems; import noppes.npcs.CustomNpcs; - import org.lwjgl.opengl.GL11; -import cpw.mods.fml.common.registry.GameRegistry; - public class ItemNpcWeaponInterface extends ItemSword implements ItemRenderInterface{ diff --git a/src/main/java/noppes/npcs/items/ItemOrb.java b/src/main/java/noppes/npcs/items/ItemOrb.java index 0fe26403e..0fd8a3b09 100644 --- a/src/main/java/noppes/npcs/items/ItemOrb.java +++ b/src/main/java/noppes/npcs/items/ItemOrb.java @@ -1,13 +1,13 @@ package noppes.npcs.items; -import java.awt.Color; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import java.awt.*; +import java.util.List; + public class ItemOrb extends ItemNpcInterface{ public ItemOrb(int par1) { diff --git a/src/main/java/noppes/npcs/items/ItemRotatedShield.java b/src/main/java/noppes/npcs/items/ItemRotatedShield.java index 35955eb83..edcb4d924 100644 --- a/src/main/java/noppes/npcs/items/ItemRotatedShield.java +++ b/src/main/java/noppes/npcs/items/ItemRotatedShield.java @@ -1,7 +1,6 @@ package noppes.npcs.items; import noppes.npcs.constants.EnumNpcToolMaterial; - import org.lwjgl.opengl.GL11; public class ItemRotatedShield extends ItemShield{ diff --git a/src/main/java/noppes/npcs/items/ItemScripted.java b/src/main/java/noppes/npcs/items/ItemScripted.java index b430c457a..919e53b3e 100644 --- a/src/main/java/noppes/npcs/items/ItemScripted.java +++ b/src/main/java/noppes/npcs/items/ItemScripted.java @@ -17,13 +17,13 @@ import net.minecraft.world.World; import noppes.npcs.CustomItems; import noppes.npcs.CustomNpcs; import noppes.npcs.EventHooks; +import noppes.npcs.api.item.IItemStack; import noppes.npcs.config.ConfigScript; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.entity.EntityItemScripted; -import noppes.npcs.scripted.event.ItemEvent; -import noppes.npcs.api.item.IItemStack; -import noppes.npcs.scripted.item.ScriptCustomItem; import noppes.npcs.scripted.NpcAPI; +import noppes.npcs.scripted.event.ItemEvent; +import noppes.npcs.scripted.item.ScriptCustomItem; import org.lwjgl.opengl.GL11; public class ItemScripted extends Item implements ItemRenderInterface { diff --git a/src/main/java/noppes/npcs/items/ItemShield.java b/src/main/java/noppes/npcs/items/ItemShield.java index 342b6b40a..574e702a9 100644 --- a/src/main/java/noppes/npcs/items/ItemShield.java +++ b/src/main/java/noppes/npcs/items/ItemShield.java @@ -6,7 +6,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import noppes.npcs.CustomItems; import noppes.npcs.constants.EnumNpcToolMaterial; - import org.lwjgl.opengl.GL11; public class ItemShield extends ItemNpcInterface{ diff --git a/src/main/java/noppes/npcs/items/ItemSkirt.java b/src/main/java/noppes/npcs/items/ItemSkirt.java index 9a53d3cf0..63e73d03f 100644 --- a/src/main/java/noppes/npcs/items/ItemSkirt.java +++ b/src/main/java/noppes/npcs/items/ItemSkirt.java @@ -1,5 +1,8 @@ package noppes.npcs.items; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -9,9 +12,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import noppes.npcs.CustomItems; import noppes.npcs.CustomNpcs; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemSkirt extends ItemArmor{ diff --git a/src/main/java/noppes/npcs/items/ItemSlingshot.java b/src/main/java/noppes/npcs/items/ItemSlingshot.java index 50b11e3bc..3baea4037 100644 --- a/src/main/java/noppes/npcs/items/ItemSlingshot.java +++ b/src/main/java/noppes/npcs/items/ItemSlingshot.java @@ -1,6 +1,5 @@ package noppes.npcs.items; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.EnumAction; @@ -10,7 +9,6 @@ import net.minecraft.world.World; import noppes.npcs.CustomItems; import noppes.npcs.constants.EnumParticleType; import noppes.npcs.entity.EntityProjectile; - import org.lwjgl.opengl.GL11; public class ItemSlingshot extends ItemNpcInterface{ diff --git a/src/main/java/noppes/npcs/items/ItemSoulstoneEmpty.java b/src/main/java/noppes/npcs/items/ItemSoulstoneEmpty.java index 33cc33585..0f5483a7d 100644 --- a/src/main/java/noppes/npcs/items/ItemSoulstoneEmpty.java +++ b/src/main/java/noppes/npcs/items/ItemSoulstoneEmpty.java @@ -11,10 +11,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.CustomItems; -import noppes.npcs.CustomNpcs; import noppes.npcs.CustomNpcsPermissions; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.config.ConfigClient; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumRoleType; import noppes.npcs.controllers.PlayerDataController; diff --git a/src/main/java/noppes/npcs/items/ItemSoulstoneFilled.java b/src/main/java/noppes/npcs/items/ItemSoulstoneFilled.java index 6e62f7f3c..c69070161 100644 --- a/src/main/java/noppes/npcs/items/ItemSoulstoneFilled.java +++ b/src/main/java/noppes/npcs/items/ItemSoulstoneFilled.java @@ -1,8 +1,9 @@ package noppes.npcs.items; -import java.util.List; - import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.player.EntityPlayer; @@ -12,19 +13,16 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.config.ConfigDebug; -import noppes.npcs.config.ConfigScript; import noppes.npcs.constants.EnumRoleType; -import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleCompanion; import noppes.npcs.roles.RoleFollower; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class ItemSoulstoneFilled extends Item { public ItemSoulstoneFilled(){ diff --git a/src/main/java/noppes/npcs/items/ItemStaff.java b/src/main/java/noppes/npcs/items/ItemStaff.java index f8c1b1ce4..d1e7b7bdc 100644 --- a/src/main/java/noppes/npcs/items/ItemStaff.java +++ b/src/main/java/noppes/npcs/items/ItemStaff.java @@ -1,8 +1,5 @@ package noppes.npcs.items; -import org.lwjgl.opengl.GL11; - -import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -21,6 +18,7 @@ import noppes.npcs.enchants.EnchantInterface; import noppes.npcs.entity.EntityMagicProjectile; import noppes.npcs.entity.EntityProjectile; import noppes.npcs.util.IProjectileCallback; +import org.lwjgl.opengl.GL11; public class ItemStaff extends ItemNpcInterface implements IProjectileCallback{ diff --git a/src/main/java/noppes/npcs/items/ItemTeleporter.java b/src/main/java/noppes/npcs/items/ItemTeleporter.java index b7f3694ae..510a310ab 100644 --- a/src/main/java/noppes/npcs/items/ItemTeleporter.java +++ b/src/main/java/noppes/npcs/items/ItemTeleporter.java @@ -1,7 +1,8 @@ package noppes.npcs.items; -import java.util.List; - +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -19,9 +20,8 @@ import noppes.npcs.CustomItems; import noppes.npcs.CustomNpcs; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.entity.EntityNPCInterface; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class ItemTeleporter extends Item{ diff --git a/src/main/java/noppes/npcs/items/ItemThrowingWeapon.java b/src/main/java/noppes/npcs/items/ItemThrowingWeapon.java index 8653433b5..00b2922b1 100644 --- a/src/main/java/noppes/npcs/items/ItemThrowingWeapon.java +++ b/src/main/java/noppes/npcs/items/ItemThrowingWeapon.java @@ -1,12 +1,11 @@ package noppes.npcs.items; -import org.lwjgl.opengl.GL11; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import noppes.npcs.CustomItems; import noppes.npcs.entity.EntityProjectile; +import org.lwjgl.opengl.GL11; public class ItemThrowingWeapon extends ItemNpcInterface{ private boolean rotating = false; diff --git a/src/main/java/noppes/npcs/items/ItemWand.java b/src/main/java/noppes/npcs/items/ItemWand.java index 09e342d0b..d4ef7bdc8 100644 --- a/src/main/java/noppes/npcs/items/ItemWand.java +++ b/src/main/java/noppes/npcs/items/ItemWand.java @@ -2,7 +2,6 @@ package noppes.npcs.items; import net.minecraft.item.ItemStack; import noppes.npcs.CustomItems; - import org.lwjgl.opengl.GL11; public class ItemWand extends ItemNpcInterface{ diff --git a/src/main/java/noppes/npcs/items/MoneyBagContents.java b/src/main/java/noppes/npcs/items/MoneyBagContents.java index 6e532b295..9a0b75d6c 100644 --- a/src/main/java/noppes/npcs/items/MoneyBagContents.java +++ b/src/main/java/noppes/npcs/items/MoneyBagContents.java @@ -1,10 +1,8 @@ package noppes.npcs.items; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; public class MoneyBagContents { private EntityPlayer player; diff --git a/src/main/java/noppes/npcs/mixin/CustomNPCsMixinPlugin.java b/src/main/java/noppes/npcs/mixin/CustomNPCsMixinPlugin.java index e35bd8687..afd2c963a 100644 --- a/src/main/java/noppes/npcs/mixin/CustomNPCsMixinPlugin.java +++ b/src/main/java/noppes/npcs/mixin/CustomNPCsMixinPlugin.java @@ -1,8 +1,6 @@ package noppes.npcs.mixin; -import noppes.npcs.CustomNpcs; import noppes.npcs.config.ConfigClient; -import noppes.npcs.config.ConfigMain; import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinInfo; diff --git a/src/main/java/noppes/npcs/quests/QuestDialog.java b/src/main/java/noppes/npcs/quests/QuestDialog.java index 063164dd4..0881b91cb 100644 --- a/src/main/java/noppes/npcs/quests/QuestDialog.java +++ b/src/main/java/noppes/npcs/quests/QuestDialog.java @@ -1,22 +1,22 @@ package noppes.npcs.quests; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.NBTTags; +import noppes.npcs.api.handler.data.IQuestDialog; +import noppes.npcs.api.handler.data.IQuestObjective; +import noppes.npcs.constants.EnumQuestType; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.scripted.CustomNPCsException; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Vector; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.NBTTags; -import noppes.npcs.constants.EnumQuestType; -import noppes.npcs.controllers.data.Dialog; -import noppes.npcs.controllers.DialogController; -import noppes.npcs.controllers.data.PlayerData; -import noppes.npcs.controllers.PlayerDataController; -import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.api.handler.data.IQuestDialog; -import noppes.npcs.api.handler.data.IQuestObjective; - public class QuestDialog extends QuestInterface implements IQuestDialog { public HashMap dialogs = new HashMap(); diff --git a/src/main/java/noppes/npcs/quests/QuestInterface.java b/src/main/java/noppes/npcs/quests/QuestInterface.java index a34f8d491..bcd6025b6 100644 --- a/src/main/java/noppes/npcs/quests/QuestInterface.java +++ b/src/main/java/noppes/npcs/quests/QuestInterface.java @@ -1,17 +1,17 @@ package noppes.npcs.quests; -import java.util.Vector; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.Server; +import noppes.npcs.api.handler.data.IQuestInterface; +import noppes.npcs.api.handler.data.IQuestObjective; import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.QuestController; import noppes.npcs.controllers.data.PlayerData; -import noppes.npcs.api.handler.data.IQuestInterface; -import noppes.npcs.api.handler.data.IQuestObjective; + +import java.util.Vector; public abstract class QuestInterface implements IQuestInterface { public int questId; diff --git a/src/main/java/noppes/npcs/quests/QuestItem.java b/src/main/java/noppes/npcs/quests/QuestItem.java index a836c3109..51e0ac937 100644 --- a/src/main/java/noppes/npcs/quests/QuestItem.java +++ b/src/main/java/noppes/npcs/quests/QuestItem.java @@ -1,19 +1,19 @@ package noppes.npcs.quests; -import java.util.*; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.NoppesUtilServer; import noppes.npcs.NpcMiscInventory; -import noppes.npcs.controllers.data.PlayerData; -import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.api.handler.data.IQuestItem; import noppes.npcs.api.handler.data.IQuestObjective; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.util.ValueUtil; +import java.util.*; + public class QuestItem extends QuestInterface implements IQuestItem { public NpcMiscInventory items = new NpcMiscInventory(3); public static ItemStack pickedUp; diff --git a/src/main/java/noppes/npcs/quests/QuestKill.java b/src/main/java/noppes/npcs/quests/QuestKill.java index 95644d6ea..52a01cebe 100644 --- a/src/main/java/noppes/npcs/quests/QuestKill.java +++ b/src/main/java/noppes/npcs/quests/QuestKill.java @@ -1,18 +1,18 @@ package noppes.npcs.quests; -import java.util.*; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NBTTags; +import noppes.npcs.api.handler.data.IQuestKill; +import noppes.npcs.api.handler.data.IQuestObjective; import noppes.npcs.constants.EnumQuestType; -import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.data.PlayerQuestData; import noppes.npcs.controllers.data.QuestData; import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.api.handler.data.IQuestKill; -import noppes.npcs.api.handler.data.IQuestObjective; + +import java.util.*; public class QuestKill extends QuestInterface implements IQuestKill { public HashMap targets = new HashMap(); diff --git a/src/main/java/noppes/npcs/quests/QuestLocation.java b/src/main/java/noppes/npcs/quests/QuestLocation.java index 4830a470b..08a54d398 100644 --- a/src/main/java/noppes/npcs/quests/QuestLocation.java +++ b/src/main/java/noppes/npcs/quests/QuestLocation.java @@ -1,20 +1,20 @@ package noppes.npcs.quests; -import java.util.ArrayList; -import java.util.List; -import java.util.Vector; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; +import noppes.npcs.api.handler.data.IQuestLocation; +import noppes.npcs.api.handler.data.IQuestObjective; import noppes.npcs.constants.EnumQuestType; -import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.data.PlayerQuestData; import noppes.npcs.controllers.data.QuestData; import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.api.handler.data.IQuestLocation; -import noppes.npcs.api.handler.data.IQuestObjective; + +import java.util.ArrayList; +import java.util.List; +import java.util.Vector; public class QuestLocation extends QuestInterface implements IQuestLocation { public String location = ""; diff --git a/src/main/java/noppes/npcs/roles/JobBard.java b/src/main/java/noppes/npcs/roles/JobBard.java index 5ef96df86..7d2c6054c 100644 --- a/src/main/java/noppes/npcs/roles/JobBard.java +++ b/src/main/java/noppes/npcs/roles/JobBard.java @@ -1,7 +1,5 @@ package noppes.npcs.roles; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -11,6 +9,8 @@ import noppes.npcs.client.controllers.MusicController; import noppes.npcs.constants.EnumBardInstrument; import noppes.npcs.entity.EntityNPCInterface; +import java.util.List; + public class JobBard extends JobInterface{ public int minRange = 2; public int maxRange = 64; diff --git a/src/main/java/noppes/npcs/roles/JobChunkLoader.java b/src/main/java/noppes/npcs/roles/JobChunkLoader.java index 27d57b415..b60adb364 100644 --- a/src/main/java/noppes/npcs/roles/JobChunkLoader.java +++ b/src/main/java/noppes/npcs/roles/JobChunkLoader.java @@ -1,8 +1,5 @@ package noppes.npcs.roles; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; @@ -12,6 +9,9 @@ import net.minecraftforge.common.ForgeChunkManager.Ticket; import noppes.npcs.controllers.ChunkController; import noppes.npcs.entity.EntityNPCInterface; +import java.util.ArrayList; +import java.util.List; + public class JobChunkLoader extends JobInterface{ private List chunks = new ArrayList(); diff --git a/src/main/java/noppes/npcs/roles/JobConversation.java b/src/main/java/noppes/npcs/roles/JobConversation.java index 56a99ea7c..91b356c92 100644 --- a/src/main/java/noppes/npcs/roles/JobConversation.java +++ b/src/main/java/noppes/npcs/roles/JobConversation.java @@ -1,19 +1,19 @@ package noppes.npcs.roles; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import noppes.npcs.controllers.PlayerQuestController; +import noppes.npcs.controllers.QuestController; import noppes.npcs.controllers.data.Availability; import noppes.npcs.controllers.data.Line; -import noppes.npcs.controllers.PlayerQuestController; import noppes.npcs.controllers.data.Quest; -import noppes.npcs.controllers.QuestController; import noppes.npcs.entity.EntityNPCInterface; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + public class JobConversation extends JobInterface{ public Availability availability = new Availability(); diff --git a/src/main/java/noppes/npcs/roles/JobFollower.java b/src/main/java/noppes/npcs/roles/JobFollower.java index 1313c4f43..979c0f845 100644 --- a/src/main/java/noppes/npcs/roles/JobFollower.java +++ b/src/main/java/noppes/npcs/roles/JobFollower.java @@ -1,13 +1,11 @@ package noppes.npcs.roles; -import java.util.List; - -import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.CustomNpcs; import noppes.npcs.config.ConfigMain; import noppes.npcs.entity.EntityNPCInterface; +import java.util.List; + public class JobFollower extends JobInterface{ public EntityNPCInterface following = null; private int ticks = 40; diff --git a/src/main/java/noppes/npcs/roles/JobGuard.java b/src/main/java/noppes/npcs/roles/JobGuard.java index b53a42acf..7a137e184 100644 --- a/src/main/java/noppes/npcs/roles/JobGuard.java +++ b/src/main/java/noppes/npcs/roles/JobGuard.java @@ -1,11 +1,7 @@ package noppes.npcs.roles; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.boss.EntityDragon; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.IMob; @@ -16,6 +12,9 @@ import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NBTTags; import noppes.npcs.entity.EntityNPCInterface; +import java.util.ArrayList; +import java.util.List; + public class JobGuard extends JobInterface{ public boolean attacksAnimals = false; diff --git a/src/main/java/noppes/npcs/roles/JobHealer.java b/src/main/java/noppes/npcs/roles/JobHealer.java index b4d1995d6..e7727ef57 100644 --- a/src/main/java/noppes/npcs/roles/JobHealer.java +++ b/src/main/java/noppes/npcs/roles/JobHealer.java @@ -1,15 +1,14 @@ package noppes.npcs.roles; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NoppesUtilServer; import noppes.npcs.entity.EntityNPCInterface; +import java.util.ArrayList; +import java.util.List; + public class JobHealer extends JobInterface{ private long healTicks = 0; public int range = 5; diff --git a/src/main/java/noppes/npcs/roles/JobItemGiver.java b/src/main/java/noppes/npcs/roles/JobItemGiver.java index 6a696f3ca..4fc7f1e1f 100644 --- a/src/main/java/noppes/npcs/roles/JobItemGiver.java +++ b/src/main/java/noppes/npcs/roles/JobItemGiver.java @@ -1,10 +1,5 @@ package noppes.npcs.roles; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Vector; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -12,13 +7,17 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.NBTTags; import noppes.npcs.NpcMiscInventory; -import noppes.npcs.controllers.data.Availability; -import noppes.npcs.controllers.GlobalDataController; -import noppes.npcs.controllers.data.Line; import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.Availability; +import noppes.npcs.controllers.data.Line; import noppes.npcs.controllers.data.PlayerItemGiverData; import noppes.npcs.entity.EntityNPCInterface; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Vector; + public class JobItemGiver extends JobInterface{ public int cooldownType = 0; diff --git a/src/main/java/noppes/npcs/roles/JobSpawner.java b/src/main/java/noppes/npcs/roles/JobSpawner.java index 2358bf6ef..f88929029 100644 --- a/src/main/java/noppes/npcs/roles/JobSpawner.java +++ b/src/main/java/noppes/npcs/roles/JobSpawner.java @@ -1,25 +1,19 @@ package noppes.npcs.roles; -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; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; -import noppes.npcs.CustomNpcs; import noppes.npcs.NoppesUtilServer; import noppes.npcs.controllers.PixelmonHelper; import noppes.npcs.entity.EntityNPCInterface; - import org.apache.commons.lang3.RandomStringUtils; +import java.util.*; +import java.util.Map.Entry; + public class JobSpawner extends JobInterface{ public NBTTagCompound compound6; public NBTTagCompound compound5; diff --git a/src/main/java/noppes/npcs/roles/RoleBank.java b/src/main/java/noppes/npcs/roles/RoleBank.java index 13d939d65..99ab0ee78 100644 --- a/src/main/java/noppes/npcs/roles/RoleBank.java +++ b/src/main/java/noppes/npcs/roles/RoleBank.java @@ -2,10 +2,10 @@ package noppes.npcs.roles; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.controllers.data.Bank; import noppes.npcs.controllers.BankController; -import noppes.npcs.controllers.data.BankData; import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.Bank; +import noppes.npcs.controllers.data.BankData; import noppes.npcs.entity.EntityNPCInterface; public class RoleBank extends RoleInterface{ diff --git a/src/main/java/noppes/npcs/roles/RoleCompanion.java b/src/main/java/noppes/npcs/roles/RoleCompanion.java index 56f41f925..5ef66d515 100644 --- a/src/main/java/noppes/npcs/roles/RoleCompanion.java +++ b/src/main/java/noppes/npcs/roles/RoleCompanion.java @@ -1,16 +1,6 @@ package noppes.npcs.roles; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.TreeMap; -import java.util.UUID; -import java.util.Map.Entry; - import com.google.common.collect.HashMultimap; - import cpw.mods.fml.common.ObfuscationReflectionHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.SharedMonsterAttributes; @@ -18,12 +8,7 @@ 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.Item; -import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemBow; -import net.minecraft.item.ItemFood; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemSword; +import net.minecraft.item.*; import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -32,20 +17,15 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; import noppes.npcs.NoppesUtilServer; import noppes.npcs.NpcMiscInventory; -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.constants.*; import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; -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 noppes.npcs.roles.companion.*; + +import java.util.*; +import java.util.Map.Entry; public class RoleCompanion extends RoleInterface { public NpcMiscInventory inventory; diff --git a/src/main/java/noppes/npcs/roles/RoleFollower.java b/src/main/java/noppes/npcs/roles/RoleFollower.java index c0f1960d2..9853f9403 100644 --- a/src/main/java/noppes/npcs/roles/RoleFollower.java +++ b/src/main/java/noppes/npcs/roles/RoleFollower.java @@ -1,8 +1,5 @@ package noppes.npcs.roles; -import java.util.HashMap; -import java.util.UUID; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentTranslation; @@ -15,6 +12,9 @@ import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumJobType; import noppes.npcs.entity.EntityNPCInterface; +import java.util.HashMap; +import java.util.UUID; + public class RoleFollower extends RoleInterface{ private String ownerUUID; diff --git a/src/main/java/noppes/npcs/roles/RoleInnkeeper.java b/src/main/java/noppes/npcs/roles/RoleInnkeeper.java index d1794c0fc..7e8bee8df 100644 --- a/src/main/java/noppes/npcs/roles/RoleInnkeeper.java +++ b/src/main/java/noppes/npcs/roles/RoleInnkeeper.java @@ -1,7 +1,5 @@ package noppes.npcs.roles; -import java.util.HashMap; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; @@ -10,6 +8,8 @@ import net.minecraft.util.ChatComponentTranslation; import noppes.npcs.controllers.InnDoorData; import noppes.npcs.entity.EntityNPCInterface; +import java.util.HashMap; + public class RoleInnkeeper extends RoleInterface{ private String innName = "Inn"; diff --git a/src/main/java/noppes/npcs/roles/RoleInterface.java b/src/main/java/noppes/npcs/roles/RoleInterface.java index 4c77119c1..0c7c42ecf 100644 --- a/src/main/java/noppes/npcs/roles/RoleInterface.java +++ b/src/main/java/noppes/npcs/roles/RoleInterface.java @@ -1,11 +1,11 @@ package noppes.npcs.roles; -import java.util.HashMap; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.entity.EntityNPCInterface; +import java.util.HashMap; + public abstract class RoleInterface { public EntityNPCInterface npc; public HashMap dataString = new HashMap(); diff --git a/src/main/java/noppes/npcs/roles/RolePostman.java b/src/main/java/noppes/npcs/roles/RolePostman.java index 3e100fcfc..ca24c11de 100644 --- a/src/main/java/noppes/npcs/roles/RolePostman.java +++ b/src/main/java/noppes/npcs/roles/RolePostman.java @@ -1,18 +1,17 @@ package noppes.npcs.roles; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentTranslation; import noppes.npcs.CustomNpcs; -import noppes.npcs.NoppesUtilServer; import noppes.npcs.NpcMiscInventory; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.entity.EntityNPCInterface; +import java.util.ArrayList; +import java.util.List; + public class RolePostman extends RoleInterface{ public NpcMiscInventory inventory = new NpcMiscInventory(1); diff --git a/src/main/java/noppes/npcs/roles/RoleTrader.java b/src/main/java/noppes/npcs/roles/RoleTrader.java index 60fe8ce75..f6406a6e8 100644 --- a/src/main/java/noppes/npcs/roles/RoleTrader.java +++ b/src/main/java/noppes/npcs/roles/RoleTrader.java @@ -1,9 +1,5 @@ package noppes.npcs.roles; -import java.util.HashMap; -import java.util.logging.Level; -import java.util.logging.Logger; - import foxz.utils.Market; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -15,6 +11,10 @@ import noppes.npcs.NpcMiscInventory; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.entity.EntityNPCInterface; +import java.util.HashMap; +import java.util.logging.Level; +import java.util.logging.Logger; + public class RoleTrader extends RoleInterface{ public String marketName = ""; diff --git a/src/main/java/noppes/npcs/roles/RoleTransporter.java b/src/main/java/noppes/npcs/roles/RoleTransporter.java index 450cb6614..5569ec4b5 100644 --- a/src/main/java/noppes/npcs/roles/RoleTransporter.java +++ b/src/main/java/noppes/npcs/roles/RoleTransporter.java @@ -1,18 +1,18 @@ package noppes.npcs.roles; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentTranslation; import noppes.npcs.NoppesUtilServer; +import noppes.npcs.api.handler.data.ITransportLocation; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.controllers.PlayerDataController; -import noppes.npcs.controllers.data.PlayerTransportData; import noppes.npcs.controllers.TransportController; +import noppes.npcs.controllers.data.PlayerTransportData; import noppes.npcs.controllers.data.TransportLocation; import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.api.handler.data.ITransportLocation; + +import java.util.List; public class RoleTransporter extends RoleInterface{ diff --git a/src/main/java/noppes/npcs/roles/companion/CompanionFarmer.java b/src/main/java/noppes/npcs/roles/companion/CompanionFarmer.java index e05e506af..437db5922 100644 --- a/src/main/java/noppes/npcs/roles/companion/CompanionFarmer.java +++ b/src/main/java/noppes/npcs/roles/companion/CompanionFarmer.java @@ -1,6 +1,5 @@ package noppes.npcs.roles.companion; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; public class CompanionFarmer extends CompanionJobInterface{ diff --git a/src/main/java/noppes/npcs/roles/companion/CompanionFoodStats.java b/src/main/java/noppes/npcs/roles/companion/CompanionFoodStats.java index d0cabd3e2..84b127aba 100644 --- a/src/main/java/noppes/npcs/roles/companion/CompanionFoodStats.java +++ b/src/main/java/noppes/npcs/roles/companion/CompanionFoodStats.java @@ -1,13 +1,13 @@ package noppes.npcs.roles.companion; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.world.EnumDifficulty; import noppes.npcs.entity.EntityNPCInterface; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class CompanionFoodStats { /** The player's food level. */ diff --git a/src/main/java/noppes/npcs/roles/companion/CompanionGuard.java b/src/main/java/noppes/npcs/roles/companion/CompanionGuard.java index 38d39724b..7ea382213 100644 --- a/src/main/java/noppes/npcs/roles/companion/CompanionGuard.java +++ b/src/main/java/noppes/npcs/roles/companion/CompanionGuard.java @@ -1,12 +1,8 @@ package noppes.npcs.roles.companion; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityList; -import net.minecraft.entity.boss.EntityDragon; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.passive.EntityAnimal; -import net.minecraft.entity.passive.EntityTameable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java index bf6f93698..4c622a365 100644 --- a/src/main/java/noppes/npcs/scripted/NpcAPI.java +++ b/src/main/java/noppes/npcs/scripted/NpcAPI.java @@ -33,6 +33,14 @@ import net.minecraft.world.biome.BiomeGenBase; import noppes.npcs.CustomNpcs; import noppes.npcs.NoppesUtilServer; import noppes.npcs.api.*; +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.data.ISound; +import noppes.npcs.api.item.IItemStack; +import noppes.npcs.api.overlay.ICustomOverlay; import noppes.npcs.config.ConfigScript; import noppes.npcs.containers.ContainerNpcInterface; import noppes.npcs.controllers.*; @@ -42,14 +50,6 @@ import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.items.ItemScripted; import noppes.npcs.scripted.entity.*; import noppes.npcs.scripted.gui.ScriptGui; -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.data.ISound; -import noppes.npcs.api.item.IItemStack; -import noppes.npcs.api.overlay.ICustomOverlay; import noppes.npcs.scripted.item.*; import noppes.npcs.scripted.overlay.ScriptOverlay; import noppes.npcs.util.JsonException; diff --git a/src/main/java/noppes/npcs/scripted/ScriptBlock.java b/src/main/java/noppes/npcs/scripted/ScriptBlock.java index 15f34a979..8da5a6506 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptBlock.java +++ b/src/main/java/noppes/npcs/scripted/ScriptBlock.java @@ -5,7 +5,6 @@ package noppes.npcs.scripted; -import java.util.Map; import net.minecraft.block.Block; import net.minecraft.inventory.IInventory; import net.minecraft.nbt.NBTTagCompound; @@ -17,6 +16,8 @@ import net.minecraft.world.World; import noppes.npcs.api.*; import noppes.npcs.util.LRUHashMap; +import java.util.Map; + public class ScriptBlock implements IBlock { private static final Map blockCache = new LRUHashMap(400); protected IWorld world; diff --git a/src/main/java/noppes/npcs/scripted/ScriptContainer.java b/src/main/java/noppes/npcs/scripted/ScriptContainer.java index 42e0a101f..2f121bc19 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptContainer.java +++ b/src/main/java/noppes/npcs/scripted/ScriptContainer.java @@ -11,10 +11,10 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import noppes.npcs.NoppesUtilPlayer; -import noppes.npcs.containers.ContainerCustomGui; import noppes.npcs.api.IContainer; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.item.IItemStack; +import noppes.npcs.containers.ContainerCustomGui; public class ScriptContainer implements IContainer { private IInventory inventory; diff --git a/src/main/java/noppes/npcs/scripted/ScriptNbt.java b/src/main/java/noppes/npcs/scripted/ScriptNbt.java index 008646e2a..169a96531 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptNbt.java +++ b/src/main/java/noppes/npcs/scripted/ScriptNbt.java @@ -5,18 +5,12 @@ package noppes.npcs.scripted; -import java.util.Iterator; -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 net.minecraft.nbt.*; import noppes.npcs.api.INbt; import noppes.npcs.util.NBTJsonUtil; +import java.util.Iterator; + public class ScriptNbt implements INbt { private NBTTagCompound compound; diff --git a/src/main/java/noppes/npcs/scripted/ScriptWorld.java b/src/main/java/noppes/npcs/scripted/ScriptWorld.java index ed45bed23..f27d84c33 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptWorld.java +++ b/src/main/java/noppes/npcs/scripted/ScriptWorld.java @@ -1,7 +1,5 @@ package noppes.npcs.scripted; -import java.util.*; - import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.entity.Entity; @@ -21,21 +19,19 @@ import net.minecraft.util.Vec3; import net.minecraft.world.WorldServer; import noppes.npcs.CustomNpcs; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.api.scoreboard.IScoreboard; -import noppes.npcs.blocks.tiles.TileBigSign; -import noppes.npcs.controllers.ScriptController; -import noppes.npcs.controllers.ServerCloneController; -import noppes.npcs.api.IBlock; -import noppes.npcs.api.IPos; -import noppes.npcs.api.IParticle; -import noppes.npcs.api.ITileEntity; +import noppes.npcs.api.*; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.handler.data.ISound; import noppes.npcs.api.item.IItemStack; -import noppes.npcs.api.IWorld; +import noppes.npcs.api.scoreboard.IScoreboard; +import noppes.npcs.blocks.tiles.TileBigSign; +import noppes.npcs.controllers.ScriptController; +import noppes.npcs.controllers.ServerCloneController; import noppes.npcs.scripted.scoreboard.ScriptScoreboard; +import java.util.*; + public class ScriptWorld implements IWorld { private static final Map tempData = new HashMap<>(); public WorldServer world; diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptAnimal.java b/src/main/java/noppes/npcs/scripted/entity/ScriptAnimal.java index be157e261..8dce61eba 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptAnimal.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptAnimal.java @@ -2,11 +2,11 @@ package noppes.npcs.scripted.entity; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.entity.player.EntityPlayer; -import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.constants.EntityType; import noppes.npcs.api.entity.IAnimal; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.item.IItemStack; +import noppes.npcs.scripted.NpcAPI; +import noppes.npcs.scripted.constants.EntityType; public class ScriptAnimal extends ScriptLiving implements IAnimal { protected T entity; diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java index 8c92ebfc4..2acfb7d7e 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java @@ -4,9 +4,9 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.api.entity.IDBCPlayer; import noppes.npcs.api.item.IItemStack; +import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.NpcAPI; public class ScriptDBCPlayer extends ScriptPlayer implements IDBCPlayer { diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java b/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java index af779cb9a..8959ce132 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java @@ -1,7 +1,5 @@ package noppes.npcs.scripted.entity; -import java.util.*; - import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; @@ -17,16 +15,20 @@ import net.minecraft.nbt.NBTTagIntArray; import net.minecraft.nbt.NBTTagString; import net.minecraft.util.MathHelper; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.controllers.ServerCloneController; -import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.scripted.*; -import noppes.npcs.scripted.constants.EntityType; +import noppes.npcs.api.INbt; import noppes.npcs.api.IParticle; +import noppes.npcs.api.IPos; import noppes.npcs.api.IWorld; import noppes.npcs.api.entity.IEntity; -import noppes.npcs.api.INbt; -import noppes.npcs.api.IPos; import noppes.npcs.api.item.IItemStack; +import noppes.npcs.controllers.ServerCloneController; +import noppes.npcs.entity.EntityNPCInterface; +import noppes.npcs.scripted.CustomNPCsException; +import noppes.npcs.scripted.NpcAPI; +import noppes.npcs.scripted.ScriptParticle; +import noppes.npcs.scripted.constants.EntityType; + +import java.util.*; public class ScriptEntity implements IEntity { protected T entity; diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptLiving.java b/src/main/java/noppes/npcs/scripted/entity/ScriptLiving.java index 8d7408847..cb198413a 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptLiving.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptLiving.java @@ -1,10 +1,10 @@ package noppes.npcs.scripted.entity; import net.minecraft.entity.EntityLiving; -import noppes.npcs.scripted.NpcAPI; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.entity.IEntityLiving; import noppes.npcs.api.entity.IEntityLivingBase; +import noppes.npcs.scripted.NpcAPI; public class ScriptLiving extends ScriptLivingBase implements IEntityLiving { diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java b/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java index 0fa698348..88c877018 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java @@ -7,14 +7,14 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.util.EntityDamageSource; import net.minecraft.util.Vec3; -import noppes.npcs.api.IDamageSource; -import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.constants.EntityType; import noppes.npcs.api.IBlock; +import noppes.npcs.api.IDamageSource; import noppes.npcs.api.IPos; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.entity.IEntityLivingBase; import noppes.npcs.api.item.IItemStack; +import noppes.npcs.scripted.NpcAPI; +import noppes.npcs.scripted.constants.EntityType; public class ScriptLivingBase extends ScriptEntity implements IEntityLivingBase { protected T entity; diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptMonster.java b/src/main/java/noppes/npcs/scripted/entity/ScriptMonster.java index 983661424..5856cbc08 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptMonster.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptMonster.java @@ -1,8 +1,8 @@ package noppes.npcs.scripted.entity; import net.minecraft.entity.monster.EntityMob; -import noppes.npcs.scripted.constants.EntityType; import noppes.npcs.api.entity.IMonster; +import noppes.npcs.scripted.constants.EntityType; public class ScriptMonster extends ScriptLiving implements IMonster { diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java index 9b8583c91..f58e1d1a1 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java @@ -1,11 +1,15 @@ package noppes.npcs.scripted.entity; -import java.util.ArrayList; -import java.util.UUID; - import net.minecraft.entity.player.EntityPlayer; -import noppes.npcs.CustomNpcs; import noppes.npcs.NoppesUtilServer; +import noppes.npcs.api.IPos; +import noppes.npcs.api.ITimers; +import noppes.npcs.api.entity.ICustomNpc; +import noppes.npcs.api.entity.IEntityLivingBase; +import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.api.handler.IOverlayHandler; +import noppes.npcs.api.handler.data.IFaction; +import noppes.npcs.api.item.IItemStack; import noppes.npcs.api.jobs.IJob; import noppes.npcs.api.jobs.IJobPuppet; import noppes.npcs.api.roles.IRole; @@ -18,31 +22,12 @@ 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.api.IPos; -import noppes.npcs.api.ITimers; -import noppes.npcs.api.entity.ICustomNpc; -import noppes.npcs.api.entity.IEntityLivingBase; -import noppes.npcs.api.entity.IPlayer; -import noppes.npcs.api.handler.IOverlayHandler; -import noppes.npcs.api.handler.data.IFaction; -import noppes.npcs.api.item.IItemStack; -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.ScriptJobPuppet; -import noppes.npcs.scripted.roles.ScriptJobSpawner; -import noppes.npcs.scripted.roles.ScriptRoleBank; -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.scripted.roles.*; import noppes.npcs.util.ValueUtil; +import java.util.ArrayList; +import java.util.UUID; + public class ScriptNpc extends ScriptLiving implements ICustomNpc { public EntityNPCInterface npc; diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPixelmon.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPixelmon.java index f161e8088..b1a9349c4 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptPixelmon.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPixelmon.java @@ -2,8 +2,8 @@ package noppes.npcs.scripted.entity; import net.minecraft.entity.passive.EntityTameable; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.controllers.PixelmonHelper; import noppes.npcs.api.entity.IPixelmon; +import noppes.npcs.controllers.PixelmonHelper; import noppes.npcs.util.ValueUtil; public class ScriptPixelmon extends ScriptAnimal implements IPixelmon { diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java index db73c1260..1dac3368a 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java @@ -1,7 +1,5 @@ package noppes.npcs.scripted.entity; -import java.util.*; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; @@ -17,39 +15,35 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.WorldSettings; import noppes.npcs.*; import noppes.npcs.api.*; +import noppes.npcs.api.entity.IEntity; +import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.api.gui.ICustomGui; +import noppes.npcs.api.handler.IOverlayHandler; +import noppes.npcs.api.handler.data.IDialog; +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.config.ConfigScript; import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.containers.ContainerCustomGui; -import noppes.npcs.controllers.CustomGuiController; -import noppes.npcs.controllers.data.Dialog; -import noppes.npcs.controllers.DialogController; -import noppes.npcs.controllers.PixelmonHelper; -import noppes.npcs.controllers.data.PlayerData; -import noppes.npcs.controllers.PlayerDataController; -import noppes.npcs.controllers.data.PlayerDialogData; -import noppes.npcs.controllers.data.PlayerQuestData; -import noppes.npcs.controllers.data.Quest; -import noppes.npcs.controllers.QuestController; -import noppes.npcs.controllers.data.QuestData; +import noppes.npcs.controllers.*; +import noppes.npcs.controllers.data.*; import noppes.npcs.entity.EntityDialogNpc; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.ScriptPixelmonPlayerData; import noppes.npcs.scripted.ScriptSound; import noppes.npcs.scripted.constants.EntityType; import noppes.npcs.scripted.gui.ScriptGui; -import noppes.npcs.api.handler.data.IDialog; -import noppes.npcs.api.handler.data.IQuest; -import noppes.npcs.api.gui.ICustomGui; -import noppes.npcs.api.handler.data.ISound; -import noppes.npcs.api.overlay.ICustomOverlay; -import noppes.npcs.api.entity.IPlayer; -import noppes.npcs.api.entity.IEntity; -import noppes.npcs.api.handler.IOverlayHandler; -import noppes.npcs.api.item.IItemStack; import noppes.npcs.scripted.overlay.ScriptOverlay; import noppes.npcs.util.ValueUtil; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + public class ScriptPlayer extends ScriptLivingBase implements IPlayer { public T player; private PlayerData data; diff --git a/src/main/java/noppes/npcs/scripted/event/CustomGuiEvent.java b/src/main/java/noppes/npcs/scripted/event/CustomGuiEvent.java index 874910c52..7dcf7fecd 100644 --- a/src/main/java/noppes/npcs/scripted/event/CustomGuiEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/CustomGuiEvent.java @@ -1,11 +1,10 @@ package noppes.npcs.scripted.event; import cpw.mods.fml.common.eventhandler.Cancelable; -import cpw.mods.fml.common.eventhandler.Event; +import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.event.ICustomGuiEvent; import noppes.npcs.api.gui.ICustomGui; import noppes.npcs.api.item.IItemStack; -import noppes.npcs.api.entity.IPlayer; import noppes.npcs.constants.EnumScriptType; public class CustomGuiEvent extends CustomNPCsEvent implements ICustomGuiEvent { diff --git a/src/main/java/noppes/npcs/scripted/event/DialogEvent.java b/src/main/java/noppes/npcs/scripted/event/DialogEvent.java index 82588d06a..84ace0ee7 100644 --- a/src/main/java/noppes/npcs/scripted/event/DialogEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/DialogEvent.java @@ -1,9 +1,9 @@ package noppes.npcs.scripted.event; import cpw.mods.fml.common.eventhandler.Cancelable; +import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.event.IDialogEvent; import noppes.npcs.api.handler.data.IDialog; -import noppes.npcs.api.entity.IPlayer; import noppes.npcs.constants.EnumScriptType; public class DialogEvent extends CustomNPCsEvent implements IDialogEvent { diff --git a/src/main/java/noppes/npcs/scripted/event/FactionEvent.java b/src/main/java/noppes/npcs/scripted/event/FactionEvent.java index 21cdd1e64..2741b669b 100644 --- a/src/main/java/noppes/npcs/scripted/event/FactionEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/FactionEvent.java @@ -1,9 +1,9 @@ package noppes.npcs.scripted.event; import cpw.mods.fml.common.eventhandler.Cancelable; +import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.event.IFactionEvent; import noppes.npcs.api.handler.data.IFaction; -import noppes.npcs.api.entity.IPlayer; import noppes.npcs.constants.EnumScriptType; public class FactionEvent extends CustomNPCsEvent implements IFactionEvent { diff --git a/src/main/java/noppes/npcs/scripted/event/ItemEvent.java b/src/main/java/noppes/npcs/scripted/event/ItemEvent.java index de8542cea..925282dd7 100644 --- a/src/main/java/noppes/npcs/scripted/event/ItemEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/ItemEvent.java @@ -1,10 +1,10 @@ package noppes.npcs.scripted.event; import cpw.mods.fml.common.eventhandler.Cancelable; -import noppes.npcs.api.event.IItemEvent; -import noppes.npcs.api.item.IItemCustom; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.api.event.IItemEvent; +import noppes.npcs.api.item.IItemCustom; import noppes.npcs.constants.EnumScriptType; public class ItemEvent extends CustomNPCsEvent implements IItemEvent { diff --git a/src/main/java/noppes/npcs/scripted/event/NpcEvent.java b/src/main/java/noppes/npcs/scripted/event/NpcEvent.java index 64c758943..7035ce145 100644 --- a/src/main/java/noppes/npcs/scripted/event/NpcEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/NpcEvent.java @@ -12,15 +12,15 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import noppes.npcs.api.IDamageSource; -import noppes.npcs.api.event.INpcEvent; -import noppes.npcs.api.handler.data.IDialog; -import noppes.npcs.constants.EnumScriptType; -import noppes.npcs.controllers.data.Dialog; import noppes.npcs.api.entity.ICustomNpc; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.entity.IEntityLivingBase; import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.api.event.INpcEvent; +import noppes.npcs.api.handler.data.IDialog; import noppes.npcs.api.item.IItemStack; +import noppes.npcs.constants.EnumScriptType; +import noppes.npcs.controllers.data.Dialog; import noppes.npcs.scripted.NpcAPI; import java.util.ArrayList; diff --git a/src/main/java/noppes/npcs/scripted/event/QuestEvent.java b/src/main/java/noppes/npcs/scripted/event/QuestEvent.java index da10624c1..264e6f8c8 100644 --- a/src/main/java/noppes/npcs/scripted/event/QuestEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/QuestEvent.java @@ -1,10 +1,10 @@ package noppes.npcs.scripted.event; import cpw.mods.fml.common.eventhandler.Cancelable; +import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.event.IQuestEvent; import noppes.npcs.api.handler.data.IQuest; import noppes.npcs.api.item.IItemStack; -import noppes.npcs.api.entity.IPlayer; import noppes.npcs.constants.EnumScriptType; public class QuestEvent extends CustomNPCsEvent implements IQuestEvent { diff --git a/src/main/java/noppes/npcs/scripted/gui/ScriptGui.java b/src/main/java/noppes/npcs/scripted/gui/ScriptGui.java index dd72cef17..0a34c85d4 100644 --- a/src/main/java/noppes/npcs/scripted/gui/ScriptGui.java +++ b/src/main/java/noppes/npcs/scripted/gui/ScriptGui.java @@ -5,18 +5,19 @@ package noppes.npcs.scripted.gui; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; 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.item.IItemStack; +import noppes.npcs.controllers.CustomGuiController; import noppes.npcs.controllers.ScriptController; import noppes.npcs.controllers.data.PlayerDataScript; -import noppes.npcs.api.gui.*; -import noppes.npcs.controllers.CustomGuiController; -import noppes.npcs.api.entity.IPlayer; -import noppes.npcs.api.item.IItemStack; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; public class ScriptGui implements ICustomGui { int id; diff --git a/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java b/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java index 8cdf408b7..ac1200b1d 100644 --- a/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java +++ b/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java @@ -5,12 +5,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.EventHooks; import noppes.npcs.NBTTags; +import noppes.npcs.api.item.IItemCustom; import noppes.npcs.constants.EnumScriptType; -import noppes.npcs.controllers.data.IScriptHandler; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; +import noppes.npcs.controllers.data.IScriptHandler; import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.api.item.IItemCustom; import java.util.*; diff --git a/src/main/java/noppes/npcs/scripted/item/ScriptItemStack.java b/src/main/java/noppes/npcs/scripted/item/ScriptItemStack.java index 1fc262636..d0a43e920 100644 --- a/src/main/java/noppes/npcs/scripted/item/ScriptItemStack.java +++ b/src/main/java/noppes/npcs/scripted/item/ScriptItemStack.java @@ -1,12 +1,6 @@ package noppes.npcs.scripted.item; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - import com.google.common.collect.Multimap; - import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.ai.attributes.AttributeModifier; @@ -22,11 +16,16 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraftforge.common.IPlantable; -import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.ScriptNbt; -import noppes.npcs.api.item.IItemStack; import noppes.npcs.api.INbt; +import noppes.npcs.api.item.IItemStack; +import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.NpcAPI; +import noppes.npcs.scripted.ScriptNbt; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; 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 01f3cdc66..bbeb26b12 100644 --- a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlay.java +++ b/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlay.java @@ -3,9 +3,9 @@ package noppes.npcs.scripted.overlay; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import noppes.npcs.controllers.CustomGuiController; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.overlay.*; +import noppes.npcs.controllers.CustomGuiController; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptJobBard.java b/src/main/java/noppes/npcs/scripted/roles/ScriptJobBard.java index 3e876e30f..6a421e975 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptJobBard.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptJobBard.java @@ -1,9 +1,9 @@ package noppes.npcs.scripted.roles; +import noppes.npcs.api.jobs.IJobBard; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobBard; import noppes.npcs.scripted.constants.JobType; -import noppes.npcs.api.jobs.IJobBard; public class ScriptJobBard extends ScriptJobInterface implements IJobBard { private JobBard job; diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptJobConversation.java b/src/main/java/noppes/npcs/scripted/roles/ScriptJobConversation.java index b4b73b42d..2a94a0bb6 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptJobConversation.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptJobConversation.java @@ -1,9 +1,9 @@ package noppes.npcs.scripted.roles; +import noppes.npcs.api.jobs.IJobConversation; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobConversation; import noppes.npcs.scripted.constants.JobType; -import noppes.npcs.api.jobs.IJobConversation; public class ScriptJobConversation extends ScriptJobInterface implements IJobConversation { private JobConversation job; diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptJobFollower.java b/src/main/java/noppes/npcs/scripted/roles/ScriptJobFollower.java index e85b9c948..ea0b33298 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptJobFollower.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptJobFollower.java @@ -1,10 +1,10 @@ package noppes.npcs.scripted.roles; +import noppes.npcs.api.entity.ICustomNpc; +import noppes.npcs.api.jobs.IJobFollower; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobFollower; import noppes.npcs.scripted.constants.JobType; -import noppes.npcs.api.entity.ICustomNpc; -import noppes.npcs.api.jobs.IJobFollower; public class ScriptJobFollower extends ScriptJobInterface implements IJobFollower { private JobFollower job; diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptJobGuard.java b/src/main/java/noppes/npcs/scripted/roles/ScriptJobGuard.java index c428e0264..33cfbc426 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptJobGuard.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptJobGuard.java @@ -1,9 +1,9 @@ package noppes.npcs.scripted.roles; +import noppes.npcs.api.jobs.IJobGuard; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobGuard; import noppes.npcs.scripted.constants.JobType; -import noppes.npcs.api.jobs.IJobGuard; public class ScriptJobGuard extends ScriptJobInterface implements IJobGuard { private JobGuard job; diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptJobHealer.java b/src/main/java/noppes/npcs/scripted/roles/ScriptJobHealer.java index 6e392cd3d..23fffa75f 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptJobHealer.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptJobHealer.java @@ -1,10 +1,10 @@ package noppes.npcs.scripted.roles; +import noppes.npcs.api.entity.IEntityLivingBase; +import noppes.npcs.api.jobs.IJobHealer; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobHealer; import noppes.npcs.scripted.constants.JobType; -import noppes.npcs.api.entity.IEntityLivingBase; -import noppes.npcs.api.jobs.IJobHealer; public class ScriptJobHealer extends ScriptJobInterface implements IJobHealer { private JobHealer job; diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptJobInterface.java b/src/main/java/noppes/npcs/scripted/roles/ScriptJobInterface.java index c5bce4fe8..4377f88ce 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptJobInterface.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptJobInterface.java @@ -1,11 +1,11 @@ package noppes.npcs.scripted.roles; +import noppes.npcs.api.entity.ICustomNpc; +import noppes.npcs.api.jobs.IJob; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobInterface; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.constants.JobType; -import noppes.npcs.api.entity.ICustomNpc; -import noppes.npcs.api.jobs.IJob; public class ScriptJobInterface implements IJob { public final EntityNPCInterface npc; diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptJobItemGiver.java b/src/main/java/noppes/npcs/scripted/roles/ScriptJobItemGiver.java index 853804c1c..0e4972915 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptJobItemGiver.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptJobItemGiver.java @@ -1,16 +1,16 @@ package noppes.npcs.scripted.roles; import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.api.handler.data.IAvailability; +import noppes.npcs.api.item.IItemStack; +import noppes.npcs.api.jobs.IJobItemGiver; import noppes.npcs.controllers.data.Availability; import noppes.npcs.controllers.data.PlayerItemGiverData; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobItemGiver; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.constants.JobType; -import noppes.npcs.api.entity.IPlayer; -import noppes.npcs.api.handler.data.IAvailability; -import noppes.npcs.api.item.IItemStack; -import noppes.npcs.api.jobs.IJobItemGiver; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptJobPuppet.java b/src/main/java/noppes/npcs/scripted/roles/ScriptJobPuppet.java index 93a863abe..a30047f46 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptJobPuppet.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptJobPuppet.java @@ -2,9 +2,9 @@ package noppes.npcs.scripted.roles; import noppes.npcs.AnimationData; import noppes.npcs.api.handler.data.IModelPart; +import noppes.npcs.api.jobs.IJobPuppet; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.constants.JobType; -import noppes.npcs.api.jobs.IJobPuppet; public class ScriptJobPuppet extends ScriptJobInterface implements IJobPuppet { private AnimationData job; diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptJobSpawner.java b/src/main/java/noppes/npcs/scripted/roles/ScriptJobSpawner.java index 53f52f909..da7f49e9b 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptJobSpawner.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptJobSpawner.java @@ -1,23 +1,23 @@ package noppes.npcs.scripted.roles; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.roles.JobSpawner; -import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.constants.JobType; import noppes.npcs.api.INbt; import noppes.npcs.api.IPos; import noppes.npcs.api.IWorld; import noppes.npcs.api.entity.IEntityLivingBase; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.jobs.IJobSpawner; +import noppes.npcs.entity.EntityNPCInterface; +import noppes.npcs.roles.JobSpawner; +import noppes.npcs.scripted.NpcAPI; +import noppes.npcs.scripted.constants.JobType; + +import java.util.ArrayList; +import java.util.List; public class ScriptJobSpawner extends ScriptJobInterface implements IJobSpawner { private final JobSpawner job; diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptRoleBank.java b/src/main/java/noppes/npcs/scripted/roles/ScriptRoleBank.java index 35f579d6b..3cfabd529 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptRoleBank.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptRoleBank.java @@ -1,8 +1,8 @@ package noppes.npcs.scripted.roles; +import noppes.npcs.api.roles.IRoleBank; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.constants.RoleType; -import noppes.npcs.api.roles.IRoleBank; public class ScriptRoleBank extends ScriptRoleInterface implements IRoleBank { diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptRoleFollower.java b/src/main/java/noppes/npcs/scripted/roles/ScriptRoleFollower.java index 33777d14f..46f63a631 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptRoleFollower.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptRoleFollower.java @@ -1,12 +1,12 @@ package noppes.npcs.scripted.roles; import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.api.roles.IRoleFollower; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleFollower; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.constants.RoleType; -import noppes.npcs.api.entity.IPlayer; -import noppes.npcs.api.roles.IRoleFollower; public class ScriptRoleFollower extends ScriptRoleInterface implements IRoleFollower { private RoleFollower role; diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptRoleInterface.java b/src/main/java/noppes/npcs/scripted/roles/ScriptRoleInterface.java index 58ca574b4..de97c693c 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptRoleInterface.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptRoleInterface.java @@ -1,11 +1,11 @@ package noppes.npcs.scripted.roles; import net.minecraft.entity.INpc; +import noppes.npcs.api.roles.IRole; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleInterface; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.constants.RoleType; -import noppes.npcs.api.roles.IRole; public class ScriptRoleInterface implements IRole { public final EntityNPCInterface npc; diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptRoleMailman.java b/src/main/java/noppes/npcs/scripted/roles/ScriptRoleMailman.java index 7bb7da3c9..47693fd59 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptRoleMailman.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptRoleMailman.java @@ -1,8 +1,8 @@ package noppes.npcs.scripted.roles; +import noppes.npcs.api.roles.IRoleMailman; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.constants.RoleType; -import noppes.npcs.api.roles.IRoleMailman; public class ScriptRoleMailman extends ScriptRoleInterface implements IRoleMailman { diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptRoleTrader.java b/src/main/java/noppes/npcs/scripted/roles/ScriptRoleTrader.java index 488c865b1..1100a6c71 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptRoleTrader.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptRoleTrader.java @@ -1,13 +1,13 @@ package noppes.npcs.scripted.roles; import foxz.utils.Market; +import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.api.item.IItemStack; +import noppes.npcs.api.roles.IRoleTrader; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleTrader; import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.api.item.IItemStack; import noppes.npcs.scripted.constants.RoleType; -import noppes.npcs.api.entity.IPlayer; -import noppes.npcs.api.roles.IRoleTrader; public class ScriptRoleTrader extends ScriptRoleInterface implements IRoleTrader { private RoleTrader role; diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptRoleTransporter.java b/src/main/java/noppes/npcs/scripted/roles/ScriptRoleTransporter.java index e6353212c..fb06b3ef7 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptRoleTransporter.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptRoleTransporter.java @@ -1,12 +1,12 @@ package noppes.npcs.scripted.roles; import net.minecraft.entity.player.EntityPlayerMP; -import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.roles.RoleTransporter; -import noppes.npcs.scripted.constants.RoleType; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.handler.data.ITransportLocation; import noppes.npcs.api.roles.IRoleTransporter; +import noppes.npcs.entity.EntityNPCInterface; +import noppes.npcs.roles.RoleTransporter; +import noppes.npcs.scripted.constants.RoleType; public class ScriptRoleTransporter extends ScriptRoleInterface implements IRoleTransporter { private final RoleTransporter role; diff --git a/src/main/java/noppes/npcs/scripted/scoreboard/ScriptScoreboard.java b/src/main/java/noppes/npcs/scripted/scoreboard/ScriptScoreboard.java index 21633394f..9e3e82883 100644 --- a/src/main/java/noppes/npcs/scripted/scoreboard/ScriptScoreboard.java +++ b/src/main/java/noppes/npcs/scripted/scoreboard/ScriptScoreboard.java @@ -1,19 +1,15 @@ package noppes.npcs.scripted.scoreboard; -import java.util.ArrayList; -import java.util.List; - -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.scoreboard.*; import net.minecraft.server.MinecraftServer; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.scoreboard.IScoreboard; import noppes.npcs.api.scoreboard.IScoreboardObjective; import noppes.npcs.api.scoreboard.IScoreboardTeam; +import java.util.ArrayList; +import java.util.List; + /** * @author Karel */ diff --git a/src/main/java/noppes/npcs/scripted/scoreboard/ScriptScoreboardTeam.java b/src/main/java/noppes/npcs/scripted/scoreboard/ScriptScoreboardTeam.java index e1489c227..af04c86f2 100644 --- a/src/main/java/noppes/npcs/scripted/scoreboard/ScriptScoreboardTeam.java +++ b/src/main/java/noppes/npcs/scripted/scoreboard/ScriptScoreboardTeam.java @@ -1,14 +1,14 @@ package noppes.npcs.scripted.scoreboard; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.scoreboard.ScorePlayerTeam; import net.minecraft.scoreboard.Scoreboard; import net.minecraft.util.EnumChatFormatting; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.scoreboard.IScoreboardTeam; +import java.util.ArrayList; +import java.util.List; + public class ScriptScoreboardTeam implements IScoreboardTeam { private ScorePlayerTeam team; private Scoreboard board; diff --git a/src/main/java/noppes/npcs/util/GameProfileAlt.java b/src/main/java/noppes/npcs/util/GameProfileAlt.java index 5f236dd2b..40403a1ab 100644 --- a/src/main/java/noppes/npcs/util/GameProfileAlt.java +++ b/src/main/java/noppes/npcs/util/GameProfileAlt.java @@ -1,10 +1,9 @@ package noppes.npcs.util; -import java.util.UUID; - +import com.mojang.authlib.GameProfile; import noppes.npcs.entity.EntityNPCInterface; -import com.mojang.authlib.GameProfile; +import java.util.UUID; public class GameProfileAlt extends GameProfile{ private static final UUID id = UUID.randomUUID(); diff --git a/src/main/java/noppes/npcs/util/IProjectileCallback.java b/src/main/java/noppes/npcs/util/IProjectileCallback.java index 0730ce2e2..1a1b4e02f 100644 --- a/src/main/java/noppes/npcs/util/IProjectileCallback.java +++ b/src/main/java/noppes/npcs/util/IProjectileCallback.java @@ -2,7 +2,6 @@ package noppes.npcs.util; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; -import net.minecraft.util.MovingObjectPosition; import noppes.npcs.entity.EntityProjectile; public interface IProjectileCallback { diff --git a/src/main/java/noppes/npcs/util/NBTJsonUtil.java b/src/main/java/noppes/npcs/util/NBTJsonUtil.java index d44a23d48..d7176cf9d 100644 --- a/src/main/java/noppes/npcs/util/NBTJsonUtil.java +++ b/src/main/java/noppes/npcs/util/NBTJsonUtil.java @@ -1,33 +1,17 @@ package noppes.npcs.util; +import com.google.common.io.Files; +import cpw.mods.fml.common.ObfuscationReflectionHelper; +import net.minecraft.nbt.*; +import org.apache.commons.io.Charsets; + import java.io.File; import java.io.FileOutputStream; -import java.io.FileReader; import java.io.IOException; import java.io.OutputStreamWriter; import java.util.ArrayList; import java.util.List; -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.NoppesStringUtils; - -import org.apache.commons.io.Charsets; - -import com.google.common.io.Files; - -import cpw.mods.fml.common.ObfuscationReflectionHelper; - public class NBTJsonUtil { public static String Convert(NBTTagCompound compound){ List list = new ArrayList(); diff --git a/src/main/java/noppes/npcs/util/Vec3NPC.java b/src/main/java/noppes/npcs/util/Vec3NPC.java index 6c5705e75..45b96e3ca 100644 --- a/src/main/java/noppes/npcs/util/Vec3NPC.java +++ b/src/main/java/noppes/npcs/util/Vec3NPC.java @@ -1,6 +1,5 @@ package noppes.npcs.util; -import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; public class Vec3NPC extends Vec3