mcblocky 0.1.0 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjMwYjg5MzQ2MjUyYWQwZmI2NjhhMDA1MTYzODNjOTA0NDI2MTBhZA==
+    NDNlNzBiMzQ4NDE0NDE3ODcwYjg4ZjRkM2ZmNjMyYzQ0ODE5ZjZiZQ==
   data.tar.gz: !binary |-
-    N2I1ZTM3ZWRlN2RhYjAzNzMzZTJhNTI5MTA1ZDU4MmIzMWVhYzA0Mg==
+    ZWRmY2NlYzI1YjE5YzM5ZDFiMmY4NTAzNDNkZjlhN2EzZmEzN2VkZA==
 SHA512:
   metadata.gz: !binary |-
-    NWRmODk2MmIzODVmM2RiMzYyNzQyNDhhYTVkYjIxYTAzNzA1Njg4MTEzNWUy
-    NjI0MmNjZTZiZTIxMDY1ODVjMzgwZjg5MWZlNjI3OTIyZjY4MTVkZTRmOTYy
-    NjJhNmQ2NTdmMDVkNGY3M2Y0ZGI1ODUxOGJkMGM0ODQwOTNjZjk=
+    NGNmN2JiMjZmZDQ2YzQ0MzI2MTU5ZWU3OGZkNzIxNGQyMTJlNjQ0NTE1NjRh
+    ODAyNDg3MzAyMmY1NjA0ZDI1NmJlODQ5OTk3Y2Y0MzRiNGJlMDJkMTg3NWM3
+    ZjU1NjEyMDkyODExYjc4M2M1ZjM4OTIxODc3MjhlOWFlYTJkNjA=
   data.tar.gz: !binary |-
-    YzdmZGQyM2FhMjRjMDAwMzlhOTFjYmUxMWJlZWUzNTkxMDBkOWQ0MjU1YTU1
-    MzRiODdiYzhkNGQyYjc1YjFhZjMwNWU2NzhiYTFjNzMxMTYxMDliYjM0NmY5
-    NTdjMDRjODFkYjgyY2EzZTdmZTBhYTA2NzY3Mjk1Nzc1MThhYzA=
+    MGQ1N2VhNDg1YjZiM2RiZTIyOWY1Y2FiYjllNmI0YjY4MTYwYjNlYjc2MWIz
+    ODg4OTQxZjY5ZjZkYjk4NTgwZTFkZmZmNjQ5MTJiOGM0Y2E1MDFjMjc4M2I2
+    M2FmZDQxODQ4N2UxMjU1MGQ1OTBlODU5ZWNhNzFmMWNmNDk5MTA=

data/examples/hello/hello.rb

@@ -31,7 +31,7 @@ initial do
   tellraw @a[team: 'Red'], {text: "Hello world", color: "red"}
 end
 
-repeat 171, 82, 242, 175, 84, 247 do
+repeat :teams, 171, 82, 242, 175, 84, 242 do
   scoreboard :players, :set, @a[x: 172, y: 81, z: 236, r: 1, team: '!Red'], 'SwitchingTeam', 1
   scoreboard :players, :set, @a[x: 170, y: 81, z: 236, r: 1, team: '!Blue'], 'SwitchingTeam', 1
   execute @a[x: 170, y: 81, z: 236, r: 1, score_SwitchingTeam_min: 1], '~ ~ ~', 'scoreboard teams join Blue @p'
@@ -74,6 +74,31 @@ furnace 176, 79, 248 do
   item 'minecraft:gold_ingot'
 end
 
+at 172, 79, 244 do
+  disable :teams
+end
+
+at 174, 79, 244 do
+  enable :teams
+end
+
+setblock 172, 80, 244, 'minecraft:standing_sign', 0, 'replace', {'Text1'=>'{"text":"Disable team"}', 'Text2'=>'{"text":"switcher"}'}
+setblock 174, 80, 244, 'minecraft:standing_sign', 0, 'replace', {'Text1'=>'{"text":"Enable team"}', 'Text2'=>'{"text":"switcher"}'}
+setblock 172, 79, 245, 'minecraft:stone_button', 3
+setblock 174, 79, 245, 'minecraft:stone_button', 3
+
+chain :hello, 171, 82, 243, 175, 84, 243 do
+  say 'Hello'
+  say 'World'
+end
+
+at 176, 79, 244 do
+  activate :hello
+end
+
+setblock 176, 80, 244, 'minecraft:standing_sign', 0, 'replace', {'Text1'=>'{"text":"Activate hello"}'}
+setblock 176, 79, 245, 'minecraft:stone_button', 3
+
 after do
   # setblock 175, 79, 248, 'minecraft:standing_sign', 0, 'replace'
   # blockdata 175, 79, 248, {'Text1'=>'{"text":"hola mundo"}'}

data/lib/mcblocky/context.rb

@@ -3,6 +3,7 @@ require 'mcblocky/dsl'
 module McBlocky
   class Context
     attr_accessor :server
+    attr_accessor :last_area
 
     def self.run_file(file, dir=nil)
       dir = File.dirname(file) unless dir
@@ -36,6 +37,10 @@ module McBlocky
       @chains ||= []
     end
 
+    def named_chains
+      @named_chains ||= {}
+    end
+
     def blocks
       @blocks ||= {}
     end
@@ -44,10 +49,6 @@ module McBlocky
       @rects ||= {}
     end
 
-    def areas
-      @areas ||= []
-    end
-
     def context
       self
     end

data/lib/mcblocky/dsl.rb

@@ -1,6 +1,7 @@
 load File.expand_path('dsl/selector.rb', File.dirname(__FILE__))
 load File.expand_path('dsl/commands.rb', File.dirname(__FILE__))
 load File.expand_path('dsl/repeat_chain.rb', File.dirname(__FILE__))
+load File.expand_path('dsl/impulse_chain.rb', File.dirname(__FILE__))
 load File.expand_path('dsl/command_block.rb', File.dirname(__FILE__))
 load File.expand_path('dsl/block.rb', File.dirname(__FILE__))
 load File.expand_path('dsl/container.rb', File.dirname(__FILE__))
@@ -13,27 +14,51 @@ module McBlocky
     end
 
     def initial(&block)
-      chain = Commands.new(:initial)
+      chain = Commands.new(context, :initial)
       chain.instance_exec(&block)
       chains << chain
     end
 
     def cleanup(&block)
-      chain = Commands.new(:cleanup)
+      chain = Commands.new(context, :cleanup)
       chain.instance_exec(&block)
       chains << chain
     end
 
     def after(&block)
-      chain = Commands.new(:after)
+      chain = Commands.new(context, :after)
       chain.instance_exec(&block)
       chains << chain
     end
 
-    def repeat(x1, y1, z1, x2, y2, z2, &block)
-      chain = RepeatChain.new(x1, y1, z1, x2, y2, z2)
+    def repeat(*args, &block)
+      if Symbol === args[0]
+        name = args.delete_at(0)
+        raise NameError, 'Name already exists' if named_chains.has_key? name
+      end
+      if args.empty?
+        rect = context.last_area
+        args = [rect.x1, rect.y1, rect.z1, rect.x2, rect.y2, rect.z2]
+      end
+      chain = RepeatChain.new(context, *args)
+      chain.instance_exec(&block)
+      chains << chain
+      named_chains[name] = chain if name
+    end
+
+    def chain(*args, &block)
+      if Symbol === args[0]
+        name = args.delete_at(0)
+        raise NameError, 'Name already exists' if named_chains.has_key? name
+      end
+      if args.empty?
+        rect = context.last_area
+        args = [rect.x1, rect.y1, rect.z1, rect.x2, rect.y2, rect.z2]
+      end
+      chain = ImpulseChain.new(context, *args)
       chain.instance_exec(&block)
       chains << chain
+      named_chains[name] = chain if name
     end
 
     def at(x, y, z, data=0, kind=:normal, nbt={}, &block)
@@ -51,11 +76,15 @@ module McBlocky
                    else
                      raise ArgumentError, 'Unknown command block type'
                    end
-      cblock = CommandBlock.new(x, y, z, data, block_kind, nbt)
+      cblock = CommandBlock.new(context, x, y, z, data, block_kind, nbt)
       cblock.instance_exec(&block)
       blocks[Location.new(x, y, z)] = cblock
     end
 
+    def area(x1, y1, z1, x2, y2, z2)
+      context.last_area = Rect.new(x1, y1, z1, x2, y2, z2)
+    end
+
     def setblock(x, y, z, kind, data=0, replacemode='replace', nbt={})
       block = Block.new(x, y, z, kind, data, nbt)
       blocks[Location.new(x, y, z)] = block

data/lib/mcblocky/dsl/command_block.rb

@@ -1,8 +1,8 @@
 module McBlocky::DSL
   class CommandBlock < Commands
     attr_reader :x, :y, :z, :block_data, :block_kind
-    def initialize(x, y, z, facing, kind, nbt={})
-      super(:at)
+    def initialize(context, x, y, z, facing, kind, nbt={})
+      super(context, :at)
       @x = x
       @y = y
       @z = z

data/lib/mcblocky/dsl/commands.rb

@@ -1,9 +1,11 @@
 module McBlocky::DSL
   class Commands
+    attr_accessor :context
     attr_reader :kind
     attr_accessor :commands
 
-    def initialize(kind, *args)
+    def initialize(context, kind, *args)
+      @context = context
       @kind = kind
       @args = args
       @commands = []
@@ -21,6 +23,27 @@ module McBlocky::DSL
       McBlocky::DSL.to_nbt(obj)
     end
 
+    def activate(name)
+      raise NameError, "No chain named #{name}" unless context.named_chains.has_key? name
+      raise ArgumentError, "#{name} is not an activateable chain" unless context.named_chains[name].kind == :impulse_chain
+      chain = context.named_chains[name]
+      command :blockdata, chain.rect.x1, chain.rect.y1, chain.rect.z1, '{auto:1}'
+    end
+
+    def enable(name)
+      raise NameError, "No chain named #{name}" unless context.named_chains.has_key? name
+      raise ArgumentError, "#{name} is not a repeat chain" unless context.named_chains[name].kind == :repeat
+      chain = context.named_chains[name]
+      command :blockdata, chain.rect.x1, chain.rect.y1, chain.rect.z1, '{auto:1}'
+    end
+
+    def disable(name)
+      raise NameError, "No chain named #{name}" unless context.named_chains.has_key? name
+      raise ArgumentError, "#{name} is not a repeat chain" unless context.named_chains[name].kind == :repeat
+      chain = context.named_chains[name]
+      command :blockdata, chain.rect.x1, chain.rect.y1, chain.rect.z1, '{auto:0}'
+    end
+
     COMMANDS = [:achievement, :ban, :ban_ip, :banlist, :blockdata, :clear, :clone, :debug, :defaultgamemode, :deop, :difficulty, :effect, :enchant, :entitydata, :execute, :fill, :gamemode, :gamerule, :give, :help, :kick, :kill, :list, :me, :op, :pardon, :pardon_ip, :particle, :playsound, :replaceitem, :save_all, :save_off, :save_on, :say, :scoreboard, :seed, :setblock, :setidletimeout, :setworldspawn, :spawnpoint, :spreadplayers, :stats, :stop, :summon, :tell, :tellraw, :testfor, :testforblock, :testforblocks, :time, :title, :toggledownfall, :tp, :trigger, :weather, :whitelist, :worldborder, :xp]
 
     def blockdata(*args)
@@ -30,7 +53,7 @@ module McBlocky::DSL
 
     def detect(selector, *args, &block)
       if block
-        chain = Commands.new(:detect)
+        chain = Commands.new(context, :detect)
         chain.instance_exec &block
         chain.commands.each do |c|
           command :execute, selector, '~ ~ ~', :detect, *args, c
@@ -45,7 +68,7 @@ module McBlocky::DSL
         args = ['~ ~ ~']
       end
       if block
-        chain = Commands.new(:execute)
+        chain = Commands.new(context, :execute)
         chain.instance_exec &block
         chain.commands.each do |c|
           command :execute, selector, *args, c

data/lib/mcblocky/dsl/impulse_chain.rb

@@ -0,0 +1,9 @@
+module McBlocky::DSL
+  class ImpulseChain < Commands
+    attr_reader :rect
+    def initialize(context, *args)
+      super(context, :impulse_chain)
+      @rect = McBlocky::Rect.new(*args)
+    end
+  end
+end

data/lib/mcblocky/dsl/repeat_chain.rb

@@ -1,8 +1,8 @@
 module McBlocky::DSL
   class RepeatChain < Commands
     attr_reader :rect
-    def initialize(*args)
-      super(:repeat)
+    def initialize(context, *args)
+      super(context, :repeat)
       @rect = McBlocky::Rect.new(*args)
     end
   end

data/lib/mcblocky/executor.rb

@@ -1,7 +1,7 @@
 module McBlocky
   class Executor < DSL::Commands
     def self.to_commands(context, old_context=nil)
-      executor = Executor.new(:final)
+      executor = Executor.new(nil, :final)
       executor.do_context(context, old_context)
       executor.commands
     end
@@ -36,20 +36,6 @@ module McBlocky
         end
       end
 
-      if old_context
-        old_context.areas.each do |x1, y1, z1, x2, y2, z2|
-          fill x1, y1, z1, x2, y2, z2, 'minecraft:air'
-        end
-      end
-      context.areas.each do |x1, y1, z1, x2, y2, z2|
-        fill x1, y1, z1, x2, y1, z2, 'minecraft:stained_glass', '7'
-        fill x1, y2, z1, x2, y2, z2, 'minecraft:stained_glass', '7'
-        fill x1, y1, z1, x1, y2, z2, 'minecraft:stained_glass', '7'
-        fill x2, y1, z1, x2, y2, z2, 'minecraft:stained_glass', '7'
-        fill x1, y1, z1, x2, y2, z1, 'minecraft:stained_glass', '7'
-        fill x1, y1, z2, x2, y2, z2, 'minecraft:stained_glass', '7'
-      end
-
       rects = (old_context ? old_context.rects.keys : []) + context.rects.keys
       rects.uniq.each do |rect|
         old_block = old_context ? old_context.rects[rect] : nil
@@ -63,8 +49,13 @@ module McBlocky
         end
       end
 
-      context.chains.select{|x|x.kind == :repeat}.each do |c|
-        do_repeat context, c
+      context.chains.select{|x|[:repeat, :impulse_chain].include? x.kind}.each do |c|
+        case c.kind
+        when :repeat
+          do_repeat context, c
+        when :impulse_chain
+          do_impulse context, c
+        end
       end
 
       locations = (old_context ? old_context.blocks.keys : []) + context.blocks.keys
@@ -96,13 +87,17 @@ module McBlocky
     end
 
     def do_repeat(context, chain)
+      if chain.rect != @last_area
+        @last_area = chain.rect
+        @offset = 0
+      end
       sequence = fill_space(chain.rect)
-      if chain.commands.length > sequence.length
+      if chain.commands.length + @offset > sequence.length
         raise ArgumentError, "Chain is too long for the provided space"
       end
       kind = 'minecraft:repeating_command_block'
       chain.commands.each_with_index do |c,i|
-        cursor = sequence[i]
+        cursor = sequence[i+@offset]
         next_cursor = if i+1 < sequence.length
                         sequence[i+1]
                       else
@@ -121,10 +116,51 @@ module McBlocky
                  elsif next_cursor.z - cursor.z == -1
                    DSL::Facing::NORTH
                  end
-        context.blocks[cursor] = DSL::CommandBlock.new(cursor.x, cursor.y, cursor.z, facing, kind, {'auto'=>1})
+        context.blocks[cursor] = DSL::CommandBlock.new(context, cursor.x, cursor.y, cursor.z, facing, kind, {'auto'=>1})
         context.blocks[cursor].command c
         kind = 'minecraft:chain_command_block'
       end
+      @offset += self.next_power_of_two(chain.commands.length)
+    end
+
+    def do_impulse(context, chain)
+      if chain.rect != @last_area
+        @last_area = chain.rect
+        @offset = 0
+      end
+      sequence = fill_space(chain.rect)
+      chain.commands << "blockdata #{sequence[@offset].x} #{sequence[@offset].y} #{sequence[@offset].z} {auto:0}"
+      if chain.commands.length + @offset > sequence.length
+        raise ArgumentError, "Chain is too long for the provided space"
+      end
+      kind = 'minecraft:command_block'
+      nbt = {auto: 0}
+      chain.commands.each_with_index do |c,i|
+        cursor = sequence[i+@offset]
+        next_cursor = if i+1 < sequence.length
+                        sequence[i+1]
+                      else
+                        Location.new(cursor.x, cursor.y+1, cursor.z)
+                      end
+        facing = if next_cursor.x - cursor.x == 1
+                   DSL::Facing::EAST
+                 elsif next_cursor.x - cursor.x == -1
+                   DSL::Facing::WEST
+                 elsif next_cursor.y - cursor.y == 1
+                   DSL::Facing::UP
+                 elsif next_cursor.y - cursor.y == -1
+                   DSL::Facing::DOWN
+                 elsif next_cursor.z - cursor.z == 1
+                   DSL::Facing::SOUTH
+                 elsif next_cursor.z - cursor.z == -1
+                   DSL::Facing::NORTH
+                 end
+        context.blocks[cursor] = DSL::CommandBlock.new(context, cursor.x, cursor.y, cursor.z, facing, kind, nbt)
+        context.blocks[cursor].command c
+        kind = 'minecraft:chain_command_block'
+        nbt = {auto: 1}
+      end
+      @offset += self.next_power_of_two(chain.commands.length)
     end
 
     def fill_space(rect)
@@ -145,5 +181,13 @@ module McBlocky
       end
       path
     end
+
+    protected
+    def next_power_of_two(n)
+      l = Math.log(n, 2)
+      # ceiling
+      l = l.to_i + 1 if l != l.to_i
+      return (2**l).to_i
+    end
   end
 end

data/lib/mcblocky/listener.rb

@@ -18,6 +18,7 @@ module McBlocky
         File.expand_path('../dsl.rb', __FILE__),
         File.expand_path('../dsl/commands.rb', __FILE__),
         File.expand_path('../dsl/repeat_chain.rb', __FILE__),
+        File.expand_path('../dsl/impulse_chain.rb', __FILE__),
         File.expand_path('../dsl/selector.rb', __FILE__),
         File.expand_path('../dsl/command_block.rb', __FILE__),
         File.expand_path('../dsl/block.rb', __FILE__),

data/lib/mcblocky/version.rb

@@ -1,3 +1,3 @@
 module McBlocky
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mcblocky
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Limiero
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-10 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,6 +120,7 @@ files:
 - lib/mcblocky/dsl/command_block.rb
 - lib/mcblocky/dsl/commands.rb
 - lib/mcblocky/dsl/container.rb
+- lib/mcblocky/dsl/impulse_chain.rb
 - lib/mcblocky/dsl/repeat_chain.rb
 - lib/mcblocky/dsl/selector.rb
 - lib/mcblocky/executor.rb