Removed /sd grab functionality, moved to ItemSorter

Kyzderp · May 3, 2015 · db9e0d7 · db9e0d7
1 parent 5051ab5
commit db9e0d7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/ant/build_examplemod.xml b/ant/build_examplemod.xml
@@ -17,7 +17,7 @@
 
 	<!-- The version of your mod, can be any string as long as it's valid as part of a file name -->
 	<!-- and should match the version string returned by your mod.                               -->
-	<property name="version"        value="1.1.11" />
+	<property name="version"        value="1.1.12" />
 
 	<!-- The Minecraft version the mod is for, appended to the output file name for reference -->
 	<property name="mcversion"      value="1.7.2" />

diff --git a/ant/buildnumber.txt b/ant/buildnumber.txt
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Fri May 01 22:08:27 PDT 2015
-build.number=53
+#Sun May 03 03:34:37 PDT 2015
+build.number=54
diff --git a/java/com/kyzeragon/staffderpsmod/LiteModStaffDerps.java b/java/com/kyzeragon/staffderpsmod/LiteModStaffDerps.java
@@ -50,7 +50,7 @@ public class LiteModStaffDerps implements Tickable, ChatFilter, OutboundChatList
 	private SeeInvisible invis;
 	private PetOwner owner;
 	private LBFilter lbfilter;
-	private ChestSorter chestSorter;
+//	private ChestSorter chestSorter;
 
 	private boolean showOwner;
 	private boolean sentCmd;
@@ -65,7 +65,7 @@ public LiteModStaffDerps() {}
 	public String getName() { return "Staff Derps"; }
 
 	@Override
-	public String getVersion() { return "1.1.11"; }
+	public String getVersion() { return "1.1.12"; }
 
 	@Override
 	public void init(File configPath)
@@ -78,8 +78,8 @@ public void init(File configPath)
 
 		this.showOwner = false;
 		this.sentCmd = false;
-		this.chestSorter = new ChestSorter();
-		this.grabCooldown = 5;
+//		this.chestSorter = new ChestSorter();
+//		this.grabCooldown = 5;
 
 		leftBinding = new KeyBinding("key.compass.left", -97, "key.categories.litemods");
 		rightBinding = new KeyBinding("key.compass.right", -96, "key.categories.litemods");
@@ -94,7 +94,7 @@ public void upgradeSettings(String version, File configPath, File oldConfigPath)
 	@Override
 	public void onTick(Minecraft minecraft, float partialTicks, boolean inGame, boolean clock)
 	{
-		if (inGame && minecraft.thePlayer.openContainer != null
+/*		if (inGame && minecraft.thePlayer.openContainer != null
 				&& !minecraft.thePlayer.openContainer.equals(minecraft.thePlayer.inventoryContainer))
 		{
 			if (this.grabCooldown < 5)
@@ -109,7 +109,7 @@ else if (Keyboard.isKeyDown(Keyboard.KEY_F1) && this.grabCooldown == 5)
 				this.chestSorter.dumpInventory(minecraft.thePlayer.openContainer);
 				this.grabCooldown = 0;
 			}
-		}
+		}*/
 
 		if (inGame && minecraft.currentScreen == null && Minecraft.isGuiEnabled())
 		{			
@@ -157,7 +157,8 @@ public void onSendChatMessage(C01PacketChatMessage packet, String message)
 			}
 			else if (tokens[1].equalsIgnoreCase("grab"))
 			{
-				this.chestSorter.handleCommand(message);
+				this.logError("The /sd grab command is in ItemSorter mod now. Use /grab instead");
+//				this.chestSorter.handleCommand(message);
 			}
 			else if (tokens[1].equalsIgnoreCase("invis") || tokens[1].equalsIgnoreCase("invisible"))
 			{