minecraft 0.0.3 → 0.0.4

data/bin/minecraft

@@ -23,6 +23,7 @@ $opts = Slop.parse :help => true do
   on :x, :max_memory, "Specify the maximum amount of memory to allocate.", :optional => true
   on :no_auto_save,   "Disable auto save."
   on :m, :tempmobs,   "Temporarily toggles mobs."
+  on :r, :rules,      "Specify the server rules.", :optional => true
 end
 
 if $opts.update?
@@ -38,6 +39,6 @@ unless $opts.no_run?
   Minecraft::Tools.check_jarfile
   command = Minecraft::Tools.command($opts)
   puts "[+] #{command}"
-  server = Minecraft::Server.new(command)
+  server = Minecraft::Server.new(command, $opts[:rules])
   server.sin.puts("save-on") unless $opts.no_auto_save?
 end

data/lib/minecraft/commands.rb

@@ -6,7 +6,7 @@ module Minecraft
       item, quantity = items_arg(1, args)
       item = resolve_item(item)
 
-      quantify(user, item, quantity)
+      construct_give(user, item, quantity)
     end
 
     def validate_kit(group = "")
@@ -18,7 +18,7 @@ module Minecraft
     def kit(user, group)
       KITS[group.to_sym].each do |item|
         if item.is_a? Array
-          @server.puts quantify(user, item.first, item.last)
+          @server.puts construct_give(user, item.first, item.last)
         else
           @server.puts "give #{user} #{item} 1"
         end
@@ -37,6 +37,23 @@ module Minecraft
       @server.puts "give #{user} 322 1"
     end
 
+    def property(user, key)
+      @server.puts "say #{key} is currently #{@server_properties[key]}" if @server_properties.include? key
+    end
+
+    def uptime(user, target_user = nil)
+      target_user ||= user
+      time_spent = calculate_uptime(target_user)
+      if @userlog.has_key? target_user
+        total = "  Out of a total of #{format_uptime(@userlog[target_user] + time_spent)} minutes."
+      end
+      @server.puts "say #{target_user} has been online for #{format_uptime(time_spent)} minutes.#{total}"
+    end
+
+    def rules(*args)
+      @server.puts "say #{@rules}"
+    end
+
     def list(user)
       l = @users.inject("") do |s, u|
         if u == user
@@ -83,7 +100,7 @@ say !deltimer item
       @server.puts "say Kits: #{KITS.keys.join(", ")}"
     end
 
-    def quantify(user, item, quantity)
+    def construct_give(user, item, quantity)
       if quantity <= 64
         @server.puts "give #{user} #{item} #{quantity}"
         return
@@ -101,8 +118,8 @@ say !deltimer item
         second = default
         first  = args.first
       else
-        if args.last.to_i.to_s == args.last # Last argument is an integer.
-          second = args.last.to_i
+        if is_quantifier? args.last
+          second = quantify(args.last)
           first  = args[0..-2].join(" ")
         else
           second = default
@@ -137,7 +154,27 @@ say !deltimer item
         end
       end
 
+      @server.puts "say No item #{key} found." if shortest_key.nil?
       return shortest_key
     end
+
+    def is_quantifier?(quantity)
+      quantity.index(/[0-9]+[a-z]?/) == 0
+    end
+
+    def quantify(value)
+      return value.scan(/[0-9]+[a-z]?/).inject(0) do |total, term|
+        quantity, flag = term.match(/([0-9]+)([a-z]?)/)[1..2]
+        quantity = quantity.to_i
+        return total + quantity if flag.nil?
+
+        total + case flag
+        when 'm' then [2560, quantity * 64].min
+        when 'd' then (64.0 / [1, quantity].max).round
+        when 's' then [1, 64 - quantity].max
+        else quantity
+        end
+      end
+    end
   end
 end

data/lib/minecraft/extensions.rb

@@ -4,7 +4,7 @@ module Minecraft
   class Extensions
     include Commands
 
-    def initialize(server)
+    def initialize(server, rules = "No rules specified.")
       @ops = File.readlines("ops.txt").map { |s| s.chomp }
       @userlog = get_user_log
       @users = []
@@ -12,19 +12,24 @@ module Minecraft
       @counter = 0
       @logon_time = {}
       @server = server
+      @rules = rules
+      load_server_properties
 
       # Command set.
       @commands = {}
-      add_command(:give, :ops => true,  :all => true, :all_message => "is putting out.")
-      add_command(:tp,   :ops => false, :all => true, :all_message => "is teleporting all users to their location.")
-      add_command(:kit,  :ops => true,  :all => true, :all_message => "is providing kits to all.")
-      add_command(:help, :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(:give,  :ops => true,  :all => true, :all_message => "is putting out.")
+      add_command(:tp,    :ops => false, :all => true, :all_message => "is teleporting all users to their location.")
+      add_command(:kit,   :ops => true,  :all => true, :all_message => "is providing kits to all.")
+      add_command(:help,  :ops => false, :all => false)
+      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(: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(:kitlist,    :ops => false, :all => false)
+      add_command(:property,   :ops => true,  :all => false)
     end
 
     def get_user_log
@@ -101,17 +106,32 @@ module Minecraft
     end
 
     def meta_check(line)
+      return true if check_kick_ban(line)
       return true if check_ops(line)
       return true if check_join_part(line)
     end
 
+    def remove_user(user)
+      @users.reject! { |u| u.downcase == user.downcase }
+      return true
+    end
+
+    def check_kick_ban(line)
+      user = line.split(" ").last
+      if line.index "Banning"
+        return remove_user(user)
+      elsif line.index "Kicking"
+        return remove_user(user)
+      end
+    end
+
     def check_ops(line)
       user = line.split(" ").last
       if line.index "De-opping"
-        @ops.reject! { |u| u == user }
+        @ops.reject! { |u| u == user.downcase }
         return true
       elsif line.index "Opping"
-        @ops << user
+        @ops << user.downcase
         return true
       end
     end
@@ -119,9 +139,8 @@ module Minecraft
     def check_join_part(line)
       user = line.split(" ").first
       if line.index "lost connection"
-        @users.reject! { |u| u == user }
         log_time(user)
-        return true
+        return remove_user(user)
       elsif line.index "logged in"
         @users << user
         @logon_time[user] = Time.now
@@ -138,17 +157,23 @@ module Minecraft
     end
 
     def log_time(user)
-      logoff = Time.now
-      logon  = @logon_time[user]
-      time_spent = logoff - logon
+      time_spent = calculate_uptime(user)
       @userlog[user] ||= 0
       @userlog[user] += time_spent
-      @server.puts "say #{user} spent #{time_spent} seconds the server, totalling to #{@userlog[user]}."
+      @server.puts "say #{user} spent #{format_uptime(time_spent)} minutes in the server, totalling to #{format_uptime(@userlog[user])}."
       write_log
     end
 
+    def format_uptime(time)
+      (time / 60.0).round(2)
+    end
+
+    def calculate_uptime(user)
+      Time.now - @logon_time[user]
+    end
+
     def is_op?(user)
-      @ops.include? user
+      @ops.include? user.downcase
     end
 
     def validate_ops(user, command)
@@ -159,5 +184,14 @@ module Minecraft
     def invalid_command(command)
       @server.puts "say #{command} is invalid."
     end
+
+    def load_server_properties
+      @server_properties = {}
+      File.readlines("server.properties").each do |line|
+        next if line[0] == "#"
+        key, value = line.split("=")
+        @server_properties[key] = value
+      end
+    end
   end
 end

data/lib/minecraft/server.rb

@@ -4,9 +4,9 @@ module Minecraft
   class Server
     attr_accessor :sin
 
-    def initialize(command)
+    def initialize(command, rules)
       @sin, @sout, @serr = Open3.popen3(command)
-      @extensions = Extensions.new(@sin)
+      @extensions = Extensions.new(@sin, rules)
       threads = []
       threads << Thread.new { loop { @extensions.process(@sout.gets) } }
       threads << Thread.new { loop { @extensions.process(@serr.gets) } }

data/lib/minecraft/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: minecraft
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Andrew Horsman
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-14 00:00:00 -04:00
+date: 2011-08-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency