mc_dot_art_maker 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 390873adb7de45b675687e44cd5f30ef0b23f994
-  data.tar.gz: 2510cd81d239f2a0ec1a1a4ce211a4547fef2d18
+  metadata.gz: 29209338abdd7386e898607c46898dd765a38b38
+  data.tar.gz: 0eb73d7e9430fc8409baafcb98439dd5bfd911b8
 SHA512:
-  metadata.gz: 3fc004fd60e9f8281946f66de247f22602062be5377468c8c32b94d1498928c6811078fa038a8ceba3e090d82f9ae3b12a77b1b03b6e1f1c36f9a5561018f8c2
-  data.tar.gz: 4edaea0b6e85f64201e00e191a5acc0682fb23e87e99a90c1379df39818bf9da0ae740e914331dbd245dcd0d570c4b2aeb6f11ef44e56293d1e778d7353c7f11
+  metadata.gz: 732f0c6f2af76cdfd3623d659610a5d700c1a48d9fcd455306b69eac12256f9e4eda5729fe48ff5a070e298b8a5c8ef7b0bcffad774a22bb441c81bddbe68ccc
+  data.tar.gz: b926da55c0212274c490f0a932e8292f54eacc1381dcc57158d117a30f2e596f5b1bbd1018fa04ca13e0dad3ed139d7a217bb94ca33211f028ebb7c872fa23ca

data/lib/mc_dot_art_maker/block.rb

@@ -6,11 +6,11 @@ module MCDotArtMaker
     # - data - data e.g. 1
     # - texture - ブロックのテクスチャ
     # - color - テクスチャの平均色
-    def initialize(n,i,d,r,g,b,tx)
+    def initialize(n,i,d,color,tx)
       @name = n
       @id = i
       @data = d
-      @color = Color::RGB.new(r, g, b)
+      @color = color
       @texture = tx.resize(TEXTURE_SIZE,TEXTURE_SIZE)
     end
     def texture(size=TEXTURE_SIZE)

data/lib/mc_dot_art_maker/block_list.rb

@@ -3,6 +3,7 @@ module MCDotArtMaker
     include Enumerable
     include Singleton
     def initialize
+      @loader = MCDotArtMaker::TextureLoader.new
       @blocks = []
 
       # できるだけ多くのブロックを使ったバージョン
@@ -446,7 +447,7 @@ module MCDotArtMaker
       end
     end
 
-    def to_remap_image
+    def color_palette
       # Make color palette
       new_image = Magick::Image.new(@blocks.size,1){ self.background_color = "white" }
       @blocks.each_with_index do |block,index|
@@ -458,14 +459,37 @@ module MCDotArtMaker
     private
     def block(name, id_data_label, filename)
       # Add blocks to @blocks
-      image = Magick::ImageList.new(File.expand_path("../textures/#{filename}", __FILE__)).first
-      r,g,b = MCDotArtMaker.calc_average_color(image)
+      # image = Magick::ImageList.new(File.expand_path("../textures/#{filename}", __FILE__)).first
+      image = @loader.load_texture(filename)
+
+      color = calc_average_color(image)
       id = id_data_label.split(':')[0].to_i
       data = id_data_label.split(':')[1].to_i
 
-      block = Block.new(name,id, data,r,g,b, image)
+      block = Block.new(name,id, data,color, image)
       @blocks << block
-      MCDotArtMaker.puts "Block #{name} registered. R:#{r} G:#{g} B:#{b}"
+      MCDotArtMaker.puts "Block #{name} registered: #{color}"
+    end
+
+    def calc_average_color(arg)
+      pixels = arg.get_pixels(0,0,arg.columns,arg.rows)
+
+      sum_r = pixels.reduce(0) do |a,elem|
+        a+elem.red/257
+      end
+      ave_r = sum_r/pixels.size
+
+      sum_g = pixels.reduce(0) do |a,elem|
+        a+elem.green/257
+      end
+      ave_g = sum_g/pixels.size
+
+      sum_b = pixels.reduce(0) do |a,elem|
+        a+elem.blue/257
+      end
+      ave_b = sum_b/pixels.size
+
+      Color::RGB.new(ave_r, ave_g, ave_b)
     end
   end
 end

data/lib/mc_dot_art_maker/maker.rb

@@ -153,7 +153,7 @@ module MCDotArtMaker
 
 
       MCDotArtMaker.puts "remapping..."
-      @image = @image.remap(@block_list.to_remap_image,@dither_method)
+      @image = @image.remap(@block_list.color_palette,@dither_method)
       MCDotArtMaker.puts "Done!"
 
       MCDotArtMaker.puts "Registering cells..."

data/lib/mc_dot_art_maker/texture_loader.rb

@@ -0,0 +1,107 @@
+module MCDotArtMaker
+  class MinecraftClientJarNotFoundError < StandardError ; end
+  class UnsupportedOSError < StandardError ; end
+  class UnknownOSError < StandardError ; end
+  class TextureNotFoundError < StandardError ; end
+
+  class TextureLoader
+    TEXTURE_DIR = File.join(File.dirname(__FILE__),"textures")
+    TEXTURE_TMP_DIR = File.join(TEXTURE_DIR,"tmp")
+    
+    def initialize(jar = nil)
+      @jar = jar || jars.last
+    end
+
+    def load_texture(filename)
+      filename = filename + '.png' if File.extname(filename).empty?
+
+      confirm = [
+        Dir.exist?(TEXTURE_DIR),
+        File.exist?(File.join(TEXTURE_DIR,filename))
+      ]
+
+      unless confirm.all?
+        # copy jar and extract
+        jar_basename = File.basename(@jar)
+
+        Dir.mkdir(TEXTURE_DIR) unless Dir.exist?(TEXTURE_DIR)
+        Dir.mkdir(TEXTURE_TMP_DIR) unless Dir.exist?(TEXTURE_TMP_DIR)
+
+        jar_file_path = File.join(TEXTURE_TMP_DIR,jar_basename)
+        FileUtils.cp(@jar,jar_file_path) if Dir.glob(File.join(TEXTURE_TMP_DIR,'*.jar')).empty?
+
+        Zip::File.open(jar_file_path) do |zip|
+          zip.each do |entry|
+            # puts "entry #{entry.to_s}"
+
+            # if md = /\Aassets\/minecraft\/textures\/blocks\/(.*).png\Z/.match(entry.to_s)
+            #   # p md[1]
+            #   entry.extract(File.join("textures", md[1]) + ".png")
+            # end
+
+            if md = /\Aassets\/minecraft\/textures\/blocks\/#{filename}\Z/.match(entry.to_s)
+              entry.extract(File.join(TEXTURE_DIR, filename))
+              return Magick::ImageList.new(File.join(TEXTURE_DIR,filename)).first
+            end
+          end
+        end
+
+        raise(TextureNotFoundError,"Texture \"#{filename}\" was not found") unless confirm.all?
+      end
+
+      Magick::ImageList.new(File.join(TEXTURE_DIR,filename)).first
+    end
+
+    def exist?(filename)
+      filename = filename + '.png' if File.extname(filename).empty?
+      [
+        Dir.exist?(TEXTURE_DIR),
+        File.exist?(File.join(TEXTURE_DIR,filename))
+      ].all?
+    end
+
+
+    # private
+    def os
+      @os ||= (
+      host_os = RbConfig::CONFIG['host_os']
+      case host_os
+      when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+        :windows
+      when /darwin|mac os/
+        :macosx
+      when /linux/
+        :linux
+      when /solaris|bsd/
+        :unix
+      else
+        raise(UnknownOSError,"unknown os: #{host_os.inspect}")
+      end
+      )
+    end
+
+    def search_dir
+      case os
+      when :windows
+        File.join(ENV['AppData'],".minecraft", "versions")
+      when :macosx
+        File.join(ENV['HOME'], "Library", "Application Support", "minecraft", "versions")
+      when :linux,:unix
+        File.join(ENV['HOME'], ".minecraft", "versions")
+      else
+        raise(UnsupportedOSError,"unsupported os")
+      end
+    end
+
+    def jars
+      jars = Dir.glob(File.join(search_dir,"1.[8-9]{.[1-9],}")).map do |v|
+        # File.join(search_dir, v,"#{v}.jar")
+        basename = File.basename(v)
+        File.join(v,"#{basename}.jar")
+      end
+      jars
+    end
+
+  end
+
+end

data/lib/mc_dot_art_maker.rb

@@ -1,5 +1,7 @@
 require 'singleton'
 
+require 'zip'
+
 require 'nbt_utils'
 require 'color-rgb'
 require 'rmagick'
@@ -8,6 +10,7 @@ require File.expand_path('../mc_dot_art_maker/constants.rb', __FILE__)
 require File.expand_path('../mc_dot_art_maker/extern_lib_extension.rb', __FILE__)
 require File.expand_path('../mc_dot_art_maker/block.rb', __FILE__)
 require File.expand_path('../mc_dot_art_maker/block_list.rb', __FILE__)
+require File.expand_path('../mc_dot_art_maker/texture_loader.rb', __FILE__)
 # require File.expand_path('../mc_dot_art_maker/cell.rb', __FILE__)
 require File.expand_path('../mc_dot_art_maker/dot.rb', __FILE__)
 require File.expand_path('../mc_dot_art_maker/maker.rb', __FILE__)

data/mc_dot_art_maker.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name = 'mc_dot_art_maker'
-	s.version = '0.3.2'
+	s.version = '0.3.3'
 	s.licenses = ['MIT']
 	s.summary = 'Dot Art Maker for Minecraft'
 	s.description = 'Converting images to mosaic arts using Minecraft textures and .schematic files.'

data/test/test_block_list.rb

@@ -0,0 +1,27 @@
+require_relative '../lib/mc_dot_art_maker'
+require 'test/unit'
+
+class BlockListTest < Test::Unit::TestCase
+  def setup
+    @block_list = MCDotArtMaker::BlockList.instance
+  end
+
+  def test_singleton
+    assert_raise(NoMethodError){
+      MCDotArtMaker::BlockList.new
+    }
+    assert_equal(MCDotArtMaker::BlockList,@block_list.class)
+  end
+
+  def test_block_list
+    assert_equal(58, @block_list.size)
+    assert_equal(58, @block_list.length)
+
+    @block_list.each do |block|
+      assert_equal(MCDotArtMaker::Block, block.class)
+      assert_equal(Magick::Image, block.texture.class)
+      assert_equal(16, block.texture.rows)
+      assert_equal(16, block.texture.columns)
+    end
+  end
+end

data/test/test_block_palette.rb

@@ -1,8 +1,29 @@
 require_relative '../lib/mc_dot_art_maker'
+require 'test/unit'
+require "digest/md5"
+
 module MCDotArtMaker
   class Maker
     attr_reader :block_list
   end
 end
-maker = MCDotArtMaker::Maker.new("test_image.jpg")
-maker.block_list.to_remap_image.write("palette.png")
+
+class BlockPaletteTest < Test::Unit::TestCase
+  TMP_DIR = "images/tmp"
+  class << self
+    def startup
+      FileUtils.rm_r TMP_DIR
+      Dir.mkdir(TMP_DIR) unless Dir.exist?(TMP_DIR)
+    end
+  end
+  def setup
+    maker = MCDotArtMaker::Maker.new("images/src/test_image.jpg")
+    maker.block_list.to_remap_image.write("images/tmp/palette.png")
+
+  end
+
+  def test_block_palette
+    assert_equal(Digest::MD5.file("images/sample/palette.png"),
+      Digest::MD5.file("images/tmp/palette.png"))
+  end
+end

data/test/test_dither_method.rb

@@ -1,11 +1,29 @@
 require_relative '../lib/mc_dot_art_maker'
+require 'test/unit'
+require "digest/md5"
 
 
-methods = [MCDotArtMaker::NoDitherMethod,MCDotArtMaker::RiemersmaDitherMethod,MCDotArtMaker::FloydSteinbergDitherMethod]
+class BlockPaletteTest < Test::Unit::TestCase
+  TMP_DIR = "images/tmp"
+  METHODS = [MCDotArtMaker::NoDitherMethod,MCDotArtMaker::RiemersmaDitherMethod,MCDotArtMaker::FloydSteinbergDitherMethod]
 
-methods.each do |m|
-  fn = Magick::ImageList.new("test_image.jpg").first
+  class << self
+    def startup
+      FileUtils.rm_r TMP_DIR
+      Dir.mkdir(TMP_DIR) unless Dir.exist?(TMP_DIR)
+    end
+  end
+  def setup
+    METHODS.each do |m|
+      maker = MCDotArtMaker::Maker.new("images/src/test_image.jpg",m)
+      maker.texture_image.write "images/tmp/dither_methods_#{m}.png"
+    end
+  end
 
-  maker = MCDotArtMaker::Maker.new(fn,m)
-  maker.texture_image.write "test_image_#{m}.png"
+  def test_dither_methods
+    METHODS.each do |m|
+      assert_equal(Digest::MD5.file("images/sample/dither_methods_#{m}.png"),
+        Digest::MD5.file("images/tmp/dither_methods_#{m}.png"))
+    end
+  end
 end

data/test/test_normal_conversion.rb

@@ -0,0 +1,30 @@
+require_relative '../lib/mc_dot_art_maker'
+require 'test/unit'
+require "digest/md5"
+
+class NormalConversionTest < Test::Unit::TestCase
+  TMP_DIR = "images/tmp"
+  class << self
+    def startup
+      FileUtils.rm_r TMP_DIR
+      Dir.mkdir(TMP_DIR) unless Dir.exist?(TMP_DIR)
+    end
+  end
+  def setup
+    maker = MCDotArtMaker::Maker.new("images/src/test_image.jpg")
+    maker.texture_image.write "images/tmp/normal_conversion_texture.png"
+    maker.mosaic_image.write "images/tmp/normal_conversion_mosaic.png"
+    maker.write_schematic "images/tmp/normal_conversion_schematic.schematic"
+  end
+
+  def test_block_palette
+    assert_equal(Digest::MD5.file("images/sample/normal_conversion_texture.png"),
+      Digest::MD5.file("images/tmp/normal_conversion_texture.png"))
+    assert_equal(Digest::MD5.file("images/sample/normal_conversion_mosaic.png"),
+      Digest::MD5.file("images/tmp/normal_conversion_mosaic.png"))
+
+    # md5 values seems to be changed for every output...
+    # assert_equal(Digest::MD5.file("images/sample/normal_conversion_schematic.schematic"),
+    #   Digest::MD5.file("images/tmp/normal_conversion_schematic.schematic"))
+  end
+end

data/test/test_texture_loader.rb

@@ -0,0 +1,50 @@
+require_relative '../lib/mc_dot_art_maker'
+require 'test/unit'
+
+class TextureLoaderTest < Test::Unit::TestCase
+  TMP_DIR = "images/tmp"
+  class << self
+    def startup
+      # FileUtils.rm_r TMP_DIR
+      # Dir.mkdir(TMP_DIR) unless Dir.exist?(TMP_DIR)
+    end
+  end
+  def setup
+    @loader = MCDotArtMaker::TextureLoader.new
+  end
+
+  def test_version_lists
+    assert_equal('/Users/Kyosuke/Library/Application Support/minecraft/versions',@loader.search_dir)
+
+    expected_version = '/Users/Kyosuke/Library/Application Support/minecraft/versions/1.9/1.9.jar'
+    assert_equal(expected_version, @loader.jars.sort.last)
+    assert_equal(4, @loader.jars.size)
+  end
+
+  def test_load_texture
+    image = @loader.load_texture('brick.png')
+    assert_equal(Magick::Image, image.class)
+    assert_equal(16, image.rows)
+    assert_equal(16, image.columns)
+  end
+
+  def test_load_texture_without_extension
+    image = @loader.load_texture('brick')
+    assert_equal(Magick::Image, image.class)
+    assert_equal(16, image.rows)
+    assert_equal(16, image.columns)
+  end
+
+  def test_texture_not_found
+    assert_raise(MCDotArtMaker::TextureNotFoundError){
+      image = @loader.load_texture('abcdefghijklmnopqrstuvwxyz')
+    }
+  end
+
+  def test_existance
+    assert(@loader.exist?('brick.png'))
+    assert(@loader.exist?('brick'))
+
+    refute(@loader.exist?('abcdefghijklmnopqrstuvwxyz'))
+  end
+end