Fixed method names to fit with Java Style Guidelines.

Author: MrTwiggy

bin/com/github/MrTwiggy/OreGin/OreGin.class

@@ -43,7 +43,7 @@ public OreGinListener(OreGinManager oreGinMan)
 	 * Checks to see if an OreGin can be created
 	 */
 	@EventHandler
-	public void OreGinInteraction(PlayerInteractEvent event)
+	public void oreGinInteraction(PlayerInteractEvent event)
 	{
 		Block clicked = event.getClickedBlock();
 		Player creator = event.getPlayer();
@@ -56,29 +56,29 @@ public void OreGinInteraction(PlayerInteractEvent event)
 				if (creator.getItemInHand().getType().equals(OreGinPlugin.OREGIN_UPGRADE_WAND))
 				{
 
-					if (oreGinMan.OreGinExistsAt(clicked.getLocation()))
+					if (oreGinMan.oreGinExistsAt(clicked.getLocation()))
 					{
-						OreGin oreGin = oreGinMan.GetOreGin(clicked.getLocation());
+						OreGin oreGin = oreGinMan.getOreGin(clicked.getLocation());
 						creator.sendMessage(oreGin.upgrade());
 					}
 					else
 					{
-						creator.sendMessage(oreGinMan.CreateOreGin(clicked.getLocation()));
+						creator.sendMessage(oreGinMan.createOreGin(clicked.getLocation()));
 					}
 				} //Activate or de-activate OreGin
 				else if (creator.getItemInHand().getType().equals(OreGinPlugin.OREGIN_ACTIVATION_WAND))
 				{
-					if (oreGinMan.OreGinExistsAt(clicked.getLocation()))
+					if (oreGinMan.oreGinExistsAt(clicked.getLocation()))
 					{
-						OreGin oreGin = oreGinMan.GetOreGin(clicked.getLocation());
+						OreGin oreGin = oreGinMan.getOreGin(clicked.getLocation());
 						creator.sendMessage(oreGin.togglePower());
 					}
 				} //Repair OreGin
 				else if (creator.getItemInHand().getType().equals(OreGinPlugin.OREGIN_REPAIR_WAND))
 				{
-					if (oreGinMan.OreGinExistsAt(clicked.getLocation()))
+					if (oreGinMan.oreGinExistsAt(clicked.getLocation()))
 					{
-						OreGin oreGin = oreGinMan.GetOreGin(clicked.getLocation());
+						OreGin oreGin = oreGinMan.getOreGin(clicked.getLocation());
 						creator.sendMessage(oreGin.repair());
 					}
 				}
@@ -92,18 +92,18 @@ else if (creator.getItemInHand().getType().equals(OreGinPlugin.OREGIN_REPAIR_WAN
 	 * Checks to see if an OreGin (dispenser or light) is being destroyed (block broken)
 	 */
 	@EventHandler
-	public void OreGinBroken(BlockBreakEvent event)
+	public void oreGinBroken(BlockBreakEvent event)
 	{
 		Block destroyed = event.getBlock();
 
 		if ((destroyed.getState() instanceof Dispenser) || destroyed.getType().equals(OreGinPlugin.LIGHT_ON)
 				|| destroyed.getType().equals(OreGinPlugin.LIGHT_OFF))
 		{
-			if (oreGinMan.OreGinExistsAt(destroyed.getLocation()) || oreGinMan.OreGinLightExistsAt(destroyed.getLocation()))
+			if (oreGinMan.oreGinExistsAt(destroyed.getLocation()) || oreGinMan.oreGinLightExistsAt(destroyed.getLocation()))
 			{
-				OreGin oreGin = oreGinMan.GetOreGin(destroyed.getLocation());
-				if (oreGinMan.OreGinLightExistsAt(destroyed.getLocation()))
-					oreGin = oreGinMan.GetOreGin(destroyed.getRelative(BlockFace.DOWN).getLocation());
+				OreGin oreGin = oreGinMan.getOreGin(destroyed.getLocation());
+				if (oreGinMan.oreGinLightExistsAt(destroyed.getLocation()))
+					oreGin = oreGinMan.getOreGin(destroyed.getRelative(BlockFace.DOWN).getLocation());
 
 				if (!isReinforced(oreGin.getLocation().getBlock()) && 
 					!isReinforced(oreGin.getLocation().getBlock().getRelative(BlockFace.UP)))
@@ -126,22 +126,22 @@ else if (isReinforced(oreGin.getLocation().getBlock()) ||
 	 * Checks to see if an OreGin has been placed
 	 */
 	@EventHandler
-	public void OreGinPlaced(BlockPlaceEvent event)
+	public void oreGinPlaced(BlockPlaceEvent event)
 	{
 		Block placed = event.getBlock();
 
-		if (oreGinMan.IsOreGin(event.getItemInHand()))
+		if (oreGinMan.isOreGin(event.getItemInHand()))
 		{
-			if (OreGin.validOreGinCreationLocation(placed.getLocation()))
+			if (OreGin.isValidOreGinCreationLocation(placed.getLocation()))
 			{
 				OreGin oreGin = new OreGin(placed.getLocation(), OreGin.getTierLevel(event.getItemInHand().getItemMeta().getDisplayName()), 
 						OreGin.getBlockBreaksFromLore(event.getItemInHand().getItemMeta().getLore()), oreGinMan);
-				oreGinMan.AddOreGin(oreGin);
+				oreGinMan.addOreGin(oreGin);
 				event.getPlayer().sendMessage(ChatColor.GREEN + "An OreGin of tier level " + oreGin.getTierLevel() + " was placed!");
 			}
 			else
 			{
-				OreGinSoundCollection.ErrorSound().playSound(placed.getLocation());
+				OreGinSoundCollection.getErrorSound().playSound(placed.getLocation());
 				event.getPlayer().sendMessage(ChatColor.RED + "Space above OreGin must be empty!");
 				event.setCancelled(true);
 			}
@@ -153,7 +153,7 @@ public void OreGinPlaced(BlockPlaceEvent event)
 	 * Helps with organizing inventory
 	 */
 	@EventHandler 
-	public void MovedOreGin(InventoryClickEvent event)
+	public void movedOreGin(InventoryClickEvent event)
 	{
 		ItemStack cursorItem = event.getCursor();
 		ItemStack slotItem = event.getCurrentItem();
@@ -162,7 +162,7 @@ public void MovedOreGin(InventoryClickEvent event)
 		{
 			if (slotItem.getType() == Material.DISPENSER)
 			{
-				if (oreGinMan.IsOreGin(cursorItem) || oreGinMan.IsOreGin(slotItem))
+				if (oreGinMan.isOreGin(cursorItem) || oreGinMan.isOreGin(slotItem))
 				{
 					if ((cursorItem.getItemMeta().getDisplayName() != slotItem.getItemMeta().getDisplayName())
 							|| cursorItem.getItemMeta().getLore() != slotItem.getItemMeta().getLore())
@@ -180,17 +180,17 @@ public void MovedOreGin(InventoryClickEvent event)
 	 * Maintains the OreGin lights stable
 	 */
 	@EventHandler
-	public void KeepLightsStable(BlockRedstoneEvent event)
+	public void keepLightsStable(BlockRedstoneEvent event)
 	{
 		if (event.getBlock().getType().equals(OreGinPlugin.LIGHT_ON) || event.getBlock().getType().equals(OreGinPlugin.LIGHT_OFF))
 		{
-			if (oreGinMan.OreGinLightExistsAt(event.getBlock().getLocation()))
+			if (oreGinMan.oreGinLightExistsAt(event.getBlock().getLocation()))
 			{
-				if (oreGinMan.GetOreGin(event.getBlock().getRelative(BlockFace.DOWN).getLocation()).getMining())
+				if (oreGinMan.getOreGin(event.getBlock().getRelative(BlockFace.DOWN).getLocation()).getMining())
 				{
 					event.setNewCurrent(1);
 				}
-				else if (!oreGinMan.GetOreGin(event.getBlock().getRelative(BlockFace.DOWN).getLocation()).getBroken())
+				else if (!oreGinMan.getOreGin(event.getBlock().getRelative(BlockFace.DOWN).getLocation()).getBroken())
 				{
 					event.setNewCurrent(0);
 				}
@@ -202,9 +202,9 @@ else if (!oreGinMan.GetOreGin(event.getBlock().getRelative(BlockFace.DOWN).getLo
 	 * Stops OreGins from dispensing fuel or materials
 	 */
 	@EventHandler
-	public void OreGinDispense(BlockDispenseEvent event)
+	public void oreGinDispense(BlockDispenseEvent event)
 	{
-		event.setCancelled(oreGinMan.OreGinExistsAt(event.getBlock().getLocation()));
+		event.setCancelled(oreGinMan.oreGinExistsAt(event.getBlock().getLocation()));
 	}
 
 

bin/com/github/MrTwiggy/OreGin/OreGinListener.class

@@ -56,7 +56,10 @@ public void updateOreGins()
 		    public void run() 
 		    {
 		    	blockBreaksDuringCycle = 0;
-		        UpdateOreGins();
+		    	for (OreGin oreGin : oreGins)
+				{
+					oreGin.update();
+				}
 		    }
 		}, 0L, OreGinPlugin.UPDATE_CYCLE);
 	}
@@ -100,7 +103,7 @@ public void load(File file) throws IOException
 			boolean broken = Boolean.parseBoolean(parts[8]);
 
 			OreGin oreGin = new OreGin(blockBreaks, tierLevel, mining, broken, miningDistance, oreGinLocation, this);
-			AddOreGin(oreGin);
+			addOreGin(oreGin);
 		}
 
 		OreGinPlugin.sendConsoleMessage("Successfully loaded " + oreGins.size() + " Ore Gins!");
@@ -144,56 +147,45 @@ public void save(File file) throws IOException {
 		bufferedWriter.flush();
 		fileOutputStream.close();
 	}
-	
-	/**
-	 * Updates all the OreGins
-	 */
-	public void UpdateOreGins()
-	{
-		for (OreGin oreGin : oreGins)
-		{
-			oreGin.update();
-		}
-	}
-	
+
 	/**
 	 * Attempts to create an OreGin at the location and returns result message
 	 */
-	public String CreateOreGin(Location machineLocation)
+	public String createOreGin(Location machineLocation)
 	{
 		OreGinProperties desiredTierProperties = OreGinPlugin.Ore_Gin_Properties.get(1);
-		Material upgradeMaterial = desiredTierProperties.GetUpgradeMaterial();
+		Material upgradeMaterial = desiredTierProperties.getUpgradeMaterial();
 
-		if (OreGin.validOreGinCreationLocation(machineLocation))
+		if (OreGin.isValidOreGinCreationLocation(machineLocation))
 		{
-			if (!OreGinExistsAt(machineLocation) && OreGin.validUpgrade(machineLocation, 1))
+			if (!oreGinExistsAt(machineLocation) && OreGin.isValidUpgrade(machineLocation, 1))
 			{
 				OreGin oreGin = new OreGin(machineLocation, this);
-				AddOreGin(oreGin);
+				addOreGin(oreGin);
 				oreGin.removeUpgradeMaterial(1);
 				plugin.getLogger().info("New OreGin created!");
 				return ChatColor.GREEN + "Successfully created OreGin!";
 			}
 			else
 			{
-				OreGinSoundCollection.ErrorSound().playSound(machineLocation);
-				return ChatColor.RED + "Missing creation materials! " + OreGin.requiredAvailableMaterials(desiredTierProperties.GetUpgradeAmount(),
+				OreGinSoundCollection.getErrorSound().playSound(machineLocation);
+				return ChatColor.RED + "Missing creation materials! " + OreGin.getRequiredAvailableMaterials(desiredTierProperties.getUpgradeAmount(),
 						upgradeMaterial, machineLocation);	
 			}
 		}
 		else
 		{
-			OreGinSoundCollection.ErrorSound().playSound(machineLocation);
+			OreGinSoundCollection.getErrorSound().playSound(machineLocation);
 			return ChatColor.RED + "Space above OreGin must be empty!";
 		}
 	}
 
 	/**
 	 * Attempts to create an OreGin of given OreGin data
 	 */
-	public boolean AddOreGin(OreGin oreGin)
+	public boolean addOreGin(OreGin oreGin)
 	{
-		if(oreGin.getLocation().getBlock().getType().equals(Material.DISPENSER) && !OreGinExistsAt(oreGin.getLocation()))
+		if(oreGin.getLocation().getBlock().getType().equals(Material.DISPENSER) && !oreGinExistsAt(oreGin.getLocation()))
 		{
 			oreGins.add(oreGin);
 			return true;
@@ -207,7 +199,7 @@ public boolean AddOreGin(OreGin oreGin)
 	/**
 	 * Returns the OreGin with a matching Location, if any
 	 */
-	public OreGin GetOreGin(Location machineLocation)
+	public OreGin getOreGin(Location machineLocation)
 	{
 		for (OreGin oreGin : oreGins)
 		{
@@ -229,15 +221,15 @@ public void removeOreGin(OreGin oreGin)
 	/**
 	 * Returns whether an OreGin exists at the given Location
 	 */
-	public boolean OreGinExistsAt(Location machineLocation)
+	public boolean oreGinExistsAt(Location machineLocation)
 	{
-		return (GetOreGin(machineLocation) != null);
+		return (getOreGin(machineLocation) != null);
 	}
 
 	/**
 	 * Returns whether item is an OreGin
 	 */
-	public boolean IsOreGin(ItemStack item)
+	public boolean isOreGin(ItemStack item)
 	{
 		boolean result = false;
 
@@ -259,9 +251,9 @@ public boolean IsOreGin(ItemStack item)
 	/**
 	 * Returns whether location contains an OreGin light
 	 */
-	public boolean OreGinLightExistsAt(Location lightLocation)
+	public boolean oreGinLightExistsAt(Location lightLocation)
 	{
-		return (OreGinExistsAt(lightLocation.getBlock().getRelative(BlockFace.DOWN).getLocation())
+		return (oreGinExistsAt(lightLocation.getBlock().getRelative(BlockFace.DOWN).getLocation())
 				&& (lightLocation.getBlock().getType().equals(OreGinPlugin.LIGHT_OFF) 
 						|| lightLocation.getBlock().getType().equals(OreGinPlugin.LIGHT_ON)));
 	}