RubyGems - diamond-lang - Versions diffs - 1.2.0 → 1.2.1 - Mend

diamond-lang 1.2.0 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

checksums.yaml +4 -4
data/README.md +0 -6
data/VERSION +1 -1
data/diamond-lang.gemspec +8 -3
data/examples/conveyor.txt +1 -0
data/examples/custom_crafting.rb +7 -7
data/examples/custom_crafting.txt +1 -0
data/examples/hello_world.rb +0 -58
data/examples/hello_world.txt +1 -0
data/examples/jetpack.rb +32 -0
data/examples/jetpack.txt +1 -0
data/lib/diamond-lang/helpers/custom_crafting.rb +27 -11
metadata +7 -2

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3075c30a0c08b540e5bfacab36b24805454376ff
-  data.tar.gz: df3af1c137c9ecb555391eeb2633caa64d588d05
+  metadata.gz: a90e675e31c6f081f99a84e7a2c724a2e6f5b9fc
+  data.tar.gz: e0343396fc5788d8f40607fc4281e007df655aac
 SHA512:
-  metadata.gz: d08ee782327aff9f96a183d80a04f4edb4ddcaa2400b3beddec5f43f11814d146936e6d849a7d8ae4064d35a230eeef3a73a9ddd59217ffc5ef1893137f2e21f
-  data.tar.gz: 7bb9541370b490cebfc9a6fba68ea2bb9310e2587db284d120f5c870c07ab0f4587f16ffee309130f309ef524f747501faecfb251047a6efd0fca1737c93e8e6
+  metadata.gz: 0c3a4993ec8c5a693d5f092e181f116ed611ff743d7ef807c6a999d4286d2a5ac8e0ca0c6e6698e7d8a68fa63559c38e1e722bee46108a7cbb1e5b462b2d7272
+  data.tar.gz: 78251e3c4a1e8b516efc5a4a36c42f824f9a8abf522e73902a583c432d291c6d0781cc22bb0d027c2eb9d6acfaedd25eee68b947996dc6123f39579b36ecbd01

data/README.md CHANGED

@@ -173,12 +173,6 @@ c.test_for close_players do |c|
 end #=> @a[r=10]
 ~~~
-hashes instead of arrays (we flatten the command arguments)
-~~~rb
-c.tell penne12: 'something' #=> tell penne12 something
-~~~
 string interpolation:
 ~~~rb

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 1.2.0
1	+ 1.2.1

data/diamond-lang.gemspec CHANGED

@@ -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.2.0 ruby lib
+# stub: diamond-lang 1.2.1 ruby lib
 Gem::Specification.new do |s|
   s.name = "diamond-lang"
-  s.version = "1.2.0"
+  s.version = "1.2.1"
   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 = "2016-01-01"
+  s.date = "2016-01-02"
   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,8 +28,13 @@ Gem::Specification.new do |s|
     "VERSION",
     "diamond-lang.gemspec",
     "examples/conveyor.rb",
+    "examples/conveyor.txt",
     "examples/custom_crafting.rb",
+    "examples/custom_crafting.txt",
     "examples/hello_world.rb",
+    "examples/hello_world.txt",
+    "examples/jetpack.rb",
+    "examples/jetpack.txt",
     "lib/diamond-lang.rb",
     "lib/diamond-lang/command_chain.rb",
     "lib/diamond-lang/helpers/block.rb",

data/examples/conveyor.txt ADDED

@@ -0,0 +1 @@

data/examples/custom_crafting.rb CHANGED

@@ -3,7 +3,7 @@ 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
+    c.title s(:a), :title, {"text " => "Custom Crafting"}.to_json
     add_crafting([
       {
         pattern:  "  s"+
@@ -12,9 +12,9 @@ class CustomCrafting < DiamondLang::OneCommand
         result: "   "+
                 " n "+
                 "   ",
-        n: "id:\"minecraft:name_tag\",Count:1b",
-        s: "id:\"minecraft:string\",Count:1b",
-        p: "id:\"minecraft:paper\",Count:1b"
+        n: 'id:"minecraft:name_tag",Count:1b',
+        s: 'id:"minecraft:string",Count:1b',
+        p: 'id:"minecraft:paper",Count:1b'
       },
       {
         pattern:  "bbb"+
@@ -22,9 +22,9 @@ class CustomCrafting < DiamondLang::OneCommand
                   "bbb",
         result: "   "+
                 " s ",
-        b: "id:\"minecraft:iron_bars\",Count:1b",
-        p: "id:\"minecraft:porkchop\",Count:64b",
-        s: "id:\"minecraft:mob_spawner\",Count:1b"
+        b: 'id:"minecraft:iron_bars",Count:1b',
+        p: 'id:"minecraft:porkchop",Count:64b',
+        s: 'id:"minecraft:mob_spawner",Count:1b'
       }
     ])
   end

data/examples/custom_crafting.txt ADDED

@@ -0,0 +1 @@

+ summon FallingSand ~0 ~1 ~0 {Block:"redstone_block",Time:1,Data:0,Passengers:[{Block:"activator_rail",Time:1,Data:0,Passengers:[{Command:"gamerule commandBlockOutput false",id:"MinecartCommandBlock"},{Command:"fill ~2 ~2 ~0 ~8 ~7 ~5 stained_hardened_clay 13 hollow",id:"MinecartCommandBlock"},{Command:"title @a subtitle {\"text\":\"command by Ben from bensites.com\"}",id:"MinecartCommandBlock"},{Command:"title @a title {\"text\":\"Custom Crafting\"}",id:"MinecartCommandBlock"},{Command:"scoreboard objectives add ask_table dummy Asked to Create A Table",id:"MinecartCommandBlock"},{Command:"scoreboard objectives add craft_table trigger Creating a Crafting Table",id:"MinecartCommandBlock"},{Command:"scoreboard objectives add on_table trigger Players on a crafting table",id:"MinecartCommandBlock"},{Command:"scoreboard objectives add ct_has_block dummy Crafting Table with block?",id:"MinecartCommandBlock"},{Command:"scoreboard objectives add craft_success dummy Crafting Success:",id:"MinecartCommandBlock"},{Command:"setblock ~3 ~3 ~1 repeating_command_block 5 replace {Command:\"call\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~4 ~3 ~1 chain_command_block 5 replace {Command:\"scoreboard players enable @a on_table\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~5 ~3 ~1 chain_command_block 5 replace {Command:\"execute @a ~0 ~0 ~0 detect ~0 ~-1 ~0 crafting_table 0 execute @p ~0 ~0 ~0 detect ~-1 ~-1 ~0 crafting_table 0 execute @p ~0 ~0 ~0 detect ~1 ~-1 ~0 crafting_table 0 execute @p ~0 ~0 ~0 detect ~1 ~-1 ~1 stone 0 execute @p ~0 ~0 ~0 detect ~1 ~-1 ~-1 stone 0 execute @p ~0 ~0 ~0 detect ~-1 ~-1 ~-1 stone 0 execute @p ~0 ~0 ~0 detect ~-1 ~-1 ~1 stone 0 execute @p ~0 ~0 ~0 detect ~0 ~-1 ~1 crafting_table 0 execute @p ~0 ~0 ~0 detect ~0 ~-1 ~-1 crafting_table 0 trigger on_table set 1\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~6 ~3 ~1 chain_command_block 5 replace {Command:\"scoreboard players set @a[score_on_table=0] ask_table 0\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~7 ~3 ~1 chain_command_block 3 replace {Command:\"scoreboard players enable @a[score_on_table_min=1,score_ask_table=0] craft_table\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~3 ~3 ~2 chain_command_block 3 replace {Command:\"tellraw @a[score_craft_table_min=1,score_on_table_min=1,c=1] {\\\"text\\\":\\\"Now building a \\\",\\\"extra\\\":[{\\\"text\\\":\\\"Crafting Table\\\",\\\"color\\\":\\\"yellow\\\"},{\\\"text\\\":\\\". Please hold still for a moment...\\\"}]}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~4 ~3 ~2 chain_command_block 4 replace {Command:\"scoreboard players set @a[score_on_table_min=1,score_ask_table=0] ask_table 1\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~5 ~3 ~2 chain_command_block 4 replace {Command:\"scoreboard players set @a[score_craft_table_min=1,score_on_table=0] craft_table 0\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~6 ~3 ~2 chain_command_block 4 replace {Command:\"tellraw @a[score_craft_table_min=1,score_on_table=0] {\\\"text\\\":\\\"Please stand on the \\\",\\\"extra\\\":[{\\\"text\\\":\\\"Crafting Table Pattern\\\",\\\"color\\\":\\\"yellow\\\"},{\\\"text\\\":\\\" in order to build the \\\"},{\\\"text\\\":\\\"Crafting Table\\\",\\\"color\\\":\\\"yellow\\\"},{\\\"text\\\":\\\".\\\"}]}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~7 ~3 ~2 chain_command_block 4 replace {Command:\"tellraw @a[score_on_table_min=1,score_ask_table=0] {\\\"text\\\":\\\"Build a \\\",\\\"extra\\\":[{\\\"text\\\":\\\"Crafting Table\\\",\\\"color\\\":\\\"yellow\\\",\\\"underlined\\\":true,\\\"clickEvent\\\":{\\\"action\\\":\\\"run_command\\\",\\\"value\\\":\\\"/trigger craft_table set 1\\\"}},{\\\"text\\\":\\\"?\\\"}]}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~3 ~3 ~3 chain_command_block 5 replace {Command:\"testfor @a[score_craft_table_min=1,score_on_table_min=1,c=1]\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~4 ~3 ~3 chain_command_block 13 replace {Command:\"summon ArmorStand ~0 ~0 ~0 {CustomName:\\\"CraftingCreator\\\",Invisible:1b,Invulnerable:1b,PersistenceRequired:1b,NoGravity:1b,Small:1b}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~5 ~3 ~3 chain_command_block 5 replace {Command:\"tp @e[name=CraftingCreator,type=ArmorStand] @a[score_craft_table_min=1,score_on_table_min=1,c=1]\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~6 ~3 ~3 chain_command_block 5 replace {Command:\"tp @e[name=CraftingCreator,type=ArmorStand] ~ ~-1 ~\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~7 ~3 ~3 chain_command_block 3 replace {Command:\"execute @e[name=CraftingCreator,type=ArmorStand] ~0 ~0 ~0 fill ~-1 ~ ~-1 ~1 ~ ~1 air 0 replace\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~3 ~3 ~4 chain_command_block 1 replace {Command:\"scoreboard players set @a on_table 0\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~4 ~3 ~4 chain_command_block 4 replace {Command:\"scoreboard players reset @a[score_craft_table_min=1,score_on_table_min=1,c=1] craft_table\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~5 ~3 ~4 chain_command_block 4 replace {Command:\"execute @e[name=CraftingCreator,type=ArmorStand] ~0 ~0 ~0 summon ItemFrame ~ ~ ~1 {Facing:4,Item:{id:\\\"crafting_table\\\"}}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~6 ~3 ~4 chain_command_block 4 replace {Command:\"execute @e[name=CraftingCreator,type=ArmorStand] ~0 ~0 ~0 summon ItemFrame ~ ~ ~-1 {Facing:2,Item:{id:\\\"crafting_table\\\"}}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~7 ~3 ~4 chain_command_block 4 replace {Command:\"execute @e[name=CraftingCreator,type=ArmorStand] ~0 ~0 ~0 setblock ~0 ~0 ~0 dropper 0 replace {CustomName:Crafting Table}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~3 ~4 ~2 chain_command_block 5 replace {Command:\"stats entity @e[name=CraftingTable,type=ArmorStand] set SuccessCount @e[r=0,c=1] craft_success\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~4 ~4 ~2 chain_command_block 5 replace {Command:\"execute @e[name=CraftingTable,type=ArmorStand] ~0 ~0 ~0 testforblock ~0 ~0 ~0 dropper 0 {Items:[{id:\\\"minecraft:iron_bars\\\",Count:1b,Slot:0b},{id:\\\"minecraft:iron_bars\\\",Count:1b,Slot:1b},{id:\\\"minecraft:iron_bars\\\",Count:1b,Slot:2b},{id:\\\"minecraft:iron_bars\\\",Count:1b,Slot:3b},{id:\\\"minecraft:porkchop\\\",Count:64b,Slot:4b},{id:\\\"minecraft:iron_bars\\\",Count:1b,Slot:5b},{id:\\\"minecraft:iron_bars\\\",Count:1b,Slot:6b},{id:\\\"minecraft:iron_bars\\\",Count:1b,Slot:7b},{id:\\\"minecraft:iron_bars\\\",Count:1b,Slot:8b}],CustomName:\\\"Crafting Table\\\"}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~5 ~4 ~2 chain_command_block 5 replace {Command:\"execute @e[name=CraftingTable,type=ArmorStand,score_craft_success_min=1] ~0 ~0 ~0 blockdata ~0 ~0 ~0 {Items:[{id:\\\"minecraft:mob_spawner\\\",Count:1b,Slot:4b}],CustomName:\\\"Crafting Table\\\"}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~6 ~4 ~2 chain_command_block 5 replace {Command:\"stats entity @e[name=CraftingTable,type=ArmorStand] clear SuccessCount\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~7 ~4 ~2 chain_command_block 1 replace {Command:\"entitydata @e[name=CraftingCreator,type=ArmorStand] {CustomName:CraftingTable}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~3 ~4 ~3 chain_command_block 2 replace {Command:\"scoreboard players set @e[name=CraftingTable,type=ArmorStand] craft_success 0\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~4 ~4 ~3 chain_command_block 4 replace {Command:\"stats entity @e[name=CraftingTable,type=ArmorStand] clear SuccessCount\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~5 ~4 ~3 chain_command_block 4 replace {Command:\"execute @e[name=CraftingTable,type=ArmorStand,score_craft_success_min=1] ~0 ~0 ~0 blockdata ~0 ~0 ~0 {Items:[{id:\\\"minecraft:name_tag\\\",Count:1b,Slot:4b}],CustomName:\\\"Crafting Table\\\"}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~6 ~4 ~3 chain_command_block 4 replace {Command:\"execute @e[name=CraftingTable,type=ArmorStand] ~0 ~0 ~0 testforblock ~0 ~0 ~0 dropper 0 {Items:[{id:\\\"minecraft:string\\\",Count:1b,Slot:2b},{id:\\\"minecraft:paper\\\",Count:1b,Slot:4b},{id:\\\"minecraft:paper\\\",Count:1b,Slot:6b}],CustomName:\\\"Crafting Table\\\"}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~7 ~4 ~3 chain_command_block 4 replace {Command:\"stats entity @e[name=CraftingTable,type=ArmorStand] set SuccessCount @e[r=0,c=1] craft_success\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~3 ~4 ~4 chain_command_block 5 replace {Command:\"scoreboard players set @e[name=CraftingTable,type=ArmorStand] ct_has_block 0\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~4 ~4 ~4 chain_command_block 5 replace {Command:\"execute @e[name=CraftingTable,type=ArmorStand] ~0 ~0 ~0 detect ~0 ~0 ~0 dropper 0 scoreboard players set @e[name=CraftingTable,type=ArmorStand,c=1,r=0] ct_has_block 1\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~5 ~4 ~4 chain_command_block 5 replace {Command:\"execute @e[name=CraftingTable,type=ArmorStand,score_ct_has_block=0] ~0 ~0 ~0 tellraw @a[r=5] {\\\"text\\\":\\\"You destroyed the \\\",\\\"extra\\\":[{\\\"text\\\":\\\"Crafting Table\\\",\\\"color\\\":\\\"yellow\\\"},{\\\"text\\\":\\\".\\\"}]}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~6 ~4 ~4 chain_command_block 5 replace {Command:\"kill @e[name=CraftingTable,type=ArmorStand,score_ct_has_block=0]\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~7 ~4 ~4 chain_command_block 2 replace {Command:\"scoreboard players set @e[name=CraftingTable,type=ArmorStand] craft_success 0\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~ ~ ~1 command_block 0 replace {Command:fill ~ ~-1 ~-1 ~ ~ ~ air}",id:"MinecartCommandBlock"},{Command:"setblock ~ ~-1 ~1 redstone_block",id:"MinecartCommandBlock"},{Command:"kill @e[r=1,type=MinecartCommandBlock]",id:"MinecartCommandBlock"}],id:"FallingSand"}]}

data/examples/hello_world.rb CHANGED

@@ -1,61 +1,3 @@
-=begin
-/summon FallingSand ~ ~1 ~
-{
-  Block:stone,
-  Time:1, Passengers:[
-    {
-      id:FallingSand,
-      Block:redstone_block,
-      Time:1,
-      Passengers:[
-        {
-          id:FallingSand,
-          Block:activator_rail,
-          Time:1,
-          Passengers:[
-            {
-              id:MinecartCommandBlock,
-              Command: gamerule commandBlockOutput false
-            },
-            {
-              id:MinecartCommandBlock,
-              Command: "fill ~2 ~-3 ~-1 ~4 ~-1 ~1 stained_hardened_clay 13 hollow"
-            },
-            {
-              id:MinecartCommandBlock,
-              Command:"fill ~2 ~-2 ~-1 ~4 ~-2 ~1 stained_glass 12 replace stained_hardened_clay"
-            },
-            {
-              id:MinecartCommandBlock,
-              Command:"scoreboard objectives add IqWApo_I dummy"
-            },
-            {
-              id:MinecartCommandBlock,
-              Command:setblock ~3 ~-2 ~ repeating_command_block 5 replace {
-                auto:1,Command:"say Hello World"
-              }
-            },
-            {
-              id:MinecartCommandBlock,
-              Command:setblock ~ ~ ~1 command_block 0 replace {
-                Command:fill ~ ~-3 ~-1 ~ ~ ~ air
-              }
-            },
-            {
-              id:MinecartCommandBlock,
-              Command:setblock ~ ~-1 ~1 redstone_block
-            },
-            {
-              id:MinecartCommandBlock,
-              Command:kill @e[type=MinecartCommandBlock,r=1]
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
-=end
 require 'diamond-lang'
 class HelloWorld < DiamondLang::OneCommand

data/examples/hello_world.txt ADDED

@@ -0,0 +1 @@

data/examples/jetpack.rb ADDED

@@ -0,0 +1,32 @@
+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 " => "Jetpack"}.to_json
+    @jetpack = 'id:"minecraft:elytra",Count:1b,tag:{display:{Name:Jetpack,Lore:[A jetpack that,lets you fly!]}}'
+    add_crafting([
+      {
+        pattern:  "rrr"+
+                  "rer"+
+                  "fff",
+        result: "   "+
+                " j "+
+                "   ",
+        r: 'id:"minecraft:redstone",Count:1b',
+        e: 'id:"minecraft:elytra",Count:1b',
+        f: 'id:"minecraft:fire_charge",Count:1b',
+        j: @jetpack
+      }
+    ])
+    c.scoreboard :objectives, :add, :jetpack, :dummy, "Is holding a jetpack."
+  end
+  def tick(c)
+    c.scoreboard :players, :set, s(:a), :jetpack, 0
+    c.scoreboard :players, :set, s(:a), :jetpack, 1, "{SelectedItem:{#{@jetpack}}}"
+    c.effect s(:a, {score_jetpack_min: 1}), "minecraft:levitation", 1, 10
+  end
+end
+CustomCrafting.create

data/examples/jetpack.txt ADDED

@@ -0,0 +1 @@

+ summon FallingSand ~0 ~1 ~0 {Block:"redstone_block",Time:1,Data:0,Passengers:[{Block:"activator_rail",Time:1,Data:0,Passengers:[{Command:"gamerule commandBlockOutput false",id:"MinecartCommandBlock"},{Command:"fill ~2 ~2 ~0 ~8 ~7 ~5 stained_hardened_clay 13 hollow",id:"MinecartCommandBlock"},{Command:"title @a subtitle {\"text\":\"command by Ben from bensites.com\"}",id:"MinecartCommandBlock"},{Command:"title @a title {\"text\":\"Jetpack\"}",id:"MinecartCommandBlock"},{Command:"scoreboard objectives add jetpack dummy Is holding a jetpack.",id:"MinecartCommandBlock"},{Command:"scoreboard objectives add ask_table dummy Asked to Create A Table",id:"MinecartCommandBlock"},{Command:"scoreboard objectives add craft_table trigger Creating a Crafting Table",id:"MinecartCommandBlock"},{Command:"scoreboard objectives add on_table trigger Players on a crafting table",id:"MinecartCommandBlock"},{Command:"scoreboard objectives add ct_has_block dummy Crafting Table with block?",id:"MinecartCommandBlock"},{Command:"scoreboard objectives add craft_success dummy Crafting Success:",id:"MinecartCommandBlock"},{Command:"setblock ~3 ~3 ~1 repeating_command_block 5 replace {Command:\"call\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~4 ~3 ~1 chain_command_block 5 replace {Command:\"scoreboard players enable @a on_table\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~5 ~3 ~1 chain_command_block 5 replace {Command:\"execute @a ~0 ~0 ~0 detect ~0 ~-1 ~0 crafting_table 0 execute @p ~0 ~0 ~0 detect ~-1 ~-1 ~0 crafting_table 0 execute @p ~0 ~0 ~0 detect ~1 ~-1 ~0 crafting_table 0 execute @p ~0 ~0 ~0 detect ~1 ~-1 ~1 stone 0 execute @p ~0 ~0 ~0 detect ~1 ~-1 ~-1 stone 0 execute @p ~0 ~0 ~0 detect ~-1 ~-1 ~-1 stone 0 execute @p ~0 ~0 ~0 detect ~-1 ~-1 ~1 stone 0 execute @p ~0 ~0 ~0 detect ~0 ~-1 ~1 crafting_table 0 execute @p ~0 ~0 ~0 detect ~0 ~-1 ~-1 crafting_table 0 trigger on_table set 1\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~6 ~3 ~1 chain_command_block 5 replace {Command:\"scoreboard players set @a[score_on_table=0] ask_table 0\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~7 ~3 ~1 chain_command_block 3 replace {Command:\"scoreboard players enable @a[score_on_table_min=1,score_ask_table=0] craft_table\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~3 ~3 ~2 chain_command_block 3 replace {Command:\"tellraw @a[score_craft_table_min=1,score_on_table_min=1,c=1] {\\\"text\\\":\\\"Now building a \\\",\\\"extra\\\":[{\\\"text\\\":\\\"Crafting Table\\\",\\\"color\\\":\\\"yellow\\\"},{\\\"text\\\":\\\". Please hold still for a moment...\\\"}]}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~4 ~3 ~2 chain_command_block 4 replace {Command:\"scoreboard players set @a[score_on_table_min=1,score_ask_table=0] ask_table 1\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~5 ~3 ~2 chain_command_block 4 replace {Command:\"scoreboard players set @a[score_craft_table_min=1,score_on_table=0] craft_table 0\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~6 ~3 ~2 chain_command_block 4 replace {Command:\"tellraw @a[score_craft_table_min=1,score_on_table=0] {\\\"text\\\":\\\"Please stand on the \\\",\\\"extra\\\":[{\\\"text\\\":\\\"Crafting Table Pattern\\\",\\\"color\\\":\\\"yellow\\\"},{\\\"text\\\":\\\" in order to build the \\\"},{\\\"text\\\":\\\"Crafting Table\\\",\\\"color\\\":\\\"yellow\\\"},{\\\"text\\\":\\\".\\\"}]}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~7 ~3 ~2 chain_command_block 4 replace {Command:\"tellraw @a[score_on_table_min=1,score_ask_table=0] {\\\"text\\\":\\\"Build a \\\",\\\"extra\\\":[{\\\"text\\\":\\\"Crafting Table\\\",\\\"color\\\":\\\"yellow\\\",\\\"underlined\\\":true,\\\"clickEvent\\\":{\\\"action\\\":\\\"run_command\\\",\\\"value\\\":\\\"/trigger craft_table set 1\\\"}},{\\\"text\\\":\\\"?\\\"}]}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~3 ~3 ~3 chain_command_block 5 replace {Command:\"testfor @a[score_craft_table_min=1,score_on_table_min=1,c=1]\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~4 ~3 ~3 chain_command_block 13 replace {Command:\"summon ArmorStand ~0 ~0 ~0 {CustomName:\\\"CraftingCreator\\\",Invisible:1b,Invulnerable:1b,PersistenceRequired:1b,NoGravity:1b,Small:1b}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~5 ~3 ~3 chain_command_block 5 replace {Command:\"tp @e[name=CraftingCreator,type=ArmorStand] @a[score_craft_table_min=1,score_on_table_min=1,c=1]\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~6 ~3 ~3 chain_command_block 5 replace {Command:\"tp @e[name=CraftingCreator,type=ArmorStand] ~ ~-1 ~\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~7 ~3 ~3 chain_command_block 3 replace {Command:\"execute @e[name=CraftingCreator,type=ArmorStand] ~0 ~0 ~0 fill ~-1 ~ ~-1 ~1 ~ ~1 air 0 replace\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~3 ~3 ~4 chain_command_block 1 replace {Command:\"scoreboard players set @a on_table 0\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~4 ~3 ~4 chain_command_block 4 replace {Command:\"scoreboard players reset @a[score_craft_table_min=1,score_on_table_min=1,c=1] craft_table\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~5 ~3 ~4 chain_command_block 4 replace {Command:\"execute @e[name=CraftingCreator,type=ArmorStand] ~0 ~0 ~0 summon ItemFrame ~ ~ ~1 {Facing:4,Item:{id:\\\"crafting_table\\\"}}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~6 ~3 ~4 chain_command_block 4 replace {Command:\"execute @e[name=CraftingCreator,type=ArmorStand] ~0 ~0 ~0 summon ItemFrame ~ ~ ~-1 {Facing:2,Item:{id:\\\"crafting_table\\\"}}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~7 ~3 ~4 chain_command_block 4 replace {Command:\"execute @e[name=CraftingCreator,type=ArmorStand] ~0 ~0 ~0 setblock ~0 ~0 ~0 dropper 0 replace {CustomName:Crafting Table}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~3 ~4 ~2 chain_command_block 5 replace {Command:\"scoreboard players set @a jetpack 0\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~4 ~4 ~2 chain_command_block 5 replace {Command:\"scoreboard players set @a jetpack 1 {SelectedItem:{id:\\\"minecraft:elytra\\\",Count:1b,tag:{display:{Name:Jetpack,Lore:[A jetpack that,lets you fly!]}}}}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~5 ~4 ~2 chain_command_block 1 replace {Command:\"effect @a[score_jetpack_min=1] minecraft:levitation 1 10\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~3 ~4 ~3 chain_command_block 2 replace {Command:\"entitydata @e[name=CraftingCreator,type=ArmorStand] {CustomName:CraftingTable}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~4 ~4 ~3 chain_command_block 4 replace {Command:\"stats entity @e[name=CraftingTable,type=ArmorStand] clear SuccessCount\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~5 ~4 ~3 chain_command_block 4 replace {Command:\"execute @e[name=CraftingTable,type=ArmorStand,score_craft_success_min=1] ~0 ~0 ~0 blockdata ~0 ~0 ~0 {Items:[{id:\\\"minecraft:elytra\\\",Count:1b,tag:{display:{Name:Jetpack,Lore:[A jetpack that,lets you fly!]}},Slot:4b}],CustomName:\\\"Crafting Table\\\"}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~6 ~4 ~3 chain_command_block 4 replace {Command:\"execute @e[name=CraftingTable,type=ArmorStand] ~0 ~0 ~0 testforblock ~0 ~0 ~0 dropper 0 {Items:[{id:\\\"minecraft:redstone\\\",Count:1b,Slot:0b},{id:\\\"minecraft:redstone\\\",Count:1b,Slot:1b},{id:\\\"minecraft:redstone\\\",Count:1b,Slot:2b},{id:\\\"minecraft:redstone\\\",Count:1b,Slot:3b},{id:\\\"minecraft:elytra\\\",Count:1b,Slot:4b},{id:\\\"minecraft:redstone\\\",Count:1b,Slot:5b},{id:\\\"minecraft:fire_charge\\\",Count:1b,Slot:6b},{id:\\\"minecraft:fire_charge\\\",Count:1b,Slot:7b},{id:\\\"minecraft:fire_charge\\\",Count:1b,Slot:8b}],CustomName:\\\"Crafting Table\\\"}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~7 ~4 ~3 chain_command_block 4 replace {Command:\"stats entity @e[name=CraftingTable,type=ArmorStand] set SuccessCount @e[r=0,c=1] craft_success\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~3 ~4 ~4 chain_command_block 5 replace {Command:\"scoreboard players set @e[name=CraftingTable,type=ArmorStand] ct_has_block 0\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~4 ~4 ~4 chain_command_block 5 replace {Command:\"execute @e[name=CraftingTable,type=ArmorStand] ~0 ~0 ~0 detect ~0 ~0 ~0 dropper 0 scoreboard players set @e[name=CraftingTable,type=ArmorStand,c=1,r=0] ct_has_block 1\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~5 ~4 ~4 chain_command_block 5 replace {Command:\"execute @e[name=CraftingTable,type=ArmorStand,score_ct_has_block=0] ~0 ~0 ~0 tellraw @a[r=5] {\\\"text\\\":\\\"You destroyed the \\\",\\\"extra\\\":[{\\\"text\\\":\\\"Crafting Table\\\",\\\"color\\\":\\\"yellow\\\"},{\\\"text\\\":\\\".\\\"}]}\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~6 ~4 ~4 chain_command_block 5 replace {Command:\"kill @e[name=CraftingTable,type=ArmorStand,score_ct_has_block=0]\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~7 ~4 ~4 chain_command_block 2 replace {Command:\"scoreboard players set @e[name=CraftingTable,type=ArmorStand] craft_success 0\",auto:true}",id:"MinecartCommandBlock"},{Command:"setblock ~ ~ ~1 command_block 0 replace {Command:fill ~ ~-1 ~-1 ~ ~ ~ air}",id:"MinecartCommandBlock"},{Command:"setblock ~ ~-1 ~1 redstone_block",id:"MinecartCommandBlock"},{Command:"kill @e[r=1,type=MinecartCommandBlock]",id:"MinecartCommandBlock"}],id:"FallingSand"}]}

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

@@ -36,7 +36,7 @@ module DiamondLang
         c.scoreboard :objectives, :add, :craft_success, :dummy, "Crafting Success:"
       end
       def tick(c)
-        #Blocks
+        c.()
         crafting_table = b('crafting_table')
         stone = b('stone')
@@ -50,7 +50,7 @@ module DiamondLang
           :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', '~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
@@ -76,11 +76,21 @@ module DiamondLang
           }
         ]}.to_json
+        invalid_players = s(:a, {score_craft_table_min: 1, score_on_table: 0})
+        c.tellraw invalid_players, {text: "Please stand on the ", extra: [
+          {text: "Crafting Table Pattern", color: "yellow"},
+          {text: " in order to build the "},
+          {text: "Crafting Table", color: "yellow"},
+          {text: "."}
+        ]}.to_json
+        c.scoreboard :players, :set, invalid_players, :craft_table, 0
         #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})
+        player = s(:a, {score_craft_table_min: 1, score_on_table_min: 1, c: 1})
         #Tell the player that it is now building the crafting table
         c.tellraw player, {text: "Now building a ", extra: [
@@ -88,11 +98,8 @@ module DiamondLang
           {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}"
+          c.summon 'ArmorStand', relative, "{CustomName:\"CraftingCreator\",Invisible:1b,Invulnerable:1b,PersistenceRequired:1b,NoGravity:1b,Small:1b}"
         end
         #Teleport the armorstand one block below the player
@@ -110,16 +117,25 @@ module DiamondLang
         #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})
+          :scoreboard, :players, :set, s(:e, {name: "CraftingTable", type: "ArmorStand", c: 1, r: 0}), :ct_has_block, 1
+        stale_crafting_tables = s(:e, {name: "CraftingTable", type: "ArmorStand", score_ct_has_block: 0})
+        c.execute stale_crafting_tables, relative, :tellraw, s(:a, {r: 5}), {
+          text: "You destroyed the ", extra: [
+            {text: "Crafting Table", color: "yellow"},
+            {text: "."}
+          ]
+        }.to_json
+        c.kill stale_crafting_tables
+        #Add Recipes
         @crafting_recipes.map do |recipe|
           blockItems, resultItems = [recipe[:pattern], recipe[:result]].map do |str|
             str.split('').each_with_index.map do |letter, i|

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diamond-lang
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ben (@penne12_)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-01 00:00:00.000000000 Z
+date: 2016-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
@@ -154,8 +154,13 @@ files:
 - VERSION
 - diamond-lang.gemspec
 - examples/conveyor.rb
+- examples/conveyor.txt
 - examples/custom_crafting.rb
+- examples/custom_crafting.txt
 - examples/hello_world.rb
+- examples/hello_world.txt
+- examples/jetpack.rb
+- examples/jetpack.txt
 - lib/diamond-lang.rb
 - lib/diamond-lang/command_chain.rb
 - lib/diamond-lang/helpers/block.rb