v1.4.2 hotfix

DRKV333 · Nov 30, 2017 · c852d4a · c852d4a
1 parent 1762b22
commit c852d4a
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 5 deletions.
diff --git a/Tiles/TransferAssemblerTile.cs b/Tiles/TransferAssemblerTile.cs
@@ -13,6 +13,7 @@ namespace MechTransfer.Tiles
     public class TransferAssemblerTile : ModTile
     {
         private ItemInventory inventory = new ItemInventory();
+        private Item stockpile = new Item();
 
         private Dictionary<int, int[]> tileRemap = new Dictionary<int, int[]>() {
             { 302,  new int[]{ 17 } },
@@ -67,6 +68,18 @@ public override void HitWire(int i, int j)
 
         private bool TryMakeRecipe(Recipe recipe, TransferAssemblerTileEntity entity)
         {
+
+            while (stockpile.stack > 0)
+            {
+                Item safeCLone = stockpile.Clone();
+                safeCLone.stack = 1;
+                if(!TransferUtils.InjectItem(entity.Position.X, entity.Position.Y, safeCLone))
+                {
+                    return true;
+                }
+                stockpile.stack--;
+            }
+
             for (int i = 0; i < Recipe.maxRequirements && !recipe.requiredItem[i].IsAir; i++)
             {
                 if (!inventory.TryTakeIngredient(recipe, recipe.requiredItem[i]))
@@ -93,10 +106,27 @@ private bool TryMakeRecipe(Recipe recipe, TransferAssemblerTileEntity entity)
                 ItemLoader.OnCraft(clone, recipe);
             }
 
-            if (!TransferUtils.InjectItem(entity.Position.X, entity.Position.Y, clone))
+            if (clone.stack == 1)
+            {
+                if (!TransferUtils.InjectItem(entity.Position.X, entity.Position.Y, clone))
+                {
+                    entity.Status = TransferAssemblerTileEntity.StatusKind.MissingSpace;
+                    return true; //returning with success, so we don't try alternate recipes
+                }
+            }
+            else
             {
-                entity.Status = TransferAssemblerTileEntity.StatusKind.MissingSpace;
-                return true; //returning with success, so we don't try alternate recipes
+                stockpile = clone;
+                while (stockpile.stack > 0)
+                {
+                    Item safeCLone = stockpile.Clone();
+                    safeCLone.stack = 1;
+                    if (!TransferUtils.InjectItem(entity.Position.X, entity.Position.Y, safeCLone))
+                    {
+                        break;
+                    }
+                    stockpile.stack--;
+                }
             }
 
             inventory.Commit(alchemy);

diff --git a/build.txt b/build.txt
@@ -1,5 +1,5 @@
 author = DRKV
-version = 1.4.1
+version = 1.4.2
 displayName = MechTransfer
 includePDB = false
 buildIgnore = .gitignore, description.txt, *.csproj*, *.sln, .git/*, .vs/*, bin/*, obj/*, *.xcf

diff --git a/description.txt b/description.txt
@@ -42,4 +42,7 @@ v1.4
 - Added reflection based adapter loading
 
 v1.4.1
-- Fixed modded chest support
+- Fixed modded chest support
+
+v1.4.2
+- Quick fix to stop assembler from eating items