spawn support

Author: arpruss

build.gradle

@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "0.10"
+version = "0.11"
 group= "mobi.omegacentauri.raspberryjammod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "RaspberryJamMod"
 

python2-scripts.zip

@@ -0,0 +1,62 @@
+ITEM = "Item"
+XPORB = "XPOrb"
+LEASHKNOT = "LeashKnot"
+PAINTING = "Painting"
+ARROW = "Arrow"
+SNOWBALL = "Snowball"
+FIREBALL = "Fireball"
+SMALLFIREBALL = "SmallFireball"
+THROWNENDERPEARL = "ThrownEnderpearl"
+EYEOFENDERSIGNAL = "EyeOfEnderSignal"
+THROWNPOTION = "ThrownPotion"
+THROWNEXPBOTTLE = "ThrownExpBottle"
+ITEMFRAME = "ItemFrame"
+WITHERSKULL = "WitherSkull"
+PRIMEDTNT = "PrimedTnt"
+FALLINGSAND = "FallingSand"
+FIREWORKSROCKETENTITY = "FireworksRocketEntity"
+ARMORSTAND = "ArmorStand"
+BOAT = "Boat"
+MINECARTRIDEABLE = "MinecartRideable"
+MINECARTCHEST = "MinecartChest"
+MINECARTFURNACE = "MinecartFurnace"
+MINECARTTNT = "MinecartTNT"
+MINECARTHOPPER = "MinecartHopper"
+MINECARTSPAWNER = "MinecartSpawner"
+MINECARTCOMMANDBLOCK = "MinecartCommandBlock"
+MOB = "Mob"
+MONSTER = "Monster"
+CREEPER = "Creeper"
+SKELETON = "Skeleton"
+SPIDER = "Spider"
+GIANT = "Giant"
+ZOMBIE = "Zombie"
+SLIME = "Slime"
+GHAST = "Ghast"
+PIGZOMBIE = "PigZombie"
+ENDERMAN = "Enderman"
+CAVESPIDER = "CaveSpider"
+SILVERFISH = "Silverfish"
+BLAZE = "Blaze"
+LAVASLIME = "LavaSlime"
+ENDERDRAGON = "EnderDragon"
+WITHERBOSS = "WitherBoss"
+BAT = "Bat"
+WITCH = "Witch"
+ENDERMITE = "Endermite"
+GUARDIAN = "Guardian"
+PIG = "Pig"
+SHEEP = "Sheep"
+COW = "Cow"
+CHICKEN = "Chicken"
+SQUID = "Squid"
+WOLF = "Wolf"
+MUSHROOMCOW = "MushroomCow"
+SNOWMAN = "SnowMan"
+OZELOT = "Ozelot"
+VILLAGERGOLEM = "VillagerGolem"
+HORSE = "EntityHorse"
+RABBIT = "Rabbit"
+VILLAGER = "Villager"
+ENDERCRYSTAL = "EnderCrystal"
+PLAYER = "(ThePlayer)"

python2-scripts/mcpipy/mcpi/entity.py

@@ -165,6 +165,7 @@ def pollChatPosts(self):
 
 class Minecraft:
     """The main class to interact with a running instance of Minecraft Pi."""
+
     def __init__(self, connection):
         self.conn = connection
 
@@ -173,6 +174,14 @@ def __init__(self, connection):
         self.player = CmdPlayer(connection)
         self.events = CmdEvents(connection)
 
+    def spawnEntity(self, *args):
+        """Spawn entity (type,x,y,z,tags) and get its id => id:int"""
+        return int(self.conn.sendReceive("world.spawnEntity", args))
+
+    def removeEntity(self, *args):
+        """Remove entity (id)"""
+        self.conn.send("world.removeEntity", args)
+
     def getBlock(self, *args):
         """Get block (x,y,z) => id:int"""
         return int(self.conn.sendReceive("world.getBlock", intFloor(args)))

python2-scripts/mcpipy/mcpi/minecraft.py

@@ -1,6 +1,7 @@
 import mcpi.minecraft as minecraft
 #import mcpi.block as block
 from mcpi.block import *
+from mcpi.entity import *
 import time
 from math import *
 import server
@@ -17,9 +18,33 @@ def __init__(self,mc=None):
         self.directionIn()
         self.pitch = 0
         self.positionIn()
-        self.follow = True
         self.delayTime = 0.05
         self.nib = []
+        self.turtleType = PLAYER
+        self.playerId = self.mc.getPlayerId()
+        self.turtleId = self.playerId
+
+    def turtle(self,turtleType):
+        if self.turtleType == turtleType:
+            return
+        if self.turtleType and self.turtleType != PLAYER:
+            self.mc.removeEntity(self.turtleId)
+        self.turtleType = turtleType
+        if turtleType == PLAYER:
+            self.turtleId = self.playerId
+        elif turtleType:
+            self.turtleId = self.mc.spawnEntity(turtleType,
+                                                self.position.x,self.position.y,self.position.z,
+                                                "{NoAI:1}")
+        self.positionOut()
+        self.directionOut()
+        
+    def follow(self): # deprecated
+        self.turtle(PLAYER)
+        
+    def nofollow(self): # deprecated
+        if self.turtleType == PLAYER:
+            self.turtle(None)
 
     def penwidth(self,w):
         self.nib = []
@@ -38,6 +63,7 @@ def goto(self,x,y,z):
         self.position.y = y
         self.position.z = z
         self.positionOut()
+        self.delay()
 
     def verticalangle(self,angle):
         self.pitch = -angle
@@ -47,12 +73,6 @@ def angle(self,angle):
         self.rotation = -angle
         self.directionOut()
 
-    def follow(self):
-        self.follow = True
-
-    def nofollow(self):
-        self.follow = False
-
     def penup(self):
         self.pen = False
 
@@ -66,8 +86,10 @@ def positionIn(self):
         self.position = self.mc.player.getPos()
 
     def positionOut(self):
-        if self.follow:
-            self.mc.player.setPos(self.position)
+        if self.turtleType:
+            self.mc.entity.setPos(self.turtleId,self.position)
+
+    def delay(self):
         if self.delayTime > 0:
             time.sleep(self.delayTime)
 
@@ -79,7 +101,7 @@ def directionOut(self):
         self.pitch %= 360.
         self.rotation %= 360
 
-        if self.follow:
+        if self.turtleType:
             pitch = self.pitch
             rotation = self.rotation
 
@@ -89,11 +111,8 @@ def directionOut(self):
                 pitch = 180. - pitch
                 rotation = (rotation + 180.) % 360.
 
-            self.mc.player.setRotation(rotation)
-            self.mc.player.setPitch(pitch)
-
-        if self.delayTime > 0:
-            time.sleep(self.delayTime)
+            self.mc.entity.setRotation(self.turtleId, rotation)
+            self.mc.entity.setPitch(self.turtleId, pitch)
 
     def pendelay(self, t):
         self.delayTime = t
@@ -104,10 +123,12 @@ def left(self, angle):
     def right(self, angle):
         self.rotation += angle
         self.directionOut()
+        self.delay()
 
     def up(self, angle):
         self.pitch -= angle
         self.directionOut()
+        self.delay()
 
     def down(self, angle):
         self.up(-angle)
@@ -127,6 +148,7 @@ def go(self, distance):
         self.position.y = newY
         self.position.z = newZ
         self.positionOut()
+        self.delay()
 
     def back(self, distance):
         pitch = self.pitch * pi/180.
@@ -143,6 +165,7 @@ def back(self, distance):
         self.position.y = newY
         self.position.z = newZ
         self.positionOut()
+        self.delay()
 
     def drawPoint(self, x, y, z):
         if self.pen and self.width > 0:
@@ -158,6 +181,7 @@ def drawPoint(self, x, y, z):
             self.position.y = y
             self.position.z = z
             self.positionOut()
+            self.delay()
 
     def drawLine(self, x1, y1, z1, x2, y2, z2):
         if not self.pen and self.delayTime == 0:
@@ -229,13 +253,13 @@ def drawLine(self, x1, y1, z1, x2, y2, z2):
 
 if __name__ == "__main__":
     t = Turtle()
-    t.pendelay(0)
-    t.penwidth(5)
+    t.pendelay(0.01)
+    t.penwidth(1)
     t.penblock(GLASS)
+    t.turtle(HORSE)
     for i in range(7):
         print i
         t.go(100)
         t.right(180.0-180./7)
     t.penup()
-    t.back(10) # exit star
-
+    t.turtle(None)

python2-scripts/mcpipy/turtle.py

@@ -165,6 +165,7 @@ def pollChatPosts(self):
 
 class Minecraft:
     """The main class to interact with a running instance of Minecraft Pi."""
+
     def __init__(self, connection):
         self.conn = connection
 
@@ -173,6 +174,14 @@ def __init__(self, connection):
         self.player = CmdPlayer(connection)
         self.events = CmdEvents(connection)
 
+    def spawnEntity(self, *args):
+        """Spawn entity (type,x,y,z,tags) and get its id => id:int"""
+        return int(self.conn.sendReceive("world.spawnEntity", args))
+
+    def removeEntity(self, *args):
+        """Remove entity (id)"""
+        self.conn.send("world.removeEntity", args)
+
     def getBlock(self, *args):
         """Get block (x,y,z) => id:int"""
         return int(self.conn.sendReceive("world.getBlock", intFloor(args)))