Merge pull request #74 from dave-tucker/clean-cuberite

Cleaner Cuberite integration and world customizations

Author: dave-tucker

.gitignore

@@ -6,3 +6,4 @@ world/players
 world/whitelist.sqlite
 world/world/stats/Pixowl.json
 goproxy/goproxy
+dockercraft

world/Plugins/Docker/config.lua renamed to Docker/config.lua

@@ -0,0 +1,225 @@
+-- Container object is the representation of a Docker
+-- container in the Minecraft world
+
+-- constant variables
+CONTAINER_CREATED = 0
+CONTAINER_RUNNING = 1
+CONTAINER_STOPPED = 2
+
+-- NewContainer returns a Container object,
+-- representation of a Docker container in
+-- the Minecraft world
+function NewContainer()
+  c = {
+    displayed = false,
+    x = 0,
+    z = 0,
+    name="",
+    id="",
+    imageRepo="",
+    imageTag="",
+    running=false,
+    init=Container.init,
+    setInfos=Container.setInfos,
+    destroy=Container.destroy,
+    display=Container.display,
+    updateMemSign=Container.updateMemSign,
+    updateCPUSign=Container.updateCPUSign,
+    addGround=Container.addGround
+  }
+  return c
+end
+
+Container = {displayed = false, x = 0, z = 0, name="",id="",imageRepo="",imageTag="",running=false}
+
+-- Container:init sets Container's position
+function Container:init(x,z)
+  self.x = x
+  self.z = z
+  self.displayed = false
+end
+
+-- Container:setInfos sets Container's id, name, imageRepo,
+-- image tag and running state
+function Container:setInfos(id,name,imageRepo,imageTag,running)
+  self.id = id
+  self.name = name
+  self.imageRepo = imageRepo
+  self.imageTag = imageTag
+  self.running = running
+end
+
+-- Container:destroy removes all blocks of the
+-- container, it won't be visible on the map anymore
+function Container:destroy(running)
+  local X = self.x+2
+  local Y = GROUND_LEVEL+2
+  local Z = self.z+2
+  LOG("Exploding at X:" .. X .. " Y:" .. Y .. " Z:" .. Z)
+  local World = cRoot:Get():GetDefaultWorld()
+  World:BroadcastSoundEffect("random.explode", X, Y, Z, 1, 1)
+  World:BroadcastParticleEffect("hugeexplosion",X, Y, Z, 0, 0, 0, 1, 1)
+
+  -- if a block is removed before it's button/lever/sign, that object will drop
+  -- and the player can collect it. Remove these first
+
+  -- lever
+  digBlock(UpdateQueue,self.x+1,GROUND_LEVEL+3,self.z+1)
+  -- signs
+  digBlock(UpdateQueue,self.x+3,GROUND_LEVEL+2,self.z-1)
+  digBlock(UpdateQueue,self.x,GROUND_LEVEL+2,self.z-1)
+  digBlock(UpdateQueue,self.x+1,GROUND_LEVEL+2,self.z-1)
+  -- torch
+  digBlock(UpdateQueue,self.x+1,GROUND_LEVEL+3,self.z+1)
+  --button
+  digBlock(UpdateQueue,self.x+2,GROUND_LEVEL+3,self.z+2)
+
+  -- rest of the blocks
+  for py = GROUND_LEVEL+1, GROUND_LEVEL+4
+  do
+    for px=self.x-1, self.x+4
+    do
+      for pz=self.z-1, self.z+5
+      do
+        digBlock(UpdateQueue,px,py,pz)
+      end
+    end
+  end
+end
+
+-- Container:display displays all Container's blocks
+-- Blocks will be blue if the container is running,
+-- orange otherwise.
+function Container:display(running)
+
+  local metaPrimaryColor = E_META_WOOL_LIGHTBLUE
+  local metaSecondaryColor = E_META_WOOL_BLUE
+
+  if running == false
+  then
+    metaPrimaryColor = E_META_WOOL_ORANGE
+    metaSecondaryColor = E_META_WOOL_RED
+  end
+
+  self.displayed = true
+
+  for px=self.x, self.x+3
+  do
+    for pz=self.z, self.z+4
+    do
+      setBlock(UpdateQueue,px,GROUND_LEVEL + 1,pz,E_BLOCK_WOOL,metaPrimaryColor)
+    end
+  end
+
+  for py = GROUND_LEVEL+2, GROUND_LEVEL+3
+  do
+    setBlock(UpdateQueue,self.x+1,py,self.z,E_BLOCK_WOOL,metaPrimaryColor)
+
+    -- leave empty space for the door
+    -- setBlock(UpdateQueue,self.x+2,py,self.z,E_BLOCK_WOOL,metaPrimaryColor)
+
+    setBlock(UpdateQueue,self.x,py,self.z,E_BLOCK_WOOL,metaPrimaryColor)
+    setBlock(UpdateQueue,self.x+3,py,self.z,E_BLOCK_WOOL,metaPrimaryColor)
+
+    setBlock(UpdateQueue,self.x,py,self.z+1,E_BLOCK_WOOL,metaSecondaryColor)
+    setBlock(UpdateQueue,self.x+3,py,self.z+1,E_BLOCK_WOOL,metaSecondaryColor)
+
+    setBlock(UpdateQueue,self.x,py,self.z+2,E_BLOCK_WOOL,metaPrimaryColor)
+    setBlock(UpdateQueue,self.x+3,py,self.z+2,E_BLOCK_WOOL,metaPrimaryColor)
+
+    setBlock(UpdateQueue,self.x,py,self.z+3,E_BLOCK_WOOL,metaSecondaryColor)
+    setBlock(UpdateQueue,self.x+3,py,self.z+3,E_BLOCK_WOOL,metaSecondaryColor)
+
+    setBlock(UpdateQueue,self.x,py,self.z+4,E_BLOCK_WOOL,metaPrimaryColor)
+    setBlock(UpdateQueue,self.x+3,py,self.z+4,E_BLOCK_WOOL,metaPrimaryColor)
+
+    setBlock(UpdateQueue,self.x+1,py,self.z+4,E_BLOCK_WOOL,metaPrimaryColor)
+    setBlock(UpdateQueue,self.x+2,py,self.z+4,E_BLOCK_WOOL,metaPrimaryColor)
+  end
+
+  -- torch
+  setBlock(UpdateQueue,self.x+1,GROUND_LEVEL+3,self.z+3,E_BLOCK_TORCH,E_META_TORCH_ZP)
+
+  -- start / stop lever
+  setBlock(UpdateQueue,self.x+1,GROUND_LEVEL + 3,self.z + 2,E_BLOCK_WALLSIGN,E_META_CHEST_FACING_XP)
+  updateSign(UpdateQueue,self.x+1,GROUND_LEVEL + 3,self.z + 2,"","START/STOP","---->","",2)
+
+
+  if running
+  then
+    setBlock(UpdateQueue,self.x+1,GROUND_LEVEL+3,self.z+1,E_BLOCK_LEVER,1)
+  else
+    setBlock(UpdateQueue,self.x+1,GROUND_LEVEL+3,self.z+1,E_BLOCK_LEVER,9)
+  end
+
+
+  -- remove button
+
+  setBlock(UpdateQueue,self.x+2,GROUND_LEVEL + 3,self.z + 2,E_BLOCK_WALLSIGN,E_META_CHEST_FACING_XM)
+  updateSign(UpdateQueue,self.x+2,GROUND_LEVEL + 3,self.z + 2,"","REMOVE","---->","",2)
+
+  setBlock(UpdateQueue,self.x+2,GROUND_LEVEL+3,self.z+3,E_BLOCK_STONE_BUTTON,E_BLOCK_BUTTON_XM)
+
+
+  -- door
+  -- Cuberite bug with Minecraft 1.8 apparently, doors are not displayed correctly
+  -- setBlock(UpdateQueue,self.x+2,GROUND_LEVEL+2,self.z,E_BLOCK_WOODEN_DOOR,E_META_CHEST_FACING_ZM)
+
+
+  for px=self.x, self.x+3
+  do
+    for pz=self.z, self.z+4
+    do
+      setBlock(UpdateQueue,px,GROUND_LEVEL + 4,pz,E_BLOCK_WOOL,metaPrimaryColor)
+    end
+  end
+
+  setBlock(UpdateQueue,self.x+3,GROUND_LEVEL + 2,self.z - 1,E_BLOCK_WALLSIGN,E_META_CHEST_FACING_ZM)
+  updateSign(UpdateQueue,self.x+3,GROUND_LEVEL + 2,self.z - 1,string.sub(self.id,1,8),self.name,self.imageRepo,self.imageTag,2)
+
+  -- Mem sign
+  setBlock(UpdateQueue,self.x,GROUND_LEVEL + 2,self.z - 1,E_BLOCK_WALLSIGN,E_META_CHEST_FACING_ZM)
+
+  -- CPU sign
+  setBlock(UpdateQueue,self.x+1,GROUND_LEVEL + 2,self.z - 1,E_BLOCK_WALLSIGN,E_META_CHEST_FACING_ZM)
+end
+
+
+-- Container:updateMemSign updates the mem usage
+-- value displayed on Container's sign
+function Container:updateMemSign(s)
+  updateSign(UpdateQueue,self.x,GROUND_LEVEL + 2,self.z - 1,"Mem usage","",s,"")
+end
+
+-- Container:updateCPUSign updates the mem usage
+-- value displayed on Container's sign
+function Container:updateCPUSign(s)
+  updateSign(UpdateQueue,self.x+1,GROUND_LEVEL + 2,self.z - 1,"CPU usage","",s,"")
+end
+
+-- Container:addGround creates ground blocks
+-- necessary to display the container
+function Container:addGround()
+  local y = GROUND_LEVEL
+  local max_x = GROUND_MAX_X
+
+  if GROUND_MIN_X > self.x - 2
+  then
+    max_x = GROUND_MIN_X
+    GROUND_MIN_X = self.x - 2
+    min_x = GROUND_MIN_X
+  end
+
+  local min_x = GROUND_MIN_X
+  for x= min_x, max_x
+  do
+    for z=GROUND_MIN_Z,GROUND_MAX_Z
+    do
+      setBlock(UpdateQueue,x,y,z,E_BLOCK_WOOL,E_META_WOOL_WHITE)
+      for sky=y+1,y+6
+      do
+        setBlock(UpdateQueue,x,sky,z,E_BLOCK_AIR,0)
+      end
+    end
+  end
+end