Ammo should now work with MiddleClass 2.0.

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "lib/middleclass"]
 	path = lib/middleclass
-	url = git://github.com/BlackBulletIV/middleclass.git
+	url = git://github.com/kikito/middleclass.git

core/Entity.lua

@@ -5,7 +5,7 @@ Entity = class("Entity")
 Entity._mt = {}
 
 function Entity._mt:__index(key)
-  local result = rawget(self, "_" .. key) or self.class.__classDict[key]
+  local result = rawget(self, "_" .. key) or self.class.__instanceDict[key]
 
   if result then
     return result

core/LinkedList.lua

@@ -3,7 +3,7 @@ LinkedList = class("LinkedList")
 local mt = {}
 
 function mt:__index(key)
-  return rawget(self, "_" .. key) or LinkedList.__classDict[key]
+  return rawget(self, "_" .. key) or LinkedList.__instanceDict[key]
 end
 
 function LinkedList:initialize(nextProp, prevProp, ...)

core/Sound.lua

@@ -4,7 +4,7 @@ Sound = class("Sound")
 Sound._mt = {}
 
 function Sound._mt:__index(key)
-  return rawget(self, "_" .. key) or self.class.__classDict[key]
+  return rawget(self, "_" .. key) or self.class.__instanceDict[key]
 end
 
 Sound:enableAccessors()

core/World.lua

@@ -7,7 +7,7 @@ function World._mt:__index(key)
   elseif key == "all" then
     return self._updates:getAll()
   else
-    return self.class.__classDict[key]
+    return self.class.__instanceDict[key]
   end
 end
 

core/extensions.lua

@@ -114,7 +114,7 @@ function Object:enableAccessors()
   if not self._mt then self._mt = {} end
 
   for _, v in pairs(Object.__metamethods) do
-    self._mt[v] = self.__classDict[v]
+    self._mt[v] = self.__instanceDict[v]
   end
 
   local super = self.super

init.lua

@@ -1,5 +1,5 @@
 ammo = {}
 ammo.path = ({...})[1]:gsub("%.init", "")
 
-require(ammo.path .. ".lib.middleclass")
+require(ammo.path .. ".lib.middleclass.middleclass")
 require(ammo.path .. ".core.init")