Update to netty 4.

data/plugins/bootstrap.rb

@@ -16,13 +16,14 @@ require 'java'
 java_import 'org.apollo.game.event.handler.EventHandler'
 java_import 'org.apollo.game.command.CommandListener'
 java_import 'org.apollo.game.model.Player'
+java_import 'org.apollo.game.model.settings.PrivilegeLevel'
 java_import 'org.apollo.game.model.World'
 java_import 'org.apollo.game.scheduling.ScheduledTask'
 
 # Alias the privilege levels.
-RIGHTS_ADMIN    = Player::PrivilegeLevel::ADMINISTRATOR
-RIGHTS_MOD      = Player::PrivilegeLevel::MODERATOR
-RIGHTS_STANDARD = Player::PrivilegeLevel::STANDARD
+RIGHTS_ADMIN    = PrivilegeLevel::ADMINISTRATOR
+RIGHTS_MOD      = PrivilegeLevel::MODERATOR
+RIGHTS_STANDARD = PrivilegeLevel::STANDARD
 
 # Extends the (Ruby) String class with a method to convert a lower case,
 # underscore delimited string to camel-case.

data/plugins/cmd-lookup/lookup.rb

@@ -1,5 +1,8 @@
 require 'java'
 java_import 'org.apollo.game.model.Player'
+java_import 'org.apollo.game.model.def.ItemDefinition'
+java_import 'org.apollo.game.model.def.NpcDefinition'
+java_import 'org.apollo.game.model.def.ObjectDefinition'
 
 on :command, :lookup, RIGHTS_ADMIN do |player, command|
   args = command.arguments.to_a
@@ -11,7 +14,7 @@ on :command, :lookup, RIGHTS_ADMIN do |player, command|
   type = args.shift.downcase
   name = args.join(" ").downcase
 
-  if ["npc","object","item"].index(type) == nil
+  if ["npc", "object", "item"].index(type) == nil
     player.send_message("Invalid syntax - ::lookup [npc/object/item] [name]") 
     return
   end
@@ -37,6 +40,6 @@ on :command, :iteminfo, RIGHTS_ADMIN do |player, command|
   definition = ItemDefinition.lookup(id)
 
   members = definition.is_members_only ? "members" : "not members"
-  player.send_message("Item #{id} is called #{definition.name}, is #{members} only, and a has a team of #{definition.team}.")
+  player.send_message("Item #{id} is called #{definition.name}, is #{members} only, and has a team of #{definition.team}.")
   player.send_message("Its description is \"#{definition.description}\".")
 end

data/plugins/npc/spawns.rb

@@ -0,0 +1,25 @@
+require 'java'
+java_import 'org.apollo.game.model.Npc'
+java_import 'org.apollo.game.model.World'
+java_import 'org.apollo.game.model.Position'
+
+def register(npc)
+	raise "Npc cannot be nil" if npc == nil
+	World.world.register(npc)
+end
+
+### Lumbridge spawns:
+
+# Generic: 
+register Npc.new(4,    Position.new(3232, 3207))    # woman, southernmost house
+register Npc.new(1,    Position.new(3231, 3237))    # man, house by willow tree
+register Npc.new(2,    Position.new(3224, 3240))    # man, house by willow tree
+register Npc.new(5,    Position.new(3229, 3239))    # woman, house by willow tree
+
+# Other:
+register Npc.new(0,    Position.new(3221, 3221))    # hans
+register Npc.new(456,  Position.new(3243, 3210))    # father aereck
+register Npc.new(519,  Position.new(3231, 3203))    # bob from bob's axes
+register Npc.new(520,  Position.new(3212, 3247))    # shopkeeper
+register Npc.new(521,  Position.new(3211, 3245))    # shop assistant
+register Npc.new(2244, Position.new(3232, 3229))    # lumbridge guide

data/plugins/skill-magic/alchemy.rb

@@ -1,4 +1,5 @@
 require 'java'
+
 java_import 'org.apollo.game.model.Animation'
 java_import 'org.apollo.game.model.Graphic'
 

data/plugins/skill-magic/convert.rb

@@ -1,4 +1,5 @@
 require 'java'
+
 java_import 'org.apollo.game.model.Animation'
 java_import 'org.apollo.game.model.Graphic'
 java_import 'org.apollo.game.model.Item'

data/plugins/skill-magic/element.rb

@@ -1,4 +1,5 @@
 require 'java'
+
 java_import 'org.apollo.game.model.EquipmentConstants'
 
 AIR_ELEMENTS = {}

data/plugins/skill-magic/enchant.rb

@@ -1,4 +1,5 @@
 require 'java'
+
 java_import 'org.apollo.game.model.Animation'
 java_import 'org.apollo.game.model.Graphic'
 java_import 'org.apollo.game.model.Item'

data/plugins/skill-magic/magic.rb

@@ -1,4 +1,5 @@
 require 'java'
+
 java_import 'org.apollo.game.action.Action'
 java_import 'org.apollo.game.event.impl.DisplayTabInterfaceEvent'
 java_import 'org.apollo.game.model.EquipmentConstants'

data/plugins/skill-mining/mining.rb

@@ -1,4 +1,5 @@
 require 'java'
+
 java_import 'org.apollo.game.action.DistancedAction'
 java_import 'org.apollo.game.model.EquipmentConstants'
 java_import 'org.apollo.game.model.def.ItemDefinition'

data/plugins/skill-mining/pickaxe.rb

@@ -1,4 +1,5 @@
 require 'java'
+
 java_import 'org.apollo.game.model.Animation'
 
 PICKAXES = {}