game_machine.rb in game_machine-1.0.2

- old
+ new

@@ -1,6 +1,5 @@
-
 require 'rbconfig'
 
 require_relative 'game_machine/ruby_extensions/nilclass'
 require_relative 'game_machine/ruby_extensions/string'
 require_relative 'game_machine/securerandom'
@@ -16,70 +15,72 @@
 
   def self.java_root
     ENV.fetch('JAVA_ROOT')
   end
 end
+
 require 'java'
 
-jars = Dir[File.join(GameMachine.app_root, 'java/lib', '*.jar')]
-jars.each {|jar| require jar}
+jars = Dir[File.join(GameMachine.java_root, 'lib', '*.jar')]
+jars.each do |jar|
+  require jar
+end
 
-#java_import 'com.game_machine.core.net.client.UdtClient'
-#java_import 'com.game_machine.core.net.client.UdtClientHandler'
 
 require_relative 'game_machine/java_lib'
 
 require_relative 'game_machine/protobuf'
 require_relative 'game_machine/version'
 require_relative 'game_machine/grid'
-require_relative 'game_machine/game_loader'
 require_relative 'game_machine/message_buffer'
 require_relative 'game_machine/vector'
 require_relative 'game_machine/logger'
+require_relative 'game_machine/hocon_config'
 require_relative 'game_machine/app_config'
 require_relative 'game_machine/helpers/state_machine'
 require_relative 'game_machine/actor'
 require_relative 'game_machine/commands'
 require_relative 'game_machine/model'
 require_relative 'game_machine/models'
 require_relative 'game_machine/handlers/authentication'
-require_relative 'game_machine/hashring'
 require_relative 'game_machine/application'
 require_relative 'game_machine/game_systems'
 require_relative 'game_machine/handlers/request'
 require_relative 'game_machine/handlers/game'
+require_relative 'game_machine/handlers/player_authentication'
 require_relative 'game_machine/actor/builder'
 require_relative 'game_machine/message_queue'
 require_relative 'game_machine/object_db'
 require_relative 'game_machine/write_behind_cache'
 require_relative 'game_machine/data_store'
-require_relative 'game_machine/auth_handlers/base'
-require_relative 'game_machine/auth_handlers/public'
 require_relative 'game_machine/system_monitor'
 require_relative 'game_machine/cluster_monitor'
 require_relative 'game_machine/system_stats'
 require_relative 'game_machine/reloadable_monitor'
 require_relative 'game_machine/client_manager'
 require_relative 'game_machine/scheduler'
 require_relative 'game_machine/endpoints'
 require_relative 'game_machine/protobuf_extensions/entity_helper'
 require_relative 'game_machine/helpers/game_message'
-require_relative 'game_machine/grid_replicator'
 require_relative 'game_machine/akka'
 require_relative 'game_machine/clients'
 require_relative 'game_machine/mono_server'
 require_relative 'game_machine/restart_watcher'
 require_relative 'game_machine/uniqueid'
+require_relative 'game_machine/wavefront_ext'
+require_relative 'game_machine/routes'
+require_relative 'game_machine/default_handlers'
+require_relative 'game_machine/cloud_updater'
 
-if Config::CONFIG['target_os'] == 'linux'
-  require_relative 'game_machine/navigation'
+if RbConfig::CONFIG['host_os'].match(/linux/i)
+  #require_relative 'game_machine/navigation'
 else
   GameMachine.logger.info "Pathfinding disabled (windows support not yet available)"
 end
 
-
 java.util.concurrent.TimeUnit::MILLISECONDS
 java.util.concurrent.TimeUnit::SECONDS
 
-
-
-
+Signal.trap("TERM") {
+  puts "Caught SIGTERM, exiting"
+  System.exit(0)
+}