minecraft 0.0.4 → 0.0.5

data/bin/minecraft

@@ -1,20 +1,9 @@
 #!/usr/bin/env ruby
 
 require "slop"
-require "net/http"
 require "minecraft"
 
-def minecraft_exit
-  if $opts.tempmobs?
-    puts "[+] Restoring previous mob state."
-    Minecraft::Tools.toggle_mobs
-  end
-  exit!
-end
-
-trap("SIGINT") { minecraft_exit }
-
-$opts = Slop.parse :help => true do
+opts = Slop.parse :help => true do
   banner "Usage: minecraft [options]"
 
   on :n, :no_run,     "Don't run the Minecraft server instance."
@@ -24,21 +13,8 @@ $opts = Slop.parse :help => true do
   on :no_auto_save,   "Disable auto save."
   on :m, :tempmobs,   "Temporarily toggles mobs."
   on :r, :rules,      "Specify the server rules.", :optional => true
+  on :f, :savefreq,   "Specify the frequency in seconds to save the server.", :optional => true
+  on :w, :welcome_message, "Specfiy a welcome message to connecting users.", :optional => true
 end
 
-if $opts.update?
-  Minecraft::Tools.download_minecraft
-end
-
-if $opts.tempmobs?
-  puts "[+] Temporarily toggling mobs."
-  Minecraft::Tools.toggle_mobs
-end
-
-unless $opts.no_run?
-  Minecraft::Tools.check_jarfile
-  command = Minecraft::Tools.command($opts)
-  puts "[+] #{command}"
-  server = Minecraft::Server.new(command, $opts[:rules])
-  server.sin.puts("save-on") unless $opts.no_auto_save?
-end
+runtime = Minecraft::Runtime.new(opts)

data/lib/minecraft.rb

@@ -1,8 +1,10 @@
+require "json/pure"
 require "minecraft/tools"
 require "minecraft/data"
 require "minecraft/commands"
 require "minecraft/extensions"
 require "minecraft/server"
+require "minecraft/runtime"
 
 module Minecraft
 end

data/lib/minecraft/commands.rb

@@ -71,7 +71,7 @@ module Minecraft
       item = resolve_item(item)
       @timers[user] ||= {}
       @timers[user][item] = duration
-      @server.puts "say Timer added for #{user}.  Giving #{item} every #{duration} seconds."
+      @server.puts "say Timer added for #{user}.  Giving item id #{item} every #{duration} seconds."
     end
 
     def deltimer(user, *args)
@@ -81,9 +81,39 @@ module Minecraft
     end
 
     def printtimer(user)
+      unless @timers.has_key? user || @timers[user].length == 0
+        @server.puts "say No timers have been added for #{user}."
+        return
+      end
+      @timers[user].each do |item, frequency|
+        @server.puts "say #{item} every #{frequency} seconds."
+      end
+    end
+
+    def printtime(user)
       @server.puts "say Timer is at #{@counter}."
     end
 
+    def s(user, *args)
+      return @server.puts "say You need to specify a shortcut silly!" if args.length == 0
+
+      shortcut_name = args.slice! 0
+      if args.length == 0
+        @server.puts "say #{shortcut_name} is not a valid shortcut for #{user}." unless @shortcuts.has_key? user and @shortcuts[user].has_key? shortcut_name
+        return call_command(user, @shortcuts[user][shortcut_name].first, *@shortcuts[user][shortcut_name][1..-1]) if args.length == 0
+      end
+
+      command_string = args
+      @shortcuts[user] ||= {}
+      @shortcuts[user][shortcut_name] = command_string
+      @server.puts "say Shortcut labelled #{shortcut_name} for #{user} has been added."
+    end
+
+    def shortcuts(user, *args)
+      labels = @shortcuts[user].keys.join(", ") if @shortcuts.has_key? user
+      @server.puts "say Shortcuts for #{user}: #{labels}."
+    end
+
     def help(*args)
       @server.puts <<-eof
 say !tp target_user
@@ -135,9 +165,9 @@ say !deltimer item
 
     def resolve_key(key)
       bucket = key[0]
+      return no_key(key) unless ITEM_BUCKETS.include? bucket
       return key if ITEM_BUCKETS[bucket].include? key
 
-      puts "Finding #{key} approximate in #{ITEM_BUCKETS[bucket]}"
       shortest_diff = nil
       shortest_key  = nil
       ITEM_BUCKETS[bucket].each do |test_key|
@@ -154,10 +184,14 @@ say !deltimer item
         end
       end
 
-      @server.puts "say No item #{key} found." if shortest_key.nil?
+      no_key(key) if shortest_key.nil?
       return shortest_key
     end
 
+    def no_key(key)
+      @server.puts "say No item #{key} found."
+    end
+
     def is_quantifier?(quantity)
       quantity.index(/[0-9]+[a-z]?/) == 0
     end

data/lib/minecraft/data.rb

@@ -1,12 +1,13 @@
 module Minecraft
   module Data
     KITS = {
-      :diamond => [276, 277, 278, 279, 293],
-      :garmour => [314, 315, 316, 317],
-      :armour  => [310, 311, 312, 313],
-      :ranged  => [261, [262, 640]],
-      :nether  => [261, [262, 320], [348, 128], 278, 276],
-      :portal  => [[49, 10], 259]
+      :diamond    => [276, 277, 278, 279, 293],
+      :goldarmour => [314, 315, 316, 317],
+      :armour     => [310, 311, 312, 313],
+      :ranged     => [261, [262, 320]],
+      :nether     => [261, [262, 320], [89, 128], 278, 276],
+      :portal     => [[49, 14], 259],
+      :redstone   => [[331, 256], [356, 64], [69, 64], [77, 64], [70, 64]]
     }
 
     DATA_VALUE_HASH = {

data/lib/minecraft/extensions.rb

@@ -1,20 +1,23 @@
-require "json/pure"
-
 module Minecraft
   class Extensions
     include Commands
 
-    def initialize(server, rules = "No rules specified.")
+    def initialize(server, opts)
       @ops = File.readlines("ops.txt").map { |s| s.chomp }
-      @userlog = get_user_log
+      @userlog = get_json("user.log")
       @users = []
-      @timers = {}
+      @timers = get_json("user_timers.json")
+      @shortcuts = get_json("user_shortcuts.json")
       @counter = 0
       @logon_time = {}
       @server = server
-      @rules = rules
       load_server_properties
 
+      opts = {
+        :rules => "No rules specified."
+      }.merge(opts)
+      opts.each { |k, v| instance_variable_set("@#{k}", v) }
+
       # Command set.
       @commands = {}
       add_command(:give,  :ops => true,  :all => true, :all_message => "is putting out.")
@@ -24,22 +27,34 @@ module Minecraft
       add_command(:rules, :ops => false, :all => false)
       add_command(:nom,   :ops => true,  :all => true, :all_message => "is providing noms to all.")
       add_command(:list,  :ops => false, :all => false)
+      add_command(:s,     :ops => false, :all => false)
       add_command(:uptime,     :ops => false, :all => false)
       add_command(:addtimer,   :ops => true,  :all => false)
       add_command(:deltimer,   :ops => true,  :all => false)
       add_command(:printtimer, :ops => true,  :all => false)
+      add_command(:printtime,  :ops => true,  :all => false)
+      add_command(:shortcuts,  :ops => false, :all => false)
       add_command(:kitlist,    :ops => false, :all => false)
       add_command(:property,   :ops => true,  :all => false)
     end
 
-    def get_user_log
-      if File.exists? "user.log"
-        JSON.parse(File.read("user.log"))
+    def get_json(file)
+      if File.exists? file
+        JSON.parse(File.read(file))
       else
         {}
       end
     end
 
+    def save
+      save_file :timers
+      save_file :shortcuts
+    end
+
+    def save_file(var)
+      File.open("user_#{var}.json", "w") { |f| f.print instance_variable_get("@#{var}").to_json }
+    end
+
     def write_log
       File.open("user.log", "w") { |f| f.print @userlog.to_json }
     end
@@ -83,8 +98,20 @@ module Minecraft
       puts e.backtrace
     end
 
+    def check_save
+      if @savefreq.nil?
+        freq = 30
+      elsif @savefreq == 0
+        return
+      else
+        freq = @savefreq.to_i
+      end
+      @server.puts "save-all" if @counter % freq == 0
+    end
+
     def periodic
       @counter += 1
+      check_save
       @users.each do |user|
         next unless @timers.has_key? user
         @timers[user].each do |item, duration|
@@ -143,6 +170,7 @@ module Minecraft
         return remove_user(user)
       elsif line.index "logged in"
         @users << user
+        display_welcome_message(user)
         @logon_time[user] = Time.now
         return true
       end
@@ -193,5 +221,9 @@ module Minecraft
         @server_properties[key] = value
       end
     end
+
+    def display_welcome_message(user)
+      @server.puts "say #{@welcome_message.gsub('%', user)}" unless @welcome_message.nil?
+    end
   end
 end

data/lib/minecraft/runtime.rb

@@ -0,0 +1,21 @@
+module Minecraft
+  class Runtime
+    def initialize(opts)
+      @opts = opts
+      pre_checks
+
+      Minecraft::Tools.check_jarfile
+      unless @opts.no_run?
+        command = Minecraft::Tools.command(@opts)
+        puts "[+] #{command}"
+        server = Minecraft::Server.new(command, @opts)
+        server.sin.puts("save-on") unless @opts.no_auto_save?
+      end
+    end
+
+    def pre_checks
+      Minecraft::Tools.download_minecraft if @opts.update?
+      puts "[+] Temporarily toggling mobs.  Setting to #{Minecraft::Tools.toggle_mobs}." if @opts.tempmobs?
+    end
+  end
+end

data/lib/minecraft/server.rb

@@ -4,15 +4,29 @@ module Minecraft
   class Server
     attr_accessor :sin
 
-    def initialize(command, rules)
-      @sin, @sout, @serr = Open3.popen3(command)
-      @extensions = Extensions.new(@sin, rules)
-      threads = []
-      threads << Thread.new { loop { @extensions.process(@sout.gets) } }
-      threads << Thread.new { loop { @extensions.process(@serr.gets) } }
-      threads << Thread.new { loop { @extensions.periodic; sleep 1 } }
-      threads << Thread.new { loop { @sin.puts gets } }
-      threads.each(&:join)
+    def initialize(command, opts)
+      @sin, @sout, @serr, @thr = Open3.popen3(command)
+      @extensions = Extensions.new(@sin, opts)
+      @opts = opts
+
+      trap("SIGINT") { minecraft_exit }
+
+      @threads = []
+      @threads << Thread.new { loop { @extensions.process(@sout.gets) } }
+      @threads << Thread.new { loop { @extensions.process(@serr.gets) } }
+      @threads << Thread.new { loop { @extensions.periodic; sleep 1 } }
+      @threads << Thread.new { loop { @sin.puts $stdin.gets } }
+      @thr.value
+      exit!
+    end
+    
+    def minecraft_exit
+      puts "[+] Restoring previous mob state to #{Minecraft::Tools.toggle_mobs}." if @opts.tempmobs?
+      puts "\n[+] Saving..."
+      @extensions.save
+      @threads.each(&:kill)
+      @sin.puts("save-all")
+      @sin.puts("stop")
     end
   end
 end

data/lib/minecraft/tools.rb

@@ -1,3 +1,5 @@
+require "net/http"
+
 module Minecraft
   module Tools
     def self.check_jarfile
@@ -27,6 +29,7 @@ module Minecraft
       content.gsub! "spawn-monsters=#{state}", "spawn-monsters=#{new_state}"
 
       File.open("server.properties", "w") { |f| f.print content }
+      return new_state
     end
   end
 end

data/lib/minecraft/version.rb

@@ -1,3 +1,3 @@
 module Minecraft
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -2,7 +2,7 @@
 name: minecraft
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Andrew Horsman
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-15 00:00:00 -04:00
+date: 2011-08-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,6 +43,7 @@ files:
 - lib/minecraft/commands.rb
 - lib/minecraft/data.rb
 - lib/minecraft/extensions.rb
+- lib/minecraft/runtime.rb
 - lib/minecraft/server.rb
 - lib/minecraft/tools.rb
 - lib/minecraft/version.rb