diff options
| author | huajijam <strhuaji@gmail.com> | 2019-01-31 19:32:46 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-31 19:32:46 +0800 |
| commit | 3b3a7738b615d2a307f80bfe079f6d56d48b6521 (patch) | |
| tree | e2e7ead0e42e458adde896c090e558bb4e250c43 /src/Java/gtPlusPlus/core/util | |
| parent | 9ed780d285420a4e4a1c4c291e49da9c894f1d31 (diff) | |
| parent | d015262242110df899f6ffe7a9f84780382e8584 (diff) | |
| download | GT5-Unofficial-3b3a7738b615d2a307f80bfe079f6d56d48b6521.tar.gz GT5-Unofficial-3b3a7738b615d2a307f80bfe079f6d56d48b6521.tar.bz2 GT5-Unofficial-3b3a7738b615d2a307f80bfe079f6d56d48b6521.zip | |
update
update
Diffstat (limited to 'src/Java/gtPlusPlus/core/util')
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java index 486cda42f9..a5cf9527a9 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java @@ -936,11 +936,22 @@ public class ItemUtils { for (int o = 0; o < aInputInventory.getSizeInventory(); o++) { p[o] = aInputInventory.getStackInSlot(o); } - ItemStack[] g = organiseInventory(p); - IInventory aTemp = aInputInventory; + //ItemStack[] g = organiseInventory(p); + + IInventory aTemp = aInputInventory; + for (int i = 0; i < p.length; ++i) { + for (int j = i + 1; j < p.length; ++j) { + if (p[j] != null && (p[i] == null + || GT_Utility.areStacksEqual(p[i], p[j]))) { + GT_Utility.moveStackFromSlotAToSlotB(aTemp, aTemp, j, i, (byte) 64, (byte) 1, (byte) 64, (byte) 1); + } + } + } + + /* for (int o = 0; o < aInputInventory.getSizeInventory(); o++) { aTemp.setInventorySlotContents(o, g[o]); - } + }*/ return aTemp; } |