Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

src/main/resources/assets/opencomputers/loot/OpenOS/bin/edit.lua

@@ -445,6 +445,17 @@ local keyBindHandlers = {
   save = function()
     if readonly then return end
     local new = not fs.exists(filename)
+    local backup
+    if not new then
+      backup = filename .. "~"
+      for i = 1, math.huge do
+        if not fs.exists(backup) then
+          break
+        end
+        backup = filename .. "~" .. i
+      end
+      fs.copy(filename, backup)
+    end
     local f, reason = io.open(filename, "w")
     if f then
       local chars, firstLine = 0, true
@@ -467,6 +478,9 @@ local keyBindHandlers = {
     else
       setStatus(reason)
     end
+    if not new then
+      fs.remove(backup)
+    end
   end,
   close = function()
     -- TODO ask to save if changed

src/main/scala/li/cil/oc/common/container/Player.scala

@@ -12,10 +12,10 @@ import scala.collection.convert.WrapAsScala._
 
 abstract class Player(val playerInventory: InventoryPlayer, val otherInventory: IInventory) extends Container {
   /** Number of player inventory slots to display horizontally. */
-  protected val playerInventorySizeX = InventoryPlayer.getHotbarSize
+  protected val playerInventorySizeX = math.min(9, InventoryPlayer.getHotbarSize)
 
   /** Subtract four for armor slots. */
-  protected val playerInventorySizeY = (playerInventory.getSizeInventory - 4) / playerInventorySizeX
+  protected val playerInventorySizeY = math.min(4, (playerInventory.getSizeInventory - 4) / playerInventorySizeX)
 
   /** Render size of slots (width and height). */
   protected val slotSize = 18
@@ -116,7 +116,7 @@ abstract class Player(val playerInventory: InventoryPlayer, val otherInventory:
 
     // Show the quick slot bar below the internal inventory.
     val quickBarSpacing = 4
-    for (index <- 0 until InventoryPlayer.getHotbarSize) {
+    for (index <- 0 until playerInventorySizeX) {
       val x = left + index * slotSize
       val y = top + slotSize * (playerInventorySizeY - 1) + quickBarSpacing
       addSlotToContainer(new Slot(playerInventory, index, x, y))