Fixing customChest bug and changing version to 1.0.4_beta

marcel0ll · Dec 5, 2014 · 61c362a · 61c362a
1 parent 7096fbb
commit 61c362a
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 28 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "1.0_beta_4-1.7.10"
+version = "1.0.4_beta_1.7.10"
 group= "com.Otho.customItems" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "customItems"
 

diff --git a/src/main/java/com/Otho/customItems/mod/containers/CustomChestContainer.java b/src/main/java/com/Otho/customItems/mod/containers/CustomChestContainer.java
@@ -63,36 +63,58 @@ protected void bindPlayerInventory(InventoryPlayer inventoryPlayer) {
 	 }
 
 	 @Override
-	 public ItemStack transferStackInSlot(EntityPlayer player, int i) 
+	 public ItemStack transferStackInSlot(EntityPlayer player, int slot) 
 	 {
+		 //TODO: FIX THIS THING
 	 	ItemStack itemstack = null;
-        Slot slot = (Slot) inventorySlots.get(i);
+        Slot slotObj = (Slot) inventorySlots.get(slot);
         int invSize = tileEntity.getSizeInventory();
         int maxStackSize = tileEntity.getInventoryStackLimit();
 
-        if (slot != null && slot.getHasStack())
+        if (slotObj != null && slotObj.getHasStack())
         {
-            ItemStack itemstack1 = slot.getStack();
+            ItemStack itemstack1 = slotObj.getStack();
             itemstack = itemstack1.copy();
-            if (i < invSize)
+
+            //From chest to player
+            if (slot < invSize)
             {
                 if (!mergeItemStack(itemstack1, invSize, inventorySlots.size(), true))
                 {
+                	if (itemstack1.stackSize == 0)
+                    {
+                    	slotObj.putStack(null);            	
+                    }
+                    else
+                    {
+                    	slotObj.onSlotChanged();
+                    }
+
                     return null;
                 }
-            }	            
+            }
+            //From player to chest
             else if (!mergeItemStack(itemstack1, 0, invSize, false))
             {
+            	if (itemstack1.stackSize == 0)
+                {
+                	slotObj.putStack(null);            	
+                }
+                else
+                {
+                	slotObj.onSlotChanged();
+                }
+
                 return null;
             }
+
             if (itemstack1.stackSize == 0)
             {
-                slot.putStack(null);
-            	//mergeItemStack(itemstack1, size, inventorySlots.size(), true);
+            	slotObj.putStack(null);            	
             }
             else
             {
-                slot.onSlotChanged();
+            	slotObj.onSlotChanged();
             }
         }
         return itemstack;
@@ -141,26 +163,27 @@ else if (itemstack1.stackSize < incomingStack.getMaxStackSize())
 		                    }
 	                	}else
 	                	{
-                		 	int l = itemstack1.stackSize + incomingStack.stackSize;
-
-		                    if (l <= incomingStack.getMaxStackSize() && l <= tileEntity.getInventoryStackLimit())
-		                    {
-		                        incomingStack.stackSize = 0;
-		                        itemstack1.stackSize = l;
+                		 	int sum = itemstack1.stackSize + incomingStack.stackSize;
+                		 	int maxInInvSlot = tileEntity.getInventoryStackLimit();
+                		 	int maxStackSize = itemstack1.getMaxStackSize();
+                		 	int incoming = incomingStack.stackSize;
+                		 	int actual = itemstack1.stackSize;
+
+                		 	int cabe = Math.min((maxInInvSlot - actual), (maxStackSize - actual));
+
+                		 	if(incoming <= cabe){
+                		 		//soma
+                		 		incomingStack.stackSize = 0;
+		                        itemstack1.stackSize += incoming;
 		                        slot.onSlotChanged();
 		                        flag1 = true;
-		                    }
-		                    else if (itemstack1.stackSize < tileEntity.getInventoryStackLimit())
-		                    {
-		                        incomingStack.stackSize -= tileEntity.getInventoryStackLimit() - itemstack1.stackSize;
-		                        itemstack1.stackSize = tileEntity.getInventoryStackLimit();
+                		 	}else{
+                		 		incomingStack.stackSize -= cabe;
+		                        itemstack1.stackSize += cabe;
 		                        slot.onSlotChanged();
 		                        flag1 = false;
-		                    }else
-		                    {
-		                    	flag1 = false;
-		                    	break;
-		                    }
+
+                		 	}          		 	
 	                	}
 	                }
 

diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
@@ -2,8 +2,8 @@
     {
       "modid": "customitems",
       "name": "Custom Items",
-      "description": "A simple way to add your stuff to minecraft.",
-      "version": "1.0.4beta",
+      "description": "A simple way to add your custom stuff to minecraft.",
+      "version": "1.0.4 beta",
       "mcversion": "1.7.10",
       "url": "https://github.com/0tho/CustomItems",
       "updateUrl": "",