Repackage everything

src/com/cnaude/chairs/sitaddons/ChairEffects.java

@@ -0,0 +1,109 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.cnaude.chairs.sitaddons;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Item;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerPickupItemEvent;
+
+import com.cnaude.chairs.core.Chairs;
+
+/**
+ *
+ * @author cnaude
+ */
+public class ChairEffects {
+
+    private Chairs plugin;
+    private int healTaskID = -1;
+    private int pickupTaskID = -1;
+    
+
+    public ChairEffects(Chairs plugin) {
+        this.plugin = plugin;
+    }
+    
+    public void startHealing() {
+        healEffectsTask();
+    }
+
+    public void cancelHealing() {
+    	if (healTaskID != -1) {
+    		plugin.getServer().getScheduler().cancelTask(healTaskID);
+    		healTaskID = -1;
+    	}
+    }
+    
+    public void restartHealing() {
+    	cancelHealing();
+        startHealing();
+    }
+
+    private void healEffectsTask() {
+        healTaskID = plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
+            @Override
+            public void run() {
+                for (Player p : Bukkit.getOnlinePlayers()) {
+                    if (plugin.getPlayerSitData().isSitting(p)) {
+                        if (p.hasPermission("chairs.sit.health")) {
+                            double pHealthPcnt = ((double) p.getHealth()) / (double) p.getMaxHealth() * 100d;
+                            if ((pHealthPcnt < plugin.sitMaxHealth) && (p.getHealth() < p.getMaxHealth())) {
+                                double newHealth = plugin.sitHealthPerInterval + p.getHealth();
+                                if (newHealth > p.getMaxHealth()) {
+                                    newHealth = p.getMaxHealth();
+                                }
+                                p.setHealth(newHealth);
+                            }
+                        }
+                    }
+                }
+            }
+        }, plugin.sitHealInterval, plugin.sitHealInterval);
+    }
+    
+    public void startPickup() {
+    	pickupEffectsTask();
+    }
+
+    public void cancelPickup() {
+    	if (pickupTaskID != -1)
+        plugin.getServer().getScheduler().cancelTask(pickupTaskID);
+        pickupTaskID = -1;
+    }
+    
+    public void restartPickup() {
+    	cancelPickup();
+    	startPickup();
+    }
+    
+    private void pickupEffectsTask() {
+    	pickupTaskID = plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
+    		public void run() {
+                for (Player p : Bukkit.getOnlinePlayers()) {
+                	if (plugin.getPlayerSitData().isSitting(p)) {
+                		for (Entity entity : p.getNearbyEntities(1, 2, 1)) {
+                			if (entity instanceof Item) {
+                                if (p.getInventory().firstEmpty() != -1) {
+                    				Item item = (Item) entity;
+                                	PlayerPickupItemEvent pickupevent = new PlayerPickupItemEvent(p, item, 0);
+                                	Bukkit.getPluginManager().callEvent(pickupevent);
+                                	if (!pickupevent.isCancelled()) {
+                                		if (item.getPickupDelay() == 0) {
+                                			p.getInventory().addItem(item.getItemStack());
+                                			entity.remove();
+                                		}
+                                	}
+                                }
+                			}
+                		}
+                    }
+                }
+    		}
+    	},0,1);
+    }
+    
+}

src/com/cnaude/chairs/sitaddons/CommandRestrict.java

@@ -0,0 +1,47 @@
+package com.cnaude.chairs.sitaddons;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+
+import com.cnaude.chairs.core.Chairs;
+
+public class CommandRestrict implements Listener {
+	
+	private Chairs plugin;
+	public CommandRestrict(Chairs plugin) {
+		this.plugin = plugin;
+	}
+	
+    @EventHandler(priority=EventPriority.LOWEST)
+    public void onPlayerCommand(PlayerCommandPreprocessEvent event)
+    {
+    	Player player = event.getPlayer();
+    	String playercommand = event.getMessage().toLowerCase();
+    	if (plugin.getPlayerSitData().isSitting(player))
+    	{
+			if (plugin.sitDisableAllCommands)
+			{
+				event.setCancelled(true);
+				player.sendMessage(plugin.msgCommandRestricted);
+				return;
+			}
+    		for (String disabledCommand : plugin.sitDisabledCommands)
+    		{
+    			if (disabledCommand.startsWith(playercommand))
+    			{
+    				String therest = playercommand.replace(disabledCommand, "");
+    				if (therest.isEmpty() || therest.startsWith(" "))
+    				{
+    					event.setCancelled(true);
+    					player.sendMessage(plugin.msgCommandRestricted);
+    					return;
+    				}
+    			}
+    		}
+    	}
+    }
+
+}