minecraft 0.1.0 → 0.2.0

data/CHANGES.md

@@ -1,3 +1,25 @@
+0.2.0 (2011-08-21)
+------------------
+
+* Added configuration file capability.
+* Added `!points`, `!board`, `!kickvote`, `!vote`, `!cancelvote`, `!kickvotes`, `!roulette`, `change_time`, `!om`, `!dehop`, `!op`
+* Added time changes (morning, night, dawn, etc...)
+* Separated half-op and op privileges.
+* `!property` now lists properties if none specified.
+* Bugfix for `all` style commands (makes sure `:all => true`) is specified.
+* `switch` is an alias for `lever`
+* Refactored file saving/loading.
+* Bugfix for default CLI options.
+* Now saves instance files as well as executes `save-all` periodically.
+* Bugfix for `uptime` stuff, offline users now can be computed.
+
+0.1.0 (2011-08-20)
+------------------
+
+* Added yadocs.
+* Updated README.
+* Added test suites.
+
 0.0.5 (2011-08-17)
 ------------------
 

data/README.md

@@ -44,7 +44,8 @@ Please refer to `Minecraft::Extensions#initialize`.
     !printtimer                   # Print timers of the user.
     !printtime                    # Print the current counter time.
     !list                         # List the connected users, notes ops.
-    !property                     # Check a server property (!property spawn-monsters).
+    !property <key>               # Check a server property by key.
+    !property                     # List server properties available.
     !s <label> <command>          # Associates a command to a shortcut label for the user.
     !s <label>                    # Runs the command with the associated label.
     !shortcuts                    # Lists the users shortcuts.
@@ -52,6 +53,23 @@ Please refer to `Minecraft::Extensions#initialize`.
     !uptime <user>                # Prints the uptime of the given user.
     !uptime                       # Prints the uptime of the current user.
     !help                         # Outputs the help contents.
+    !hop <user>                   # Give a user half-op privileges.
+    !dehop <user>                 # Remove a users half-op privileges.
+    !morning                      # Change time of day to morning.
+    !evening                      # Change time of day to evening.
+    !day                          # Change time of day to daytime.
+    !night                        # Change time of day to night.
+    !dawn                         # Change time of day to dawn.
+    !dusk                         # Change time of day to dusk.
+    !roulette                     # Kick a random person, person requesting has a higher chance.
+    !kickvote <user>              # Initiate or vote for a kickvote against a user.
+    !kickvote                     # Vote to kick the last initiated user.
+    !vote                         # Vote to kick the last initiated user.
+    !cancelvote <user>            # Cancel to kickvote on a user.
+    !points <user> <quantity>     # Give a user points.
+    !board <user>                 # Check a users points.
+    !board                        # View the leaderboard of points.
+    !om <noms>                    # Give golden apples equivalent to the number of noms.
 
 Development Path
 ----------------

data/bin/minecraft

@@ -3,18 +3,32 @@
 require "slop"
 require "minecraft"
 
+class Slop
+  alias :option_core :option
+  def option(*args, &block)
+    args << {} unless args.last.is_a? Hash
+    key = (args.first.is_a? Symbol and args[1].is_a? Symbol) ? args[1] : args.first
+    args.last[:default] = $default[key] if $default.has_key? key
+    return option_core(*args, &block)
+  end
+end
+
+$default = Minecraft::Tools.get_configuration_file
+
 opts = Slop.parse :help => true do
   banner "Usage: minecraft [options]"
 
-  on :n, :no_run,     "Don't run the Minecraft server instance."
-  on :u, :update,     "Download the latest version of the Minecraft server jarfile."
-  on :s, :min_memory, "Specify the minimum amount of memory to allocate.", :optional => true
-  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
-  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
+  option :n, :no_run,          "Don't run the Minecraft server instance."
+  option :u, :update,          "Download the latest version of the Minecraft server jarfile."
+  option :s, :min_memory,      "Specify the minimum amount of memory to allocate.", :optional => true
+  option :x, :max_memory,      "Specify the maximum amount of memory to allocate.", :optional => true
+  option :no_auto_save,        "Disable auto save."
+  option :m, :tempmobs,        "Temporarily toggles mobs."
+  option :r, :rules,           "Specify the server rules.", :optional => true
+  option :f, :savefreq,        "Specify the frequency in seconds to save the server.", :optional => true
+  option :w, :welcome_message, "Specfiy a welcome message to connecting users.", :optional => true
+  option :vote_threshold,      "Specify the threshold of votes to kick somebody.", :optional => true
+  option :vote_expiration,     "Specify the expiration time in seconds for kickvotes to expire.", :optional => true
 end
 
 runtime = Minecraft::Runtime.new(opts)

data/lib/minecraft/commands.rb

@@ -4,6 +4,232 @@ module Minecraft
   module Commands
     include Data
 
+    # Gives a user a specific amount of points, the quantity is capped
+    # depending on the privileges of the user.
+    #
+    # @params [String] user The requesting user.
+    # @params [String] target_user The target user to give points to.
+    # @params [Integer] points Quantity of points to give.
+    # @example
+    #   points("basicxman", "mike_n_7")
+    #   points("basicxman", "mike_n_7", "50")
+    def points(user, target_user, num_points = 1)
+      num_points = [num_points.to_i, cap_points(user)].min
+      @points[target_user] ||= 0
+      @points[target_user] += num_points
+      @server.puts "say #{user} has given #{target_user} #{num_points} points for a total of #{@points[target_user]}."
+    end
+
+    # Checks a users points or displays the leaderboard.
+    #
+    # @params [String] user The requesting user.
+    # @params [String] target_user The user to check points of.
+    # @example
+    #   board("basicxman")
+    #   board("basicxman", "mike_n_7")
+    def board(user, target_user = nil)
+      if target_user.nil?
+        leaderboard = {}
+        @points.each do |u, p|
+          leaderboard[p] ||= []
+          leaderboard[p] << u
+        end
+        num_to_display = 5
+        leaderboard.keys.sort.each do |points|
+          leaderboard[points].each do |u|
+            return unless num_to_display >= 1
+            @server.puts "say #{u}: #{points}"
+            num_to_display -= 1
+          end
+        end
+      else
+        if @points.has_key? target_user
+          @server.puts "say #{u}: #{@points[u]}"
+        end
+      end
+    end
+
+    # Caps the quantity of points able to be given based on requesting user.
+    #
+    # @param [String] user The requesting user.
+    # @return [Integer] Maximum quantity of points.
+    # @example
+    #   cap_points("basicxman")
+    def cap_points(user)
+      return 1000 if is_op? user
+      return 500  if is_hop? user
+      return 1
+    end
+
+    # Initiates or votes for a specific user to be kicked, since half-ops and
+    # regular connected players cannot kick users they can initiate a vote
+    # instead.
+    #
+    # @params [String] user The requesting user.
+    # @params [String] target_user The target user to be kicked if the vote
+    # succeeds.
+    # @example
+    #   kickvote("basicxman", "blizzard4U")
+    #   kickvote("basicxman")
+    def kickvote(user, target_user = nil)
+      return @server.puts "say No user #{target_user} exists." unless @users.include? target_user
+      return vote(user) if target_user.nil?
+      unless submit_vote(user, target_user)
+        @kickvotes[target_user] = {
+          :tally => kick_influence(user),
+          :votes => [user],
+          :start => Time.now
+        }
+        @last_kick_vote = target_user
+        @server.puts "say A kickvote has been initiated for #{target_user}."
+        @server.puts "say To vote enter !kickvote #{target_user}."
+      end
+    end
+
+    # Votes for the last initiated kickvote.
+    #
+    # @params [String] user The requesting user.
+    # @example
+    #   vote("basicxman")
+    def vote(user)
+      unless submit_vote(user, @last_kick_vote)
+        @server.puts "say No kickvote was initiated, dummy."
+      end
+    end
+
+    # Cancels a kickvote initiation for a specific user.
+    #
+    # @params [String] user The requesting user.
+    # @params [String] target_user The user which currently has a kickvote.
+    # @example
+    #   cancelvote("basicxman", "blizzard4U")
+    def cancelvote(user, target_user)
+      if @kickvotes.has_key? target_user
+        @kickvotes.delete(target_user)
+        @server.puts "say #{user} has cancelled the kickvote on #{target_user}."
+      else
+        @server.puts "say There is no kickvote against #{target_user} dummy."
+      end
+    end
+
+    # Displays all current kickvote initiations.
+    #
+    # @params [String] user The requesting user.
+    # @example
+    #   kickvotes("basicxman")
+    def kickvotes(user)
+      @kickvotes.each do |target_user, data|
+        @server.puts "say #{target_user}: #{data[:tally]} #{data[:votes].map { |u| u[0] + u[-1] }.join(", ")}"
+      end
+    end
+
+    # Submits a kickvote.
+    #
+    # @params [String] user The requesting user who is voting.
+    # @params [String] target_user The user being voted against.
+    # @return [Boolean] Returns true if the kickvote has been initiated yet.
+    # @example
+    #   submit_vote("basicxman", "blizzard4U")
+    def submit_vote(user, target_user)
+      return unless @users.include? target_user
+      if @kickvotes.has_key? target_user
+        if @kickvotes[target_user][:votes].include? user
+          @server.puts "say You have already voted."
+        else
+          @kickvotes[target_user][:votes] << user
+          @kickvotes[target_user][:tally] += kick_influence(user)
+          check_kickvote(target_user)
+        end
+        return true
+      else
+        return false
+      end
+    end
+
+    # Checks a kickvote entry to see if the tally number has crossed the
+    # threshold, if so, kicks the user.
+    #
+    # @param [String] user The specified user.
+    # @example
+    #   check_kickvote("blizzard4U")
+    def check_kickvote(user)
+      if @kickvotes[user][:tally] >= @vote_threshold
+        @server.puts "say Enough votes have been given to kick #{user}."
+        @server.puts "kick #{user}"
+        @kickvotes.delete(user)
+      end
+    end
+
+    # Computes the influence a user has for kickvotes.
+    #
+    # @param [String] user The specified user.
+    # @return [Integer] The influence level.
+    # @example
+    #   kick_influence("basicxman")
+    def kick_influence(user)
+      return 3 if is_op? user
+      return 2 if is_hop? user
+      return 1
+    end
+
+    # Checks to see if any kickvotes are expired.
+    def expire_kickvotes
+      @kickvotes.each do |target_user, data|
+        puts "Checking #{Time.now} against #{data[:start] + @vote_expiration}}"
+        if Time.now > data[:start] + @vote_expiration
+          @server.puts "say The kickvote for #{target_user} has expired."
+          @kickvotes.delete(target_user)
+        end
+      end
+    end
+
+    # Kicks a random person, the requesting user has a higher cance of being
+    # picked.
+    #
+    # @param [String] user The requesting user.
+    # @example
+    #   roulette("basicxman")
+    def roulette(user)
+      users = @users + [user] * 3
+      picked_user = users.sample
+      @server.puts "say #{user} has requested a roulette kick, s/he has a higher chance of being kicked."
+      @server.puts "kick #{picked_user}"
+    end
+
+    # Changes the time of day.
+    #
+    # @param [String] time The time of day to change it to.
+    # @example
+    #   change_time("morning")
+    def change_time(time)
+      return false unless TIME.include? time
+      @server.puts "time set #{TIME[time]}"
+      @server.puts "say #{TIME_QUOTES[time]}" unless TIME_QUOTES[time] == ""
+      return true
+    end
+
+    # Gives half-op privileges to the target user.
+    #
+    # @param [String] user The requesting user.
+    # @param [String] target_user The target user to be hop'ed.
+    # @example
+    #   hop("basicxman", "blizzard4U")
+    def hop(user, target_user)
+      @hops << target_user.downcase unless @hops.include? target_user.downcase
+      @server.puts "#{target_user} is now a hop, thanks #{user}!"
+    end
+
+    # De-half-ops the target user.
+    #
+    # @param [String] user The requesting user.
+    # @param [String] target_user The target user to be de-hop'ed.
+    # @example
+    #   dehop("basicxman", "blizzard4U")
+    def dehop(user, target_user)
+      @hops.reject! { |u| u == target_user.downcase }
+      @server.puts "#{target_user} has been de-hoped, thanks #{user}!"
+    end
+
     # Give command takes an item name or numeric id and a quantifier.  If a
     # quantifier is not specified then the quantity defaults to 1.  Items will
     # try to resolved if they are not an exact match.
@@ -74,14 +300,31 @@ module Minecraft
       @server.puts "give #{user} 322 1"
     end
 
+    # Gives multiple golden apples to the specified user.
+    #
+    # @param [String] user Target user.
+    # @param args noms!
+    # @example
+    #   om("basicxman", "nom", "nom", "nom")
+    def om(user, *args)
+      args.length.times { nom(user) }
+    end
+
     # Outputs the current value of a server property.
     #
     # @param [String] user The requesting user.
     # @param [String] key The server property requested.
     # @example
     #   property("basicxman", "spawn-monsters")
-    def property(user, key)
-      @server.puts "say #{key} is currently #{@server_properties[key]}" if @server_properties.include? key
+    #   property("basicxman")
+    def property(user, key = nil)
+      if key.nil?
+        (@server_properties.length / 3.0).ceil.times do |n|
+          @server.puts "say #{@server_properties.keys[n * 3, 3].join(", ")}"
+        end
+      else
+        @server.puts "say #{key} is currently #{@server_properties[key]}" if @server_properties.include? key
+      end
     end
 
     # Checks the current uptime of the current or target user.  Prints their
@@ -95,6 +338,15 @@ module Minecraft
     #   uptime("basicxman", "mike_n_7")
     def uptime(user, target_user = nil)
       target_user ||= user
+      unless @users.include? target_user
+        if @userlog.has_key? target_user
+          @server.puts "say #{target_user} has #{format_uptime(@userlog[target_user])} minutes of logged time."
+        else
+          @server.puts "say #{target_user} Does not exist."
+        end
+        return
+      end
+
       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."
@@ -118,13 +370,16 @@ module Minecraft
     #   list("basicxman")
     def list(user)
       l = @users.inject("") do |s, u|
+        pre, suf = "", ""
         if u == user
           pre = "["
           suf = "]"
         end
-        suf = "*" + (suf || "") if is_op? u
+        pre = pre + "@" if is_op? u
+        pre = pre + "%" if is_hop? u
         s + "#{", " unless s.empty?}#{pre}#{u}#{suf}"
       end
+
       @server.puts "say #{l}"
     end
 

data/lib/minecraft/data.rb

@@ -12,6 +12,26 @@ module Minecraft
       :redstone   => [[331, 256], [356, 64], [69, 64], [77, 64], [70, 64]]
     }
 
+    # Values for time, 0 to 24000.  0 is dawn, 12000 is dusk.
+    TIME = {
+      :morning => 1000,
+      :evening => 13000,
+      :day     => 5000,
+      :night   => 16000,
+      :dawn    => 0,
+      :dusk    => 12000
+    }
+
+    # Quotes for each time of day.
+    TIME_QUOTES = {
+      :morning => "Anyone like a little toasted zombie?",
+      :evening => "Let them come.",
+      :day     => "",
+      :night   => "",
+      :dawn    => "What are you doing? Those wraiths are still out there.",
+      :dusk    => ""
+    }
+
     # All item keys.
     DATA_VALUE_HASH = {
       "glass"                   => "20",
@@ -117,6 +137,7 @@ module Minecraft
       "pink wool"               => "35",
       "brick block"             => "45",
       "lever"                   => "69",
+      "switch"                  => "69",
       "birch wood"              => "17",
       "gray wool"               => "35",
       "tnt"                     => "46",

data/lib/minecraft/extensions.rb

@@ -11,53 +11,78 @@ module Minecraft
     # @param [Slop] opts Command line options from Slop.
     def initialize(server, opts)
       @ops = File.readlines("ops.txt").map { |s| s.chomp }
-      @userlog = get_json("user.log")
+      get_json :hops, []
+      get_json :uptime
+      get_json :timers
+      get_json :shortcuts
+      get_json :userlog
+      get_json :points
       @users = []
-      @timers = get_json("user_timers.json")
-      @shortcuts = get_json("user_shortcuts.json")
       @counter = 0
       @logon_time = {}
       @server = server
+      @kickvotes = {}
+      @last_kick_vote = nil
       load_server_properties
 
-      opts = {
-        :rules => "No rules specified."
-      }.merge(opts)
-      opts.each { |k, v| instance_variable_set("@#{k}", v) }
+      opts.to_hash.each { |k, v| instance_variable_set("@#{k}", v) }
+      @vote_expiration ||= 300
+      @vote_threshold  ||= 5
+      @rules           ||= "No rules specified."
 
       # 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(: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)
+      add_command(:give,       :ops => :hop,  :all => true, :all_message => "is putting out.")
+      add_command(:tp,         :ops => :hop,  :all => true, :all_message => "is teleporting all users to their location.")
+      add_command(:kit,        :ops => :hop,  :all => true, :all_message => "is providing kits to all.")
+      add_command(:kitlist,    :ops => :hop,  :all => false)
+      add_command(:help,       :ops => :none, :all => false)
+      add_command(:rules,      :ops => :none, :all => false)
+      add_command(:nom,        :ops => :hop,  :all => true, :all_message => "is providing noms to all.")
+      add_command(:om,         :ops => :hop,  :all => true, :all_message => "is noming everybody, gross.")
+      add_command(:list,       :ops => :none, :all => false)
+      add_command(:s,          :ops => :hop,  :all => false)
+      add_command(:shortcuts,  :ops => :hop,  :all => false)
+      add_command(:hop,        :ops => :op,   :all => false)
+      add_command(:dehop,      :ops => :op,   :all => false)
+      add_command(:uptime,     :ops => :none, :all => false)
+      add_command(:addtimer,   :ops => :hop,  :all => false)
+      add_command(:deltimer,   :ops => :hop,  :all => false)
+      add_command(:printtimer, :ops => :hop,  :all => false)
+      add_command(:printtime,  :ops => :op,   :all => false)
+      add_command(:property,   :ops => :op,   :all => false)
+      add_command(:morning,    :ops => :op,   :all => false)
+      add_command(:evening,    :ops => :op,   :all => false)
+      add_command(:day,        :ops => :op,   :all => false)
+      add_command(:night,      :ops => :op,   :all => false)
+      add_command(:dawn,       :ops => :op,   :all => false)
+      add_command(:dusk,       :ops => :op,   :all => false)
+      add_command(:roulette,   :ops => :op,   :all => false)
+      add_command(:kickvote,   :ops => :none, :all => false)
+      add_command(:vote,       :ops => :none, :all => false)
+      add_command(:cancelvote, :ops => :op,   :all => false)
+      add_command(:kickvotes,  :ops => :op,   :all => false)
+      add_command(:points,     :ops => :none, :all => false)
+      add_command(:board,      :ops => :none, :all => false)
     end
 
-    # Gets a hash from a JSON file (or a blank one).
-    def get_json(file)
-      if File.exists? file
+    # Sets an instance variable with it's corresponding data file or a blank hash.
+    def get_json(var, blank = {})
+      file = "#{var}.json"
+      t = if File.exists? file
         JSON.parse(File.read(file))
       else
-        {}
+        blank
       end
+      instance_variable_set("@#{var}", t)
     end
 
     # Save the user timers and shortcuts hash to a data file.
     def save
       save_file :timers
       save_file :shortcuts
+      save_file :hops
+      save_file :points
     end
 
     # Save an instance hash to it's associated data file.
@@ -66,12 +91,7 @@ module Minecraft
     # @example
     #   save_file :timers
     def save_file(var)
-      File.open("user_#{var}.json", "w") { |f| f.print instance_variable_get("@#{var}").to_json }
-    end
-
-    # Writes the user uptime log to disk.
-    def write_log
-      File.open("user.log", "w") { |f| f.print @userlog.to_json }
+      File.open("#{var}.json", "w") { |f| f.print instance_variable_get("@#{var}").to_json }
     end
 
     # Complicated method to decide the logic of calling a command.  Checks
@@ -96,14 +116,17 @@ module Minecraft
       return send(root, user, *args) unless @commands.include? root
 
       # Any `all` suffixed command requires ops.
-      if @commands[root][:ops] or (is_all and @commands[root][:all])
-        return if !validate_ops(user, command)
+      if @commands[root][:ops] == :ops or (is_all and @commands[root][:all])
+        return unless validate_ops(user, command)
+      elsif @commands[root][:ops] == :hop
+        return unless validate_ops(user, command, false) or validate_hops(user, command)
       end
 
       if respond_to? "validate_" + root.to_s
         return unless send("validate_" + root.to_s, *args)
       end
 
+      is_all = @commands[root][:all] if is_all
       if is_all
         @server.puts "say #{user} #{@commands[root][:all_message]}"
         if respond_to? command
@@ -144,12 +167,15 @@ module Minecraft
     def check_save
       if @savefreq.nil?
         freq = 30
-      elsif @savefreq == 0
+      elsif @savefreq == "0"
         return
       else
         freq = @savefreq.to_i
       end
-      @server.puts "save-all" if @counter % freq == 0
+      if @counter % freq == 0
+        @server.puts "save-all"
+        save
+      end
     end
 
     # Increments the counter and checks if any timers are needed to be
@@ -157,6 +183,7 @@ module Minecraft
     def periodic
       @counter += 1
       check_save
+      expire_kickvotes if @counter % 10 == 0
       @users.each do |user|
         next unless @timers.has_key? user
         @timers[user].each do |item, duration|
@@ -240,6 +267,7 @@ module Minecraft
     # If a command method is called and is not specified, take in the arguments
     # here and attempt to !give the player the item.  Otherwise print an error.
     def method_missing(sym, *args)
+      return if change_time(sym)
       item, quantity = items_arg(1, [sym.to_s.downcase, args.last])
       item = resolve_item(item)
       if item and is_op? args.first
@@ -256,7 +284,7 @@ module Minecraft
       @userlog[user] ||= 0
       @userlog[user] += time_spent
       @server.puts "say #{user} spent #{format_uptime(time_spent)} minutes in the server, totalling to #{format_uptime(@userlog[user])}."
-      write_log
+      save_file :userlog
     end
 
     # Format an uptime for printing.  Should not be used for logging.
@@ -272,7 +300,7 @@ module Minecraft
     # @param [String] user The specified user.
     # @return [Integer] The uptime in seconds.
     def calculate_uptime(user)
-      Time.now - @logon_time[user]
+      Time.now - (@logon_time[user] || 0)
     end
 
     # Check if a user has op privileges.
@@ -283,14 +311,32 @@ module Minecraft
       @ops.include? user.downcase
     end
 
-    # Check if a user is ops and print a privilege error if not.
+    # Check if a user has half op privileges.
+    #
+    # @param [String] user The specified user.
+    # @return [Boolean]
+    def is_hop?(user)
+      @hops.include? user.downcase
+    end
+
+    # Check if a user has op privileges and print a privilege error if not.
+    #
+    # @param [String] user The specified user.
+    # @param [String] command The command they tried to use.
+    # @return [Boolean] Returns true if the user is an op.
+    def validate_ops(user, command, message = true)
+      return true if is_op? user.downcase
+      @server.puts "say #{user} is not an op, cannot use !#{command}." if message
+    end
+
+    # Check if a user has half op privileges and print a privilege error if not.
     #
     # @param [String] user The specified user.
     # @param [String] command The command they tried to use.
     # @return [Boolean] Returns true if the user is an op.
-    def validate_ops(user, command)
-      return true if is_op? user
-      @server.puts "say #{user} is not an op, cannot use !#{command}."
+    def validate_hops(user, command, message = true)
+      return true if is_hop? user.downcase
+      @server.puts "say #{user} is not a half-op, cannot use !#{command}." if message
     end
 
     # An error message for invalid commands.

data/lib/minecraft/runtime.rb

@@ -15,19 +15,19 @@ module Minecraft
       pre_checks
 
       Minecraft::Tools.check_jarfile
-      unless @opts.no_run?
+      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?
+        server.sin.puts("save-on") unless @opts[:no_auto_save]
       end
     end
 
     # Checks if Minecraft needs to be updated, checks if mobs are to be
     # toggled.
     def pre_checks
-      Minecraft::Tools.download_minecraft if @opts.update?
-      puts "[+] Temporarily toggling mobs.  Setting to #{Minecraft::Tools.toggle_mobs}." if @opts.tempmobs?
+      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

@@ -35,7 +35,7 @@ module Minecraft
     # An exit hook, checks if mobs need to be untoggled and saves the server.
     # Server is stopped gracefully.
     def minecraft_exit
-      puts "[+] Restoring previous mob state to #{Minecraft::Tools.toggle_mobs}." if @opts.tempmobs?
+      puts "[+] Restoring previous mob state to #{Minecraft::Tools.toggle_mobs}." if @opts[:tempmobs]
       puts "\n[+] Saving..."
       @extensions.save
       @threads.each(&:kill)

data/lib/minecraft/tools.rb

@@ -39,5 +39,17 @@ module Minecraft
       File.open("server.properties", "w") { |f| f.print content }
       return new_state
     end
+
+    def self.get_configuration_file
+      return {} unless File.exists? "minecraft.properties"
+      File.readlines("minecraft.properties").map { |l| l.split(" ") }.inject({}) do |hash, (key, *value)|
+        hash.merge({ key.to_sym => config_value(value) })
+      end
+    end
+
+    def self.config_value(value)
+      return true if value.nil? or value.length == 0
+      return value.join(" ")
+    end
   end
 end

data/lib/minecraft/version.rb

@@ -1,5 +1,5 @@
 # Global Minecraft module.
 module Minecraft
   # Yay, keep these versions coming!
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

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