diamond-lang 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 146ad378461d50b88c212bf338df996e7eeea8e5
-  data.tar.gz: 2f1ae43f3e504de2db3d3106cd41f2b293fe7025
+  metadata.gz: 3075c30a0c08b540e5bfacab36b24805454376ff
+  data.tar.gz: df3af1c137c9ecb555391eeb2633caa64d588d05
 SHA512:
-  metadata.gz: c2e772bf13e68a58a50c8f51f2caf5baa09204da999e1bd8c114c01f714d394b7a379de160708242634258d56e1d30a07585447b1681ac5396fbdc78b782fb3d
-  data.tar.gz: 2b12b8f1c1c7b581b3054bce42a63a8f1d6f0acce21da0adcefc9c4879b598b96db3ebce94baee8ad0e967bd43ecc1723a330bb3c44f128ca18084830ad359c5
+  metadata.gz: d08ee782327aff9f96a183d80a04f4edb4ddcaa2400b3beddec5f43f11814d146936e6d849a7d8ae4064d35a230eeef3a73a9ddd59217ffc5ef1893137f2e21f
+  data.tar.gz: 7bb9541370b490cebfc9a6fba68ea2bb9310e2587db284d120f5c870c07ab0f4587f16ffee309130f309ef524f747501faecfb251047a6efd0fca1737c93e8e6

data/README.md

@@ -153,11 +153,10 @@ DiamondLang::Helpers::Coordinate(:x, 6) + 5 #=> 11
 ~~~
 
 ##Conditions:
-*Coming soon!*
 To make commands run on success, attach a block:
 
 ~~~rb
-c.test_for s(a: {r: 10}) do |c| # conditionals coming soon!
+c.test_for s(a: {r: 10}) do |c|
   c.tell s(a: {r: 10}), 'hello'
 end
 #=> Command Block: 						test_for @a[r=10]
@@ -169,7 +168,7 @@ Diamond Lang is just a Ruby framework, so you can have awesome things, like vari
 
 ~~~rb
 close_players = s(a: {r: 10})
-c.test_for close_players do |c| # conditionals coming soon!
+c.test_for close_players do |c|
   c.tell close_players, 'hello'
 end #=> @a[r=10]
 ~~~

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/diamond-lang.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: diamond-lang 1.1.1 ruby lib
+# stub: diamond-lang 1.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "diamond-lang"
-  s.version = "1.1.1"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Ben (@penne12_)"]
-  s.date = "2015-12-29"
+  s.date = "2016-01-01"
   s.description = "Making Minecraft 1 Command Creations with ruby. It's as easy as `c.say 123`"
   s.email = "ben@bensites.com"
   s.extra_rdoc_files = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "diamond-lang.gemspec",
     "examples/conveyor.rb",
+    "examples/custom_crafting.rb",
     "examples/hello_world.rb",
     "lib/diamond-lang.rb",
     "lib/diamond-lang/command_chain.rb",
@@ -38,6 +39,7 @@ Gem::Specification.new do |s|
     "lib/diamond-lang/helpers/constants.rb",
     "lib/diamond-lang/helpers/coordinate.rb",
     "lib/diamond-lang/helpers/coordinates.rb",
+    "lib/diamond-lang/helpers/custom_crafting.rb",
     "lib/diamond-lang/helpers/entity.rb",
     "lib/diamond-lang/helpers/errors/invalid_axis.rb",
     "lib/diamond-lang/helpers/errors/invalid_coordinate_value.rb",

data/examples/custom_crafting.rb

@@ -0,0 +1,37 @@
+require 'diamond-lang'
+
+class CustomCrafting < DiamondLang::OneCommand
+  def setup(c)
+    c.title s(:a), :subtitle, {"text " => "command by Ben from bensites.com"}.to_json
+    c.title s(:a), :title, {"text " => "Custom"}.to_json
+    add_crafting([
+      {
+        pattern:  "  s"+
+                  " p "+
+                  "p  ",
+        result: "   "+
+                " n "+
+                "   ",
+        n: "id:\"minecraft:name_tag\",Count:1b",
+        s: "id:\"minecraft:string\",Count:1b",
+        p: "id:\"minecraft:paper\",Count:1b"
+      },
+      {
+        pattern:  "bbb"+
+                  "bpb"+
+                  "bbb",
+        result: "   "+
+                " s ",
+        b: "id:\"minecraft:iron_bars\",Count:1b",
+        p: "id:\"minecraft:porkchop\",Count:64b",
+        s: "id:\"minecraft:mob_spawner\",Count:1b"
+      }
+    ])
+  end
+
+  def tick(c)
+
+  end
+end
+
+CustomCrafting.create

data/lib/diamond-lang.rb

@@ -1,4 +1,3 @@
-require 'byebug'
 require 'json'
 require 'require_all'
 require_rel 'diamond-lang'

data/lib/diamond-lang/helpers/command_block.rb

@@ -29,7 +29,7 @@ module DiamondLang
         if conditional? && !val
           @data_value -= 8
         elsif !@conditional && val
-          @date_value += 8
+          @data_value += 8
         end
       end
       def conditional?(data_value=@data_value)

data/lib/diamond-lang/helpers/custom_crafting.rb

@@ -0,0 +1,176 @@
+module DiamondLang
+  module Helpers
+    # Please Note:
+    #
+    # This class uses the scoreboard objectives:
+    # - ask_table
+    # - craft_table
+    # - on_table
+    # - ct_has_block
+    # - craft_success
+    # And ArmorStands named
+    # - CraftingTable
+    # - CraftingCreator
+    #
+    # Including those in your command will break this, and other creations that use this.
+    #
+    # Do not change the scoreboard objectives ask_table, or on_table.
+    # Also, do not change the ArmorStand name "CraftingTable".
+    # If you do, you'll risk breaking other creations in the same world.
+    #
+    #
+    # It also creates about 21 commands + 5 for every recipe.
+    # On default settings, that's
+    # - 1 level
+    # - 1 row per recipe
+    # - 1 block
+    #
+    # 2 should be able to be in the same world without any conflict.
+    class CustomCrafting
+      def initialize(c, recipes)
+        @crafting_recipes = recipes
+        c.scoreboard :objectives, :add, :ask_table, :dummy, "Asked to Create A Table"
+        c.scoreboard :objectives, :add, :craft_table, :trigger, "Creating a Crafting Table"
+        c.scoreboard :objectives, :add, :on_table, :trigger, "Players on a crafting table"
+        c.scoreboard :objectives, :add, :ct_has_block, :dummy, "Crafting Table with block?"
+        c.scoreboard :objectives, :add, :craft_success, :dummy, "Crafting Success:"
+      end
+      def tick(c)
+        #Blocks
+        crafting_table = b('crafting_table')
+        stone = b('stone')
+
+        #Enable the on_table trigger
+        c.scoreboard :players, :enable, s(:a), :on_table
+
+        #Mark all players on a crafting table pattern
+        c.execute s(:a), relative, :detect, coords('~', '~-1', '~'), crafting_table,
+          :execute, sp, relative, :detect, coords('~-1', '~-1', '~'), crafting_table,
+          :execute, sp, relative, :detect, coords('~1', '~-1', '~'), crafting_table,
+          :execute, sp, relative, :detect, coords('~1', '~-1', '~1'), stone,
+          :execute, sp, relative, :detect, coords('~1', '~-1', '~-1'), stone,
+          :execute, sp, relative, :detect, coords('~-1', '~-1', '~-1'), stone,
+          :execute, sp, relative, :detect, coords('~-1', '~-1', '~-1'), stone,
+          :execute, sp, relative, :detect, coords('~', '~-1', '~1'), crafting_table,
+          :execute, sp, relative, :detect, coords('~', '~-1', '~-1'), crafting_table,
+          :trigger, :on_table, :set, 1
+
+        #Set all players who are not on a crafting table pattern to ask again once they are
+        c.scoreboard :players, :set, s(:a, {score_on_table: 0}), :ask_table, 0
+
+        #Get all players who have not been asked yet and are on a crafting table pattern if they want to build a crafting table
+        ask_players = s(:a, {score_on_table_min: 1, score_ask_table: 0})
+        c.scoreboard :players, :enable, ask_players, :craft_table
+        c.tellraw ask_players, {text: "Build a ", extra: [
+          {
+            text: "Crafting Table",
+            color: "yellow",
+            underlined: true,
+            clickEvent: {
+              action: "run_command",
+              value: "/trigger craft_table set 1"
+            }
+          },
+          {
+            text: "?"
+          }
+        ]}.to_json
+
+        #Mark all players who have been asked
+        c.scoreboard :players, :set, ask_players, :ask_table, 1
+
+        #Get a player that is crafting a table
+        player = s(:a, {score_craft_table_min: 1})
+
+        #Tell the player that it is now building the crafting table
+        c.tellraw player, {text: "Now building a ", extra: [
+          {text: "Crafting Table", color: "yellow"},
+          {text: ". Please hold still for a moment..."}
+        ]}.to_json
+
+        player << {c: 1}
+
+        #Create the armorstand
+        c.testfor player do |c|
+          c.summon 'ArmorStand', relative, "{CustomName:CraftingCreator,Invisible:true}"
+        end
+
+        #Teleport the armorstand one block below the player
+        armorstand = s(:e, {name: "CraftingCreator", type: 'ArmorStand'})
+        c.tp armorstand, player
+        c.tp armorstand, "~ ~-1 ~"
+
+        #Remove pattern
+        c.execute armorstand, relative, :fill, "~-1 ~ ~-1 ~1 ~ ~1", b('air'), 'replace'
+
+        #Create blocks for crafting table
+        c.execute armorstand, relative, :setblock, relative, b('dropper'), :replace, "{CustomName:Crafting Table}"
+        c.execute armorstand, relative, :summon, 'ItemFrame', '~ ~ ~-1', "{Facing:2,Item:{id:\"crafting_table\"}}"
+        c.execute armorstand, relative, :summon, 'ItemFrame', '~ ~ ~1', "{Facing:4,Item:{id:\"crafting_table\"}}"
+
+        #Reset scores for creating crafting table
+        c.scoreboard :players, :reset, player, :craft_table
+        c.scoreboard :players, :set, s(:a), :on_table, 0
+
+        #Find Stale Crafting Tables
+        crafting_tables = s(:e, {name: "CraftingTable", type: "ArmorStand"})
+        c.scoreboard :players, :set, crafting_tables, :ct_has_block, 0
+        c.execute crafting_tables, relative, :detect, relative, b("dropper"),
+          :scoreboard, :players, :set, s_self, :ct_has_block, 1
+
+        #Kill Stale Crafting Tables
+        c.kill s(:e, {score_ct_has_block: 0})
+        @crafting_recipes.map do |recipe|
+          blockItems, resultItems = [recipe[:pattern], recipe[:result]].map do |str|
+            str.split('').each_with_index.map do |letter, i|
+              (item = recipe[letter.to_sym]) ? "{" + item + ",Slot:#{i}b}" : nil
+            end.compact.join(",")
+          end
+          {
+            block: "{" +
+              "Items:[#{blockItems}]," +
+              "CustomName:\"Crafting Table\"" +
+            "}",
+            result: "{" +
+              "Items:[#{resultItems}],"+
+              "CustomName:\"Crafting Table\""+
+            "}"
+          }
+        end.each do |recipe|
+          c.scoreboard :players, :set, crafting_tables, :craft_success, 0
+          c.stats :entity, crafting_tables, :set, :SuccessCount, s_self, :craft_success
+
+          c.execute crafting_tables, relative, :testforblock, relative, 'dropper', 0, recipe[:block]
+
+          success_tables = s(:e, {name: "CraftingTable", type: "ArmorStand", score_craft_success_min: 1})
+
+          c.execute success_tables, relative, :blockdata, relative, recipe[:result]
+
+          c.stats :entity, crafting_tables, :clear, :SuccessCount
+        end
+        c.entitydata armorstand, "{CustomName:CraftingTable}"
+      end
+      def b(*args)
+        Helpers::Block.new(*args)
+      end
+      def e(*args)
+        Helpers::Entity.new(*args)
+      end
+      def s(*args)
+        Helpers::TargetSelector.new(*args)
+      end
+      def sp
+        s :p
+      end
+      def s_self
+        s :e, {r: 0, c: 1}
+      end
+      def coords(*args)
+        Helpers::Coordinates.new(*args)
+      end
+      def relative
+        coords('~', '~', '~')
+      end
+    end
+  end
+end

data/lib/diamond-lang/helpers/target_selector.rb

@@ -9,10 +9,10 @@ module DiamondLang
         @arguments = @arguments.merge arguments
       end
       def to_s
-        if @arguments
-          @variable + "[" + mc_args + "]"
-        else
+        if @arguments.empty?
           @variable
+        else
+          @variable + "[" + mc_args + "]"
         end
       end
       alias inspect to_s

data/lib/diamond-lang/one_command.rb

@@ -17,6 +17,10 @@ module DiamondLang
       @corner1 = coords("~#{@offset.x}", "~#{@offset.y}", "~#{@offset.z}").freeze
       @corner2 = coords("~#{@offset.x._value + @length}", "~#{@offset.y._value + @height}", "~#{@offset.z._value + @width}").freeze
       @surrond = surrond
+
+      @setup_commands = []
+      @tick_commands = []
+      @custom_crafting = nil
     end
     def startup(c)
       c.gamerule(:commandBlockOutput, @output)
@@ -29,9 +33,22 @@ module DiamondLang
     end
     def create_commands(c)
       chain = CommandChain.new self
+      chain.commands.push *@tick_commands
+      if @custom_crafting
+        @custom_crafting.tick chain
+      end
       tick chain
-      commands = chain.commands.map do |command|
-        command.to_block
+      commands = []
+      chain.commands.each do |command|
+        if command.chain
+          command.chain.each do |con_command|
+            con_command = con_command.to_block
+            con_command.conditional = true
+            commands.push command.to_block, con_command
+          end
+        else
+          commands.push command.to_block
+        end
       end
       command_lines = commands.each_slice(@length - 1).each_with_index.map do |line, z|
         direction = z.even? ? 5 : 4
@@ -71,6 +88,7 @@ module DiamondLang
       chain = CommandChain.new self
       startup chain
       setup chain
+      chain.commands.push *@setup_commands
       create_commands chain
       cleanup chain
       chain
@@ -130,5 +148,10 @@ module DiamondLang
         black: 15
       }.freeze[color]
     end
+    def add_crafting(recipes)
+      chain = CommandChain.new self
+      @custom_crafting = Helpers::CustomCrafting.new(chain, recipes)
+      @setup_commands.push *chain.commands
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diamond-lang
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Ben (@penne12_)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2016-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
@@ -154,6 +154,7 @@ files:
 - VERSION
 - diamond-lang.gemspec
 - examples/conveyor.rb
+- examples/custom_crafting.rb
 - examples/hello_world.rb
 - lib/diamond-lang.rb
 - lib/diamond-lang/command_chain.rb
@@ -164,6 +165,7 @@ files:
 - lib/diamond-lang/helpers/constants.rb
 - lib/diamond-lang/helpers/coordinate.rb
 - lib/diamond-lang/helpers/coordinates.rb
+- lib/diamond-lang/helpers/custom_crafting.rb
 - lib/diamond-lang/helpers/entity.rb
 - lib/diamond-lang/helpers/errors/invalid_axis.rb
 - lib/diamond-lang/helpers/errors/invalid_coordinate_value.rb