Merge pull request #1 from OnlineCop/master

Minor formatting cleanup, no functional change
poiNt3D · Jun 18, 2015 · 7620763 · 7620763
2 parents da2fb65 + 51b61e2
commit 7620763
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 32 deletions.
diff --git a/src/point3d/sortinghopper/BreakListener.java b/src/point3d/sortinghopper/BreakListener.java
@@ -12,7 +12,7 @@
  * with "customized" hopper. Does not play well with block break protection
  * plugins.
  */
-public final class BreakListener implements Listener{
+public final class BreakListener implements Listener {
 
 	private final SortingHopper plugin;
 
@@ -28,25 +28,25 @@ public BreakListener(SortingHopper plugin) {
 
 	/**
 	 * Event handler for block breaking
-	 * 
+	 *
 	 * @param event the Block Break Event
 	 */
 	@EventHandler
-	public void onBlockBreak(BlockBreakEvent event){
-		if(event.getPlayer().getGameMode() == GameMode.CREATIVE){
+	public void onBlockBreak(BlockBreakEvent event) {
+		if (event.getPlayer().getGameMode() == GameMode.CREATIVE) {
 			return;
 		}
-		if (event.getBlock().getType() == Material.HOPPER){
+		if (event.getBlock().getType() == Material.HOPPER) {
 			Hopper hopper = (Hopper)event.getBlock().getState();
 
-			if(plugin.checkNames(hopper.getInventory().getName())){
+			if (plugin.checkNames(hopper.getInventory().getName())) {
 				ItemStack drop = plugin.getItem();
-				
-				//Looks hacky
+
+				// Looks hacky
 				event.setCancelled(true);
 				event.getBlock().setType(Material.AIR);
 				event.getBlock().getWorld().dropItemNaturally(event.getBlock().getLocation(), drop);
 			}
-		}  
+		}
 	}
 }
diff --git a/src/point3d/sortinghopper/HopperListener.java b/src/point3d/sortinghopper/HopperListener.java
@@ -25,7 +25,7 @@ public HopperListener(SortingHopper plugin) {
 		}
 		this.plugin = plugin;
 	}
-	
+
 	/**
 	 * Inventory movement event, triggered by hopper seek.
 	 *
@@ -37,21 +37,21 @@ public void onInventoryMoveItemEvent(InventoryMoveItemEvent event) {
 		Inventory dest = event.getDestination();
 		Inventory source = event.getSource();
 
-		//Prevent items from being pulled out by other hopper
-		if(plugin.getConfig().getBoolean("preventitempull")){
-			if(plugin.checkNames(source.getName()) && initiator != source){ 
+		// Prevent items from being pulled out by other hopper
+		if (plugin.getConfig().getBoolean("preventitempull")) {
+			if (plugin.checkNames(source.getName()) && initiator != source) {
 				event.setCancelled(true);
 			}
 		}
 
-		if(plugin.checkNames(initiator.getName())){
-			if(!initiator.contains(event.getItem().getType())) {
+		if (plugin.checkNames(initiator.getName())) {
+			if (!initiator.contains(event.getItem().getType())) {
 				event.setCancelled(true);
 
-				//Try to move items in other slots
-				if(dest != initiator) {
-					for(int slot = 1; slot < initiator.getSize(); slot++) {
-						if( this.MoveItem(initiator, slot, dest) ){
+				// Try to move items in other slots
+				if (dest != initiator) {
+					for (int slot = 1; slot < initiator.getSize(); slot++) {
+						if ( this.MoveItem(initiator, slot, dest) ) {
 							break;
 						}
 					}
@@ -62,7 +62,7 @@ public void onInventoryMoveItemEvent(InventoryMoveItemEvent event) {
 
 	/**
 	 * Internal method moveItem, does a move.
-	 * 
+	 *
 	 * @param initiator Inventory source
 	 * @param slot Inventory slot #
 	 * @param dest Inventory destination

diff --git a/src/point3d/sortinghopper/PickupListener.java b/src/point3d/sortinghopper/PickupListener.java
@@ -29,7 +29,7 @@ public PickupListener(SortingHopper plugin) {
 	 */
 	@EventHandler
 	public void onInventoryPickupEvent(InventoryPickupItemEvent event) {
-		if(plugin.checkNames(event.getInventory().getName())) {
+		if (plugin.checkNames(event.getInventory().getName())) {
 			event.setCancelled(true);
 		}
 	}

diff --git a/src/point3d/sortinghopper/SortingHopper.java b/src/point3d/sortinghopper/SortingHopper.java
@@ -18,7 +18,7 @@
 public class SortingHopper extends JavaPlugin {
 
 	private final List<String> names = null;
-	
+
 	/**
 	 * Sets up listeners for the SortingHopper
 	 */
@@ -27,37 +27,37 @@ public void onEnable() {
 		PluginManager pm = getServer().getPluginManager();
 		this.saveDefaultConfig();
 
-		names = this.getConfig().getStringList("names"); 
-		 
+		names = this.getConfig().getStringList("names");
+
 		final HopperListener hopperListener = new HopperListener(this);
 		pm.registerEvents(hopperListener, this);
 
 		if (getConfig().getBoolean("replacedrops")) {
 			final BreakListener breakListener = new BreakListener(this);
-			pm.registerEvents(breakListener, this); 
+			pm.registerEvents(breakListener, this);
 		}
 		if (getConfig().getBoolean("preventitempickup")) {
 			final PickupListener pickupListener = new PickupListener(this);
 			pm.registerEvents(pickupListener, this);
-		}                
+		}
 		if (getConfig().getBoolean("crafting.enabled")) {
 			addRecipe(getItem());
-		}               
+		}
 		getLogger().info("[SortingHopper] started!");
 	}
 
 	/**
 	 * Check the given string against configured names
-	 * 
+	 *
 	 * @param name The name string to test
 	 */
-	public boolean checkNames(String name){
+	public boolean checkNames(String name) {
 		return names.contains(name);
 	}
 
 	/**
 	 * Return an ItemStack with a custom display name
-	 * 
+	 *
 	 * @return an ItemStack with custom meta
 	 */
 	public ItemStack getItem() {
@@ -91,12 +91,12 @@ private void addRecipe(ItemStack item) {
 			getServer().addRecipe(recipe);
 		} else {
 			ShapelessRecipe recipe = new ShapelessRecipe(item);
-			
+
 			List<String> l = getConfig().getStringList("crafting.recipe");
 			for (String s : l) {
 				recipe.addIngredient(Material.matchMaterial(s));
 			}
-			
+
 			getServer().addRecipe(recipe);
 		}
 	}