summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2014-11-03 22:38:50 +0000
committerDaniel Silverstone <dsilvers@digital-scurf.org>2014-11-03 22:38:50 +0000
commitfb25d8d1331a4e1ef3be2338508823b95d84f598 (patch)
tree8164a4f545f80ff19e196ea0c4caa5b29181d3c0
parent1fd988e1a80b30e61c385e9375d574413d1750a5 (diff)
downloadnoctis-fb25d8d1331a4e1ef3be2338508823b95d84f598.tar.bz2
Optimise imports
-rw-r--r--src/main/java/net/flarn/noctis/commands/CommandTimeFixed.java3
-rw-r--r--src/main/java/net/flarn/noctis/handler/PlayerHandler.java9
-rw-r--r--src/main/java/net/flarn/noctis/init/Recipes.java2
-rw-r--r--src/main/java/net/flarn/noctis/item/ItemCatalyst.java3
-rw-r--r--src/main/java/net/flarn/noctis/item/ItemGlassSword.java3
-rw-r--r--src/main/java/net/flarn/noctis/item/ItemJournal.java7
-rw-r--r--src/main/java/net/flarn/noctis/item/ItemNoctisBase.java1
-rw-r--r--src/main/java/net/flarn/noctis/journal/JournalEntry.java7
-rw-r--r--src/main/java/net/flarn/noctis/journal/JournalParser.java1
-rw-r--r--src/main/java/net/flarn/noctis/journal/gui/JournalGui.java5
-rw-r--r--src/main/java/net/flarn/noctis/knowledge/KnowledgeBase.java4
-rw-r--r--src/main/java/net/flarn/noctis/knowledge/KnowledgeItem.java6
-rw-r--r--src/main/java/net/flarn/noctis/network/KnowledgeBaseTransfer.java1
-rw-r--r--src/main/java/net/flarn/noctis/network/PacketRegistry.java1
-rw-r--r--src/main/java/net/flarn/noctis/recipes/CatalysedRecipe.java4
-rw-r--r--src/main/java/net/flarn/noctis/utils/CatalystType.java2
-rw-r--r--src/main/java/net/flarn/noctis/utils/NBTHelper.java1
17 files changed, 7 insertions, 53 deletions
diff --git a/src/main/java/net/flarn/noctis/commands/CommandTimeFixed.java b/src/main/java/net/flarn/noctis/commands/CommandTimeFixed.java
index da99506..90a1dd7 100644
--- a/src/main/java/net/flarn/noctis/commands/CommandTimeFixed.java
+++ b/src/main/java/net/flarn/noctis/commands/CommandTimeFixed.java
@@ -1,10 +1,7 @@
package net.flarn.noctis.commands;
-import cpw.mods.fml.common.FMLCommonHandler;
import net.flarn.noctis.refs.Numbers;
-import net.flarn.noctis.utils.LogHelper;
-import net.minecraft.command.CommandHandler;
import net.minecraft.command.CommandTime;
import net.minecraft.command.ICommandSender;
import net.minecraft.server.MinecraftServer;
diff --git a/src/main/java/net/flarn/noctis/handler/PlayerHandler.java b/src/main/java/net/flarn/noctis/handler/PlayerHandler.java
index 556d6be..26f39c6 100644
--- a/src/main/java/net/flarn/noctis/handler/PlayerHandler.java
+++ b/src/main/java/net/flarn/noctis/handler/PlayerHandler.java
@@ -3,19 +3,10 @@ package net.flarn.noctis.handler;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import net.flarn.noctis.knowledge.InternalKnowledgeTree;
import net.flarn.noctis.knowledge.KnowledgeBase;
import net.flarn.noctis.knowledge.KnowledgeItem;
-import net.flarn.noctis.network.KnowledgeBaseTransfer;
-import net.flarn.noctis.network.PacketRegistry;
import net.flarn.noctis.utils.KnowledgeHelper;
-import net.flarn.noctis.utils.LogHelper;
-import net.minecraft.entity.player.EntityPlayerMP;
-import sun.rmi.log.LogHandler;
-
-import java.util.UUID;
public class PlayerHandler {
diff --git a/src/main/java/net/flarn/noctis/init/Recipes.java b/src/main/java/net/flarn/noctis/init/Recipes.java
index 744405f..736c8eb 100644
--- a/src/main/java/net/flarn/noctis/init/Recipes.java
+++ b/src/main/java/net/flarn/noctis/init/Recipes.java
@@ -6,14 +6,12 @@ import net.flarn.noctis.item.ItemCatalyst;
import net.flarn.noctis.knowledge.KnowledgeItem;
import net.flarn.noctis.recipes.CatalysedRecipe;
import net.flarn.noctis.refs.Names;
-import net.flarn.noctis.refs.Numbers;
import net.flarn.noctis.utils.CatalystType;
import net.flarn.noctis.utils.SkyAccess;
import net.flarn.noctis.utils.Times;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.IRecipe;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
diff --git a/src/main/java/net/flarn/noctis/item/ItemCatalyst.java b/src/main/java/net/flarn/noctis/item/ItemCatalyst.java
index e823a97..8a92903 100644
--- a/src/main/java/net/flarn/noctis/item/ItemCatalyst.java
+++ b/src/main/java/net/flarn/noctis/item/ItemCatalyst.java
@@ -7,8 +7,6 @@ import net.flarn.noctis.init.ModItems;
import net.flarn.noctis.knowledge.KnowledgeBase;
import net.flarn.noctis.knowledge.KnowledgeItem;
import net.flarn.noctis.knowledge.KnowledgeVisibility;
-import net.flarn.noctis.network.KnowledgeBaseTransfer;
-import net.flarn.noctis.network.PacketRegistry;
import net.flarn.noctis.recipes.CatalysedRecipe;
import net.flarn.noctis.refs.*;
import net.flarn.noctis.utils.*;
@@ -16,7 +14,6 @@ import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.AxisAlignedBB;
diff --git a/src/main/java/net/flarn/noctis/item/ItemGlassSword.java b/src/main/java/net/flarn/noctis/item/ItemGlassSword.java
index 5b2fa93..f504dd2 100644
--- a/src/main/java/net/flarn/noctis/item/ItemGlassSword.java
+++ b/src/main/java/net/flarn/noctis/item/ItemGlassSword.java
@@ -3,10 +3,7 @@ package net.flarn.noctis.item;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.flarn.noctis.refs.Names;
-import net.flarn.noctis.utils.LogHelper;
-import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
public class ItemGlassSword extends ItemNoctisBase {
diff --git a/src/main/java/net/flarn/noctis/item/ItemJournal.java b/src/main/java/net/flarn/noctis/item/ItemJournal.java
index 1e5c79d..e7ee1e7 100644
--- a/src/main/java/net/flarn/noctis/item/ItemJournal.java
+++ b/src/main/java/net/flarn/noctis/item/ItemJournal.java
@@ -1,21 +1,14 @@
package net.flarn.noctis.item;
-import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.flarn.noctis.Noctis;
-import net.flarn.noctis.journal.JournalContentModel;
-import net.flarn.noctis.journal.gui.JournalGui;
-import net.flarn.noctis.knowledge.KnowledgeBase;
import net.flarn.noctis.refs.GuiIds;
import net.flarn.noctis.refs.Names;
import net.flarn.noctis.refs.Strings;
-import net.flarn.noctis.utils.PlayerHelper;
-import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
diff --git a/src/main/java/net/flarn/noctis/item/ItemNoctisBase.java b/src/main/java/net/flarn/noctis/item/ItemNoctisBase.java
index e0d5cc5..e59a687 100644
--- a/src/main/java/net/flarn/noctis/item/ItemNoctisBase.java
+++ b/src/main/java/net/flarn/noctis/item/ItemNoctisBase.java
@@ -4,7 +4,6 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.flarn.noctis.creative.CreativeTabNoctis;
import net.flarn.noctis.refs.Textures;
-import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
diff --git a/src/main/java/net/flarn/noctis/journal/JournalEntry.java b/src/main/java/net/flarn/noctis/journal/JournalEntry.java
index b789828..8557fd0 100644
--- a/src/main/java/net/flarn/noctis/journal/JournalEntry.java
+++ b/src/main/java/net/flarn/noctis/journal/JournalEntry.java
@@ -3,13 +3,14 @@ package net.flarn.noctis.journal;
import net.flarn.noctis.knowledge.KnowledgeItem;
import net.flarn.noctis.recipes.CatalysedRecipe;
-import net.flarn.noctis.utils.LogHelper;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.IRecipe;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
public class JournalEntry {
public final KnowledgeItem knowledgeItem;
diff --git a/src/main/java/net/flarn/noctis/journal/JournalParser.java b/src/main/java/net/flarn/noctis/journal/JournalParser.java
index 7030a5b..3e1b372 100644
--- a/src/main/java/net/flarn/noctis/journal/JournalParser.java
+++ b/src/main/java/net/flarn/noctis/journal/JournalParser.java
@@ -11,7 +11,6 @@ import org.yaml.snakeyaml.constructor.SafeConstructor;
import org.yaml.snakeyaml.scanner.ScannerException;
import java.io.IOException;
-import java.util.List;
import java.util.Map;
public class JournalParser {
diff --git a/src/main/java/net/flarn/noctis/journal/gui/JournalGui.java b/src/main/java/net/flarn/noctis/journal/gui/JournalGui.java
index efc7f66..71e7504 100644
--- a/src/main/java/net/flarn/noctis/journal/gui/JournalGui.java
+++ b/src/main/java/net/flarn/noctis/journal/gui/JournalGui.java
@@ -4,20 +4,15 @@ package net.flarn.noctis.journal.gui;
import net.flarn.noctis.journal.JournalContentModel;
import net.flarn.noctis.journal.JournalDayEntry;
import net.flarn.noctis.journal.JournalEntry;
-import net.flarn.noctis.knowledge.KnowledgeVisibility;
import net.flarn.noctis.refs.Textures;
-import net.flarn.noctis.utils.TimeHelper;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.GuiScreenBook;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import java.util.ListIterator;
public class JournalGui extends GuiScreen {
private JournalContentModel contentModel;
diff --git a/src/main/java/net/flarn/noctis/knowledge/KnowledgeBase.java b/src/main/java/net/flarn/noctis/knowledge/KnowledgeBase.java
index b896943..a36518c 100644
--- a/src/main/java/net/flarn/noctis/knowledge/KnowledgeBase.java
+++ b/src/main/java/net/flarn/noctis/knowledge/KnowledgeBase.java
@@ -1,8 +1,6 @@
package net.flarn.noctis.knowledge;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.server.FMLServerHandler;
import net.flarn.noctis.refs.Tags;
import net.flarn.noctis.utils.LogHelper;
import net.minecraft.nbt.NBTTagCompound;
@@ -12,8 +10,6 @@ import net.minecraft.world.WorldSavedData;
import java.util.*;
-import static java.util.Collections.sort;
-
public class KnowledgeBase extends WorldSavedData {
public class KnowledgeEvent implements Comparable<KnowledgeEvent> {
public final String name;
diff --git a/src/main/java/net/flarn/noctis/knowledge/KnowledgeItem.java b/src/main/java/net/flarn/noctis/knowledge/KnowledgeItem.java
index 4fb89da..e8e71dd 100644
--- a/src/main/java/net/flarn/noctis/knowledge/KnowledgeItem.java
+++ b/src/main/java/net/flarn/noctis/knowledge/KnowledgeItem.java
@@ -1,13 +1,7 @@
package net.flarn.noctis.knowledge;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.flarn.noctis.network.KnowledgeBaseTransfer;
-import net.flarn.noctis.network.PacketRegistry;
import net.flarn.noctis.utils.LogHelper;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
import java.util.HashMap;
import java.util.HashSet;
diff --git a/src/main/java/net/flarn/noctis/network/KnowledgeBaseTransfer.java b/src/main/java/net/flarn/noctis/network/KnowledgeBaseTransfer.java
index 03a86b8..46b170e 100644
--- a/src/main/java/net/flarn/noctis/network/KnowledgeBaseTransfer.java
+++ b/src/main/java/net/flarn/noctis/network/KnowledgeBaseTransfer.java
@@ -13,7 +13,6 @@ import net.flarn.noctis.refs.Tags;
import net.flarn.noctis.utils.LogHelper;
import net.flarn.noctis.utils.PlayerHelper;
import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.util.Constants;
public class KnowledgeBaseTransfer implements IMessage {
diff --git a/src/main/java/net/flarn/noctis/network/PacketRegistry.java b/src/main/java/net/flarn/noctis/network/PacketRegistry.java
index c39d14e..bbbfec9 100644
--- a/src/main/java/net/flarn/noctis/network/PacketRegistry.java
+++ b/src/main/java/net/flarn/noctis/network/PacketRegistry.java
@@ -3,7 +3,6 @@ package net.flarn.noctis.network;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import cpw.mods.fml.relauncher.Side;
-import net.flarn.noctis.refs.Names;
import net.flarn.noctis.refs.Refs;
public class PacketRegistry {
diff --git a/src/main/java/net/flarn/noctis/recipes/CatalysedRecipe.java b/src/main/java/net/flarn/noctis/recipes/CatalysedRecipe.java
index f130058..69d6905 100644
--- a/src/main/java/net/flarn/noctis/recipes/CatalysedRecipe.java
+++ b/src/main/java/net/flarn/noctis/recipes/CatalysedRecipe.java
@@ -3,7 +3,9 @@ package net.flarn.noctis.recipes;
import net.flarn.noctis.knowledge.KnowledgeBase;
import net.flarn.noctis.knowledge.KnowledgeItem;
import net.flarn.noctis.knowledge.KnowledgeVisibility;
-import net.flarn.noctis.utils.*;
+import net.flarn.noctis.utils.CatalystType;
+import net.flarn.noctis.utils.SkyAccess;
+import net.flarn.noctis.utils.Times;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack;
diff --git a/src/main/java/net/flarn/noctis/utils/CatalystType.java b/src/main/java/net/flarn/noctis/utils/CatalystType.java
index efac7ed..314bb3c 100644
--- a/src/main/java/net/flarn/noctis/utils/CatalystType.java
+++ b/src/main/java/net/flarn/noctis/utils/CatalystType.java
@@ -1,7 +1,5 @@
package net.flarn.noctis.utils;
-import net.flarn.noctis.item.ItemCatalyst;
-
/**
* Created by dsilvers on 22/10/14.
*/
diff --git a/src/main/java/net/flarn/noctis/utils/NBTHelper.java b/src/main/java/net/flarn/noctis/utils/NBTHelper.java
index ed5217f..56981e2 100644
--- a/src/main/java/net/flarn/noctis/utils/NBTHelper.java
+++ b/src/main/java/net/flarn/noctis/utils/NBTHelper.java
@@ -1,6 +1,5 @@
package net.flarn.noctis.utils;
-import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;