Modularise! Also add some unit tests.

data/plugins/bootstrap.rb

@@ -15,14 +15,14 @@
 require 'java'
 
 java_import 'org.apollo.game.command.CommandListener'
-java_import 'org.apollo.game.message.MessageHandler'
+java_import 'org.apollo.game.message.handler.MessageHandler'
 java_import 'org.apollo.game.model.World'
 java_import 'org.apollo.game.model.entity.Player'
 java_import 'org.apollo.game.model.event.EventListener'
 java_import 'org.apollo.game.model.event.PlayerEvent'
 java_import 'org.apollo.game.model.entity.setting.PrivilegeLevel'
 java_import 'org.apollo.game.scheduling.ScheduledTask'
-java_import 'org.apollo.util.plugin.PluginContext'
+java_import 'org.apollo.game.plugin.PluginContext'
 
 # Alias the privilege levels.
 RIGHTS_ADMIN    = PrivilegeLevel::ADMINISTRATOR

data/plugins/cmd/item/item.rb

@@ -1,6 +1,6 @@
 require 'java'
 
-java_import 'org.apollo.game.model.def.ItemDefinition'
+java_import 'org.apollo.cache.def.ItemDefinition'
 
 # Adds the specified item to the player's inventory.
 on :command, :item, RIGHTS_ADMIN do |player, command|

data/plugins/cmd/lookup/lookup.rb

@@ -1,9 +1,9 @@
 require 'java'
 
 java_import 'org.apollo.game.model.World'
-java_import 'org.apollo.game.model.def.ItemDefinition'
-java_import 'org.apollo.game.model.def.NpcDefinition'
-java_import 'org.apollo.game.model.def.ObjectDefinition'
+java_import 'org.apollo.cache.def.ItemDefinition'
+java_import 'org.apollo.cache.def.NpcDefinition'
+java_import 'org.apollo.cache.def.ObjectDefinition'
 java_import 'org.apollo.game.model.entity.Entity'
 java_import 'org.apollo.game.model.entity.Player'
 

data/plugins/entity/spawning/npc-spawn.rb

@@ -1,11 +1,11 @@
 require 'java'
 
+java_import 'org.apollo.cache.def.NpcDefinition'
 java_import 'org.apollo.game.action.Action'
 java_import 'org.apollo.game.model.Animation'
 java_import 'org.apollo.game.model.Graphic'
 java_import 'org.apollo.game.model.Position'
 java_import 'org.apollo.game.model.World'
-java_import 'org.apollo.game.model.def.NpcDefinition'
 java_import 'org.apollo.game.model.entity.Npc'
 
 # Information about npc spawning

data/plugins/skill/herblore/ingredient.rb

@@ -3,7 +3,6 @@ require 'java'
 java_import 'org.apollo.game.action.Action'
 java_import 'org.apollo.game.model.Animation'
 java_import 'org.apollo.game.model.Item'
-java_import 'org.apollo.game.model.def.ItemDefinition'
 java_import 'org.apollo.game.model.inter.EnterAmountListener'
 java_import 'org.apollo.game.model.inter.dialogue.DialogueAdapter'
 
@@ -190,8 +189,7 @@ class GrindingAction < Action
       return true if pst_mrt and ingr
     end
 
-    ingr = ItemDefinition.lookup(raw).name.downcase
-    mob.send_message("You do not have any more #{ingr}s.")
+    mob.send_message("You do not have any more #{name_of(raw).downcase}s.")
     return false
   end
   

data/plugins/skill/herblore/potion.rb

@@ -3,7 +3,6 @@ require 'java'
 java_import 'org.apollo.game.action.Action'
 java_import 'org.apollo.game.model.Animation'
 java_import 'org.apollo.game.model.Item'
-java_import 'org.apollo.game.model.def.ItemDefinition'
 java_import 'org.apollo.game.model.inter.EnterAmountListener'
 java_import 'org.apollo.game.model.inter.dialogue.DialogueAdapter'
 
@@ -271,7 +270,7 @@ class FinishedMixingAction < MixingAction
   
   def execute_action
     player = mob    
-    ingredient = ItemDefinition.lookup(@ingredient).name.downcase
+    ingredient = name_of(@ingredient).downcase
     name = @potion.item.definition.name.sub('(3)', '')
 
     player.send_message("You add the #{ingredient} to the mixture to make an #{name}.", true)

data/plugins/skill/mining/mining.rb

@@ -1,7 +1,6 @@
 require 'java'
 
 java_import 'org.apollo.game.action.DistancedAction'
-java_import 'org.apollo.game.model.def.ItemDefinition'
 java_import 'org.apollo.game.model.entity.EquipmentConstants'
 java_import 'org.apollo.game.model.entity.Skill'
 
@@ -62,11 +61,10 @@ class MiningAction < DistancedAction
     else
       # count down and check if we can have a chance at some ore now
       if @counter == 0
-        # TODO: calculate the chance that the mob can actually get the rock
+        # TODO: calculate the chance that the player can actually get the rock
 
         if mob.inventory.add(ore.id)
-          ore_def = ItemDefinition.lookup(@ore.id) # TODO: split off into some method
-          name = ore_def.name.sub(/ ore$/, '').downcase
+          name = name_of(@ore.id).sub(/ ore$/, '').downcase
 
           mob.send_message("You manage to mine some #{name}.", true)
           skills.add_experience(Skill::MINING, ore.exp)

data/plugins/skill/mining/plugin.xml

@@ -18,5 +18,7 @@
     <script>respawn.rb</script>
     <script>mining.rb</script>
   </scripts>
-  <dependencies />
+  <dependencies>
+    <dependency>util</dependency>
+  </dependencies>
 </plugin>

data/plugins/skill/runecraft/rune.rb

@@ -1,7 +1,5 @@
 require 'java'
 
-java_import 'org.apollo.game.model.def.ItemDefinition'
-
 # The hash of runes.
 RUNES = {}
 

data/plugins/util/command.rb

@@ -1,8 +1,8 @@
 require 'java'
 
-java_import 'org.apollo.game.model.def.ItemDefinition'
-java_import 'org.apollo.game.model.def.NpcDefinition'
-java_import 'org.apollo.game.model.def.ObjectDefinition'
+java_import 'org.apollo.cache.def.ItemDefinition'
+java_import 'org.apollo.cache.def.NpcDefinition'
+java_import 'org.apollo.cache.def.ObjectDefinition'
 
 
 # Checks whether the amount of arguments provided is correct, sending the player the specified message if not.