minecraft_utils 0.1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ade4161dc2a89c78868302a98e54664ec94ed1a61d7f7cad45f716344ffe08cb
-  data.tar.gz: e4bfc6cbc5ded8615131b0a230ebe8d72c43fe4d8a911405fca9a5dc8797b3d1
+  metadata.gz: 4ff9a21f2a355dadea7f4fe3c1d421195c6dbc0db21d53e3c218b387bd2b78e0
+  data.tar.gz: 86ca4f6330e09e2b26158be214949bf20275f42696b1f119836a7e329ae492cf
 SHA512:
-  metadata.gz: 462b31765ee8a35e729ab3ad04a5ee5abaf6125aa0ebaaaecbc8b12ce132da9d78db6157e3ce575f915643159adfe3e8b2a634ac9440800344e2dddf774ba179
-  data.tar.gz: 9402dad2988380246b5f9cd9f8545785361a587347e89defdd43a13f2a8ce541f82ffc56961c69649396fe3aca40159c0ecfd6335f4682c7445dec93bca21ffa
+  metadata.gz: 4ee62536fdc027efe8b7ef92f42116306918454cd7e9f1d3921a5b12701599c0a02c498c007ffedb37c8bb77e92c69c852eb397f23dfb606f36223998e3b4adb
+  data.tar.gz: bb5e536e9192048278cccf5019279b05f6e5b63f2543050db2b63f4d9d733eeeb983fb2846465695761db4e2646f0c9f3bca5e9b4e5272c906da3719183cf747

data/bin/coords

@@ -1,24 +1,25 @@
 #!/usr/bin/ruby
 
-require "optparse"
-
-ARGV.push "-h" if ARGV.empty?
-
-options = {}
-location = "Nether"
-OptionParser.new do |opts|
-  opts.banner = "Usage: coords [options] X Z"
+# TODO: OptionParser is breaking negative number support.
+# Is there a better way to do this?
+if ARGV.empty? or ["-h", "--help"].include? ARGV[0]
+  puts "Usage: coords [-o] X Z"
+  puts
+  puts "  [-o] calculates nether -> overworld coordinates"
+  exit 0
+end
 
-  opts.on("-o", "--overworld",
-          "calculates nether -> overworld coordinates") do |o|
-    options[:overworld] = o
-    location = "Overworld"
-  end
-end.parse!
+if ARGV.include? "-o"
+  overworld = true
+  location = "Overworld"
+  ARGV.delete "-o"
+else
+  location = "Nether"
+end
 
 # Try and find 2 valid numbers in the args.
 # They could run `coords 550 fuck you 700` for all I care.
-case (coords = ARGV.grep(/^\d+$/).map &:to_i).size
+case (coords = ARGV.grep(/^-?\d+$/).map &:to_i).size
 when 3
   # If they give XYZ, strip the Y
   coords -= [coords[1]]
@@ -31,7 +32,7 @@ end
 
 # Transform the coordinates
 x, z = coords.map do |c|
-  if options[:overworld]
+  if overworld
     c * 8
   else
     (c / 8.0).round

data/bin/stacks

@@ -8,10 +8,6 @@ options = {}
 OptionParser.new do |opts|
   opts.banner = "Usage: stacks [options] AMOUNT [STACK SIZE=64]"
 
-  opts.on("-s", "--shulkers", "prints amount of shulker boxes to fill") do |o|
-    options[:shulkers] = o
-  end
-
   opts.on("-d", "--dye",
           "prints amount of dye needed for stained glass or concrete") do |o|
     options[:dye] = o
@@ -28,28 +24,57 @@ unless ARGV[1].nil? or ARGV[1].match? /^\d+$/
   exit 1
 end
 
+# Returns an array [stacks, blocks]
 def calc_stacks(n, stack_size=64)
-  stacks = (n / stack_size).floor
-  return [stacks, n - (stacks * stack_size)]
+  [stacks = (n / stack_size).floor, n - (stacks * stack_size)]
 end
 
-amount = ARGV[0].to_i
-stacks, blocks = calc_stacks(amount, ARGV[1].nil? ? 64 : ARGV[1].to_i)
+# Get proper pluralization
+#
+#   pluralize 1, "stack" #=> "1 stack"
+#   pluralize 3, "stack" #=> "3 stacks"
+def pluralize(n, str)
+  "#{n} #{str + (n == 1 ? "" : "s")}"
+end
+
+# Create an intelligent output, i.e. don't print something like "0 blocks"
+def get_output(stacks, blocks, put_shulkers=false)
+  s = ""
+  put_stacks, put_blocks = stacks.nonzero?, blocks.nonzero?
+
+  if put_shulkers
+    s += pluralize boxes = (stacks / 27).floor, "shulker"
+
+    # Strip the necessary # of stacks off the count.
+    stacks -= boxes * 27
+    put_stacks = stacks.nonzero?
 
-puts "#{stacks} stacks, #{blocks} blocks"
+    s += ", " if put_stacks or put_blocks
+  end
+
+  if put_stacks
+    s += pluralize stacks, "stack"
+    s += ", " if put_blocks
+  end
+
+  s += pluralize blocks, "block" if put_blocks
 
-if options[:shulkers]
-  boxes = (stacks / 27).floor
-  puts "#{boxes} shulkers, #{stacks-(boxes * 27)} stacks, #{blocks} blocks"
+  s
 end
 
+exit 0 if (amount = ARGV[0].to_i).zero?
+stacks, blocks = calc_stacks(amount, ARGV[1].nil? ? 64 : ARGV[1].to_i)
+
+puts get_output stacks, blocks
+puts get_output stacks, blocks, true if stacks >= 27
+
 if options[:dye]
   dye = (amount / 8.0).ceil
   print "Dye needed: #{dye}"
 
   if dye > 64
     stacks, blocks = calc_stacks dye
-    print " (#{stacks} stacks, #{blocks} blocks)"
+    print " (#{get_output stacks, blocks, stacks >= 27})"
   end
 
   puts

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minecraft_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Vinny Diehl
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2023-04-09 00:00:00.000000000 Z
 dependencies: []
 description: Tools for calculating stacks of items and Nether coordinates.
 email: vinny.diehl@gmail.com
@@ -24,13 +24,13 @@ homepage: https://github.com/vinnydiehl/minecraft_utils
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -39,8 +39,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: A simple set of calculator tools for Minecraft.
 test_files: []