mcp 0.0.1 → 0.0.2

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mcp.gemspec
-gemspec
+gemspec

data/fail.rb

@@ -0,0 +1,39 @@
+require 'mcp'
+include MCP
+file = 'listaserwerow'
+map = MCP::Util.mapping
+File.readlines(file).each do |line|
+  server,port = line.split(":")
+  sock = TCPSocket.new server,port
+  msg = Msg.new
+  login1 = Msg.new
+  login1.msg = "/register werwerdf werwerdf"
+  login2 = Msg.new
+  login2.msg = "/register werwerdf"
+  login3 = Msg.new
+  login3.msg = "/login werwerdf"
+  msg.msg = "Testujemy"
+  login = LoginRequest.new
+  login.nick = "testujemyxd1"
+  sock << login.with_id
+  packet_id = MCUbyte.read(sock).to_i
+  klass = map[packet_id]
+  if !klass
+    puts "nieznany pakiet jedziemy dalej nastepny serwer"
+    next
+  end
+  packet = klass.read(sock)
+  if packet.instance_of? Kick
+    puts "Fail got kick: #{packet.reason} //jedziemy dalej"
+    next
+  elsif packet.instance_of? LoginResponse
+    puts "OK"
+    sock << login1.with_id
+    sock << login2.with_id
+    sock << login3.with_id
+    sock << msg.with_id
+  end
+
+  break
+end
+#p MCP::MCMetadata.read "asd"

data/lib/mcp.rb

@@ -1,5 +1,5 @@
 require "mcp/version"
-
-module Mcp
+require 'mcp/connection.rb'
+module MCP
   # Your code goes here...
 end

data/lib/mcp/connection.rb

@@ -0,0 +1,44 @@
+require 'socket'
+require 'mcp/packets.rb'
+
+module MCP
+  class Connection
+
+    def initialize(opts = {}, &block)
+      host = opts[:host] || "localhost"
+      port = opts[:port] || 25565
+      @socket = TCPSocket.new host,port
+      login = LoginRequest.new
+      login.nick = "testing221"
+      @socket << login.with_id
+      map = Util.mapping
+
+      while true
+        id = MCUbyte.read(@socket).to_i
+        klass = map[id]
+        if !klass
+          @socket.close
+          raise Exception, "Unknown packet: 0x#{id.to_s(16).upcase}"
+          return
+        end
+        p klass
+        a = klass.read(@socket)
+        p a
+        if a.instance_of? LoginResponse
+          puts "Polaczono z #{host}:#{port}, entity_id=#{a.entity_id}"
+        elsif a.instance_of? Kick
+          @socket.close
+          raise Exception, "Got kick: #{a.reason}"
+          return
+        elsif a.instance_of? Keepalive
+          k = Keepalive.new
+          k.id = a.id
+          @socket << k.with_id
+        end
+        puts "Naste[ny packiet"
+
+      end
+    end
+
+  end
+end

data/lib/mcp/packets.rb

@@ -0,0 +1,177 @@
+require 'mcp/types.rb'
+require 'mcp/packets_util.rb'
+
+module MCP
+  class PluginMessage < Packet
+    Id = 0xFA
+    Type = :to_client
+
+    mc_string :channel
+    mc_byte_array :data
+  end
+
+  class LoginRequest < Packet
+    Id = 0x01
+    Type = :to_server
+
+    mc_int  :protocol_version, value: 29 # int
+
+    mc_string :nick
+    mc_string :notused
+
+    mc_int  :notused1, value: 0 #int
+    mc_int  :notused2, value: 0 # int
+    mc_byte :notused3, value: 0 # byte
+    mc_ubyte :notused4, value: 0 #unsigned byte
+    mc_ubyte :notused5, value: 0 # ungsigned byte
+  end
+
+  class LoginResponse < Packet
+    Id = 0x01
+    Type = :to_client # u can only receive it @_@
+
+    mc_int  :entity_id
+
+    mc_string :comment
+    mc_string :level_type
+
+
+    mc_int :server_mode
+    mc_int :dimension
+    mc_byte :difficulty 
+    mc_ubyte :notused 
+    mc_ubyte :max_players
+  end
+
+  class SpawnPosition < Packet
+    Id = 0x06
+    Type = :to_client
+    mc_int :x
+    mc_int :y
+    mc_int :z
+  end
+  class Msg < Packet
+    Id = 0x03
+    Type = :both
+
+    mc_string :msg
+  end
+
+  class Kick < Packet
+    Id = 0xFF
+    Type = :to_client
+
+    mc_string :reason
+  end
+
+  class PlayerAbilities < Packet
+    Id = 0xCA
+    Type = :both
+
+    mc_bool :god
+    mc_bool :flying
+    mc_bool :can_fly
+    mc_bool :instant_destroy
+  end
+
+  class TimeUpdate < Packet
+    Id = 0x04
+    Type = :to_client
+
+    mc_long :time
+  end
+
+  class SpawnItem < Packet
+    Id = 0x15
+    Type = :to_client
+
+    mc_int :entity_id
+    mc_short :item
+    mc_byte :item_count
+    mc_short :damage
+    mc_ab_int :x
+    mc_ab_int :y
+    mc_ab_int :z
+    mc_byte :rotation
+    mc_byte :pitch
+    mc_byte :roll
+  end
+
+  class EntityVelocity < Packet
+    Id = 0x1C
+    Type = :to_client
+
+    mc_int :eid
+    mc_short :x
+    mc_short :y
+    mc_short :z
+  end
+
+  class EntityHeadLook < Packet
+    Id = 0x23
+    Type = :to_client
+    mc_int :eid
+    mc_byte :head_yaw
+  end
+
+  class ChunkAllocation < Packet
+    Id = 0x32
+    Type = :to_client
+    mc_int :x
+    mc_int :z
+    mc_bool :mode
+  end
+
+  class SpawnMob < Packet
+    Id = 0x18
+    Type = :to_client
+
+    mc_int :eid
+    mc_byte :type
+    mc_int :x
+    mc_int :y
+    mc_int :z
+    mc_byte :yaw
+    mc_byte :pitch
+    mc_byte :head_yaw
+    mc_short :velocity_z
+    mc_short :velocity_x
+    mc_short :velocity_y
+    mc_metadata :meta
+  end
+
+  class SetWindowItems < Packet
+    Id = 0x68
+    Type = :to_client
+
+    mc_byte :window_id
+    mc_short :item_count
+  end
+
+  class SpawnNamedEntity < Packet
+    Id = 0x14
+    Type = :to_client
+
+    mc_int :eid
+    mc_string :name
+    mc_ab_int :x
+    mc_ab_int :y
+    mc_ab_int :z
+    mc_byte :yaw
+    mc_byte :pitch
+    mc_short :item
+    mc_metadata :meta
+  end
+
+  class Keepalive < Packet
+    Id = 0x00
+    Type = :both
+    mc_int :id
+  end
+  class ChangeGamestate < Packet
+    Id = 0x46
+    Type = :to_client
+    mc_byte :reason
+    mc_byte :gm
+  end
+end

data/lib/mcp/packets_util.rb

@@ -0,0 +1,24 @@
+require 'mcp/types.rb'
+module MCP
+  class Util
+    def self.mapping
+      MCP.constants.each_with_object({}) do |constant_name, result|
+        klass = MCP.const_get(constant_name)
+        next unless klass.is_a?(Class)
+        next unless klass < Packet
+        next unless (klass::Type || :both) != :to_server
+        result[klass::Id] = klass
+      end
+    end
+  end
+
+  class Packet < BinData::Record
+    Id = -1
+    Type = :both
+    def with_id
+        packet = self.class
+        id = packet::Id rescue 0
+        MCUbyte.new(id).to_binary_s + to_binary_s
+    end
+  end
+end

data/lib/mcp/types.rb

@@ -0,0 +1,101 @@
+#packet id to U(!)byte
+#byte => int8
+#short => int16
+#int => int32
+require 'bindata'
+module MCP
+  class MCByte < BinData::Primitive
+    endian :big
+    int8 :data
+    def get; return self.data; end
+    def set(a); self.data = a; end
+  end
+
+  class MCUbyte < BinData::Primitive
+    endian :big
+    uint8 :data
+    def get; return self.data; end
+    def set(a); self.data = a; end
+  end
+
+  class MCShort < BinData::Primitive
+    endian :big
+    int16 :data
+    def get; return self.data; end
+    def set(a); self.data = a; end
+  end
+
+  class MCInt < BinData::Primitive
+    endian :big
+    int32 :data
+    def get; return self.data; end
+    def set(a); self.data = a; end
+  end
+
+  class MCAbInt < BinData::Primitive
+    endian :big
+    int32 :data
+    def get; return self.data/32; end
+    def set(a); self.data = a; end
+  end
+
+  class MCString < BinData::Primitive
+    endian :big
+    int16  :len,  value: lambda { length }
+    string :data, read_length: lambda { 2*len}
+
+    def get; return self.data.force_encoding("utf-16be").encode("utf-8"); end
+    def set(a) 
+      length = a.length
+      self.data = a.encode("utf-16be")
+    end
+  end
+
+  class MCByteArray < BinData::Primitive
+    endian :big
+    int16 :len
+    array :data, :type => :mc_byte, :initial_length => lambda {len}
+
+    def get; return self.data; end
+    def set(a); self.data = a; end
+  end
+
+  class MCBool < BinData::Primitive
+    endian :big
+    int8 :data
+    def get; return self.data != 0; end
+    def set(a); self.data = a; end
+  end
+
+  class MCLong < BinData::BasePrimitive
+    BinData::Int.define_methods(self, 64, :big, :signed)
+  end
+
+  class MCMetadata < BinData::Primitive
+    endian :big
+   # array :data, :type => :mc_byte#, :initial_length => 1
+    def get; return self.datax; end
+    def set(a); puts "nie ma setania"; end
+
+    def read(stream)
+      self.datax = []
+      while (x = MCByte.read(stream)) != 127
+        #data.initial_length = data.initial_length+1
+        index = x & 0x1F
+        ty = x >> 5
+
+        val = case ty
+          when 0 then MCByte.read(stream)
+          when 1 then MCShort.read(stream)
+          when 2 then MCInt.read(stream)
+          when 3 then nil # TODO: MC FLOAT!!!
+          when 4 then MCString.read(stream)
+          when 5 then {id: MCShort.read(stream), count: MCByte.read(stream), damage: MCShort.read(stream)}
+          when 6 then [MCInt.read(stream),MCInt.read(stream),MCInt.read(stream)]
+          else nil
+        end
+        self.datax << val
+      end
+    end
+  end
+end

data/lib/mcp/version.rb

@@ -1,3 +1,3 @@
-module Mcp
-  VERSION = "0.0.1"
+module MCP
+  VERSION = "0.0.2"
 end

data/listaserwerow

@@ -0,0 +1 @@
+metropolic.pl:25565

data/mcp.gemspec

@@ -13,5 +13,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "mcp"
   gem.require_paths = ["lib"]
-  gem.version       = Mcp::VERSION
+  gem.version       = MCP::VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mcp
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2012-08-01 00:00:00.000000000 Z
 dependencies: []
 description: Minecraft Protocol implementation
 email:
@@ -23,11 +23,14 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- fail.rb
 - lib/mcp.rb
-- lib/mcp/protocol/packets.rb
-- lib/mcp/protocol/types.rb
-- lib/mcp/protocol29/packets.rb
+- lib/mcp/connection.rb
+- lib/mcp/packets.rb
+- lib/mcp/packets_util.rb
+- lib/mcp/types.rb
 - lib/mcp/version.rb
+- listaserwerow
 - mcp.gemspec
 homepage: ''
 licenses: []

data/lib/mcp/protocol/packets.rb

@@ -1,27 +0,0 @@
-require 'mcp/protocol/types'
-module MCP
-  module Protocol
-    module Packets
-      
-      def mapping
-        constants.each_with_object({}) do |constant_name, result|
-          klass = const_get(constant_name)
-          next unless klass.is_a?(Class)
-          next unless klass < Packet
-          next unless klass::Type != :to_server
-          result[klass::Id] = klass
-        end
-      end
-
-      private
-      class Packet < BinData::Record
-        def with_id
-            packet = self.class
-            id = packet::Id rescue 0
-            MCUbyte.new(id).to_binary_s + to_binary_s
-        end
-      end
-
-    end
-  end
-end

data/lib/mcp/protocol/types.rb

@@ -1,70 +0,0 @@
-#packet id to U(!)byte
-#byte => int8
-#short => int16
-#int => int32
-require 'bindata'
-module MCP
-  module Protocol
-    module Types
-      class MCByte < BinData::Primitive
-        endian :big
-        int8 :data
-        def get; return self.data; end
-        def set(a); self.data = a; end
-      end
-
-      class MCUbyte < BinData::Primitive
-        endian :big
-        uint8 :data
-        def get; return self.data; end
-        def set(a); self.data = a; end
-      end
-
-      class MCShort < BinData::Primitive
-        endian :big
-        int16 :data
-        def get; return self.data; end
-        def set(a); self.data = a; end
-      end
-
-      class MCInt < BinData::Primitive
-        endian :big
-        int32 :data
-        def get; return self.data; end
-        def set(a); self.data = a; end
-      end
-
-      class MCString < BinData::Primitive
-        endian :big
-        int16  :len,  value: lambda { length }
-        string :data, read_length: lambda { 2*len}
-
-        def get; return self.data.force_encoding("utf-16be").encode("utf-8"); end
-        def set(a) 
-          length = a.length
-          self.data = a.encode("utf-16be")
-        end
-      end
-
-      class MCByteArray < BinData::Primitive
-        endian :big
-        int16 :len
-        array :data, :type => :mc_byte, :initial_length => lambda {len}
-
-        def get; return self.data; end
-        def set(a); self.data = a; end
-      end
-
-      class MCBool < BinData::Primitive
-        endian :big
-        int8 :data
-        def get; return self.data != 0; end
-        def set(a); self.data = a; end
-      end
-
-      class MCLong < BinData::BasePrimitive
-        BinData::Int.define_methods(self, 64, :big, :signed)
-      end
-    end
-end
-

data/lib/mcp/protocol29/packets.rb

@@ -1,87 +0,0 @@
-require 'mcp/protocol/packets'
-require 'mcp/protocol/types'
-module MCP
-  module Protocol29
-    module Packets
-      include Protocol
-      class Plugin < Packet
-        Id = 0xFA
-        Type = :to_client
-
-        mc_string :channel
-        mc_byte_array :data#, read_length: lambda {data_length}
-      end
-
-      class LoginRequest < Packet
-        Id = 0x01
-        Type = :to_server
-
-        mc_int  :protocol_version, value: 29 # int
-
-        mc_string :nick
-        mc_string :notused
-
-        mc_int  :notused1, value: 0 #int
-        mc_int  :notused2, value: 0 # int
-        mc_byte :notused3, value: 0 # byte
-        mc_ubyte :notused4, value: 0 #unsigned byte
-        mc_ubyte :notused5, value: 0 # ungsigned byte
-      end
-
-      class LoginResponse < Packet
-        Id = 0x01
-        Type = :to_client # u can only receive it @_@
-
-        mc_int  :entity_id
-
-        mc_string :comment
-        mc_string :level_type
-
-
-        mc_int :server_mode
-        mc_int :dimension
-        mc_byte :difficulty 
-        mc_ubyte :notused 
-        mc_ubyte :max_players
-      end
-
-      class SpawnPosition < Packet
-        Id = 6
-        Type = :to_client
-        mc_int :x
-        mc_int :y
-        mc_int :z
-      end
-      class Msg < Packet
-        Id = 3
-        Type = :both
-
-        mc_string :msg
-      end
-
-      class Kick < Packet
-        Id = 0xFF
-        Type = :to_client
-
-        mc_string :reason
-      end
-
-      class PlayerAbilities < Packet
-        Id = 0xCA
-        Type = :both
-
-        mc_bool :god
-        mc_bool :flying
-        mc_bool :can_fly
-        mc_bool :instant_destroy
-      end
-
-      class TimeUpdate < Packet
-        Id = 0x04
-        Type = :to_client
-
-        mc_long :time
-      end
-    end
-  end
-end