v2.1

.gitignore

@@ -1,10 +1,10 @@
 # eclipse
+bin
 *.launch
-/.settings
-/.metadata
-/.classpath
-/.project
-/eclipse
+.settings
+.metadata
+.classpath
+.project
 
 # idea
 out
@@ -18,9 +18,14 @@ build
 .gradle
 
 # other
-/bin
+eclipse
+run
+saves
+screenshots
 logs
+config
 crash-reports
+world
 whitelist.json
 usercache.json
 usernamecache.json
@@ -34,4 +39,4 @@ CREDITS-fml.txt
 forge-*changelog.txt
 LICENSE-fml.txt
 MinecraftForge-*.txt
-README.txt
+README.txt

build.gradle

@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "1.7.10-2.0"
+version = "1.7.10-2.1"
 group= "furgl.autoPickup" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "AutoPickup"
 

eula.txt

@@ -0,0 +1,3 @@
+#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula).
+#Thu Sep 01 14:04:53 CDT 2016
+eula=true

src/main/java/furgl/autoPickup/AutoPickup.java

@@ -1,11 +1,9 @@
 package furgl.autoPickup;
 
-import org.lwjgl.input.Keyboard;
-
-import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
+import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
@@ -17,7 +15,6 @@
 import furgl.autoPickup.event.EntityJoinWorldEvents;
 import furgl.autoPickup.event.ItemTossEvents;
 import furgl.autoPickup.event.PlaySoundAtEntityEvents;
-import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.MinecraftForge;
@@ -27,10 +24,11 @@ public class AutoPickup
 {
 	public static final String MODID = "autopickup";
 	public static final String MODNAME = "AutoPickup";
-	public static final String VERSION = "2.0";
+	public static final String VERSION = "2.1";
 
 	public static SimpleNetworkWrapper network;
-	public static KeyBinding ignoreBlacklist = new KeyBinding("Ignore Blacklist", Keyboard.KEY_LMENU, "Auto Pickup");
+	@SidedProxy(clientSide = "furgl.autoPickup.ClientProxy", serverSide = "furgl.autoPickup.CommonProxy")
+	public static CommonProxy proxy;	
 
 	@EventHandler
 	public void preInit(FMLPreInitializationEvent event)
@@ -44,7 +42,7 @@ public void preInit(FMLPreInitializationEvent event)
 	@EventHandler
 	public void init(FMLInitializationEvent event)
 	{
-		ClientRegistry.registerKeyBinding(ignoreBlacklist);
+		AutoPickup.proxy.init();
 	}
 
 

src/main/java/furgl/autoPickup/ClientProxy.java

@@ -0,0 +1,16 @@
+package furgl.autoPickup;
+
+import org.lwjgl.input.Keyboard;
+
+import cpw.mods.fml.client.registry.ClientRegistry;
+import net.minecraft.client.settings.KeyBinding;
+
+public class ClientProxy extends CommonProxy
+{
+	public KeyBinding ignoreBlacklist = new KeyBinding("Ignore Blacklist", Keyboard.KEY_LMENU, "Auto Pickup");
+
+	public void init()
+	{
+		ClientRegistry.registerKeyBinding(ignoreBlacklist);
+	}
+}

src/main/java/furgl/autoPickup/CommandBlacklist.java

@@ -51,11 +51,11 @@ private static Collection convertToDisplayNames(Set set)
 		{
 			try 
 			{
-				Item item = getItemByText(null, (String) iterator.next());
+				Item item = getItemByText(null, (String) iterator.next());/*
 				ArrayList<ItemStack> subItems = new ArrayList<ItemStack>();
 				item.getSubItems(item, item.getCreativeTab(), subItems);
-				for (ItemStack stack : subItems)
-					displayNames.add((String) item.getItemStackDisplayName(stack).replace(" ", "_"));
+				for (ItemStack stack : subItems)*/
+					displayNames.add((String) item.getItemStackDisplayName(new ItemStack(item)).replace(" ", "_"));
 			} 
 			catch (Exception e) 
 			{

src/main/java/furgl/autoPickup/CommonProxy.java

@@ -0,0 +1,9 @@
+package furgl.autoPickup;
+
+public class CommonProxy 
+{
+	public void init()
+	{
+
+	}
+}

src/main/java/furgl/autoPickup/IgnoreKey.java

@@ -21,9 +21,9 @@ public void playerTick(PlayerTickEvent event)
 	{
 		if (event.side == Side.CLIENT && event.phase == Phase.START)
 		{
-			if ((AutoPickup.ignoreBlacklist.isPressed() || AutoPickup.ignoreBlacklist.getIsKeyPressed()) != isPressed)
+			if ((((ClientProxy)AutoPickup.proxy).ignoreBlacklist.isPressed() || ((ClientProxy)AutoPickup.proxy).ignoreBlacklist.getIsKeyPressed()) != isPressed)
 			{
-				isPressed = AutoPickup.ignoreBlacklist.isPressed() || AutoPickup.ignoreBlacklist.getIsKeyPressed();
+				isPressed = ((ClientProxy)AutoPickup.proxy).ignoreBlacklist.isPressed() || ((ClientProxy)AutoPickup.proxy).ignoreBlacklist.getIsKeyPressed();
 				AutoPickup.network.sendToServer(new PacketIgnoreKey(isPressed));
 			}
 		}

src/main/resources/mcmod.info

@@ -3,7 +3,7 @@
   "modid": "autopickup",
   "name": "AutoPickup",
   "description": "Allows items to be picked up automatically or blacklisted and never picked up.",
-  "version": "2.0",
+  "version": "2.1",
   "mcversion": "1.7.10",
   "url": "https://sites.google.com/site/furglsmods/auto-pickup",
   "updateUrl": "",