SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed the packages to follow naming conventions

Browse Source
This commit is contained in:
Andrew 2013-09-26 02:49:24 +12:00
parent b5fee2ba37
commit 80fa5fe7f6
45 changed files with 168 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/me/libraryaddict/disguise/Commands/DisguiseCommand.java
View File

@ -1,14 +1,15 @@
package me.libraryaddict.disguise.Commands; package me.libraryaddict.disguise.commands;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import me.libraryaddict.disguise.DisguiseAPI; import me.libraryaddict.disguise.DisguiseAPI;
import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.DisguiseTypes.DisguiseType; import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.DisguiseTypes.MiscDisguise; import me.libraryaddict.disguise.disguisetypes.MiscDisguise;
import me.libraryaddict.disguise.DisguiseTypes.MobDisguise; import me.libraryaddict.disguise.disguisetypes.MobDisguise;
import me.libraryaddict.disguise.DisguiseTypes.PlayerDisguise; import me.libraryaddict.disguise.disguisetypes.PlayerDisguise;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -17,6 +18,7 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class DisguiseCommand implements CommandExecutor { public class DisguiseCommand implements CommandExecutor {
private ArrayList<String> allowedDisguises(CommandSender sender) { private ArrayList<String> allowedDisguises(CommandSender sender) {

14
src/me/libraryaddict/disguise/Commands/DisguiseEntityCommand.java
View File

@ -1,14 +1,15 @@
package me.libraryaddict.disguise.Commands; package me.libraryaddict.disguise.commands;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import me.libraryaddict.disguise.DisguiseListener; import me.libraryaddict.disguise.DisguiseListener;
import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.DisguiseTypes.DisguiseType; import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.DisguiseTypes.MiscDisguise; import me.libraryaddict.disguise.disguisetypes.MiscDisguise;
import me.libraryaddict.disguise.DisguiseTypes.MobDisguise; import me.libraryaddict.disguise.disguisetypes.MobDisguise;
import me.libraryaddict.disguise.DisguiseTypes.PlayerDisguise; import me.libraryaddict.disguise.disguisetypes.PlayerDisguise;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -16,6 +17,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
public class DisguiseEntityCommand implements CommandExecutor { public class DisguiseEntityCommand implements CommandExecutor {
private DisguiseListener listener; private DisguiseListener listener;

14
src/me/libraryaddict/disguise/Commands/DisguisePlayerCommand.java
View File

@ -1,14 +1,15 @@
package me.libraryaddict.disguise.Commands; package me.libraryaddict.disguise.commands;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import me.libraryaddict.disguise.DisguiseAPI; import me.libraryaddict.disguise.DisguiseAPI;
import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.DisguiseTypes.DisguiseType; import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.DisguiseTypes.MiscDisguise; import me.libraryaddict.disguise.disguisetypes.MiscDisguise;
import me.libraryaddict.disguise.DisguiseTypes.MobDisguise; import me.libraryaddict.disguise.disguisetypes.MobDisguise;
import me.libraryaddict.disguise.DisguiseTypes.PlayerDisguise; import me.libraryaddict.disguise.disguisetypes.PlayerDisguise;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -18,6 +19,7 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class DisguisePlayerCommand implements CommandExecutor { public class DisguisePlayerCommand implements CommandExecutor {
private ArrayList<String> allowedDisguises(CommandSender sender) { private ArrayList<String> allowedDisguises(CommandSender sender) {

14
src/me/libraryaddict/disguise/Commands/DisguiseRadiusCommand.java
View File

@ -1,14 +1,15 @@
package me.libraryaddict.disguise.Commands; package me.libraryaddict.disguise.commands;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import me.libraryaddict.disguise.DisguiseAPI; import me.libraryaddict.disguise.DisguiseAPI;
import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.DisguiseTypes.DisguiseType; import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.DisguiseTypes.MiscDisguise; import me.libraryaddict.disguise.disguisetypes.MiscDisguise;
import me.libraryaddict.disguise.DisguiseTypes.MobDisguise; import me.libraryaddict.disguise.disguisetypes.MobDisguise;
import me.libraryaddict.disguise.DisguiseTypes.PlayerDisguise; import me.libraryaddict.disguise.disguisetypes.PlayerDisguise;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -18,6 +19,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class DisguiseRadiusCommand implements CommandExecutor { public class DisguiseRadiusCommand implements CommandExecutor {
private int maxRadius = 30; private int maxRadius = 30;

4
src/me/libraryaddict/disguise/Commands/UndisguiseCommand.java
View File

@ -1,4 +1,5 @@
package me.libraryaddict.disguise.Commands; package me.libraryaddict.disguise.commands;
import me.libraryaddict.disguise.DisguiseAPI; import me.libraryaddict.disguise.DisguiseAPI;
@ -9,6 +10,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class UndisguiseCommand implements CommandExecutor { public class UndisguiseCommand implements CommandExecutor {
@Override @Override

4
src/me/libraryaddict/disguise/Commands/UndisguiseEntityCommand.java
View File

@ -1,4 +1,5 @@
package me.libraryaddict.disguise.Commands; package me.libraryaddict.disguise.commands;
import me.libraryaddict.disguise.DisguiseListener; import me.libraryaddict.disguise.DisguiseListener;
@ -7,6 +8,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
public class UndisguiseEntityCommand implements CommandExecutor { public class UndisguiseEntityCommand implements CommandExecutor {
private DisguiseListener listener; private DisguiseListener listener;

4
src/me/libraryaddict/disguise/Commands/UndisguisePlayerCommand.java
View File

@ -1,4 +1,5 @@
package me.libraryaddict.disguise.Commands; package me.libraryaddict.disguise.commands;
import me.libraryaddict.disguise.DisguiseAPI; import me.libraryaddict.disguise.DisguiseAPI;
@ -9,6 +10,7 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class UndisguisePlayerCommand implements CommandExecutor { public class UndisguisePlayerCommand implements CommandExecutor {
@Override @Override

4
src/me/libraryaddict/disguise/Commands/UndisguiseRadiusCommand.java
View File

@ -1,4 +1,5 @@
package me.libraryaddict.disguise.Commands; package me.libraryaddict.disguise.commands;
import me.libraryaddict.disguise.DisguiseAPI; import me.libraryaddict.disguise.DisguiseAPI;
@ -9,6 +10,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class UndisguiseRadiusCommand implements CommandExecutor { public class UndisguiseRadiusCommand implements CommandExecutor {
private int maxRadius = 30; private int maxRadius = 30;

8
src/me/libraryaddict/disguise/DisguiseAPI.java
View File

@ -4,9 +4,10 @@ import java.lang.reflect.Field;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import me.libraryaddict.disguise.DisguiseTypes.Disguise;
import me.libraryaddict.disguise.Events.DisguiseEvent; import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.Events.UndisguiseEvent; import me.libraryaddict.disguise.events.DisguiseEvent;
import me.libraryaddict.disguise.events.UndisguiseEvent;
import net.minecraft.server.v1_6_R3.AttributeMapServer; import net.minecraft.server.v1_6_R3.AttributeMapServer;
import net.minecraft.server.v1_6_R3.EntityHuman; import net.minecraft.server.v1_6_R3.EntityHuman;
import net.minecraft.server.v1_6_R3.EntityInsentient; import net.minecraft.server.v1_6_R3.EntityInsentient;
@ -32,6 +33,7 @@ import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import com.comphenix.protocol.Packets; import com.comphenix.protocol.Packets;
import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketContainer;

6
src/me/libraryaddict/disguise/DisguiseListener.java
View File

@ -1,7 +1,10 @@
package me.libraryaddict.disguise; package me.libraryaddict.disguise;
import java.util.HashMap; import java.util.HashMap;
import me.libraryaddict.disguise.DisguiseTypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.Disguise;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -11,6 +14,7 @@ import org.bukkit.event.player.PlayerInteractEntityEvent;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
public class DisguiseListener implements Listener { public class DisguiseListener implements Listener {
private String currentVersion; private String currentVersion;

2
src/me/libraryaddict/disguise/DisguiseTypes/AnimalColor.java
View File

@ -1,4 +1,4 @@
package me.libraryaddict.disguise.DisguiseTypes; package me.libraryaddict.disguise.disguisetypes;
public enum AnimalColor { public enum AnimalColor {
BLACK(15), BLUE(11), BROWN( BLACK(15), BLUE(11), BROWN(

10
src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java
View File

@ -1,15 +1,16 @@
package me.libraryaddict.disguise.DisguiseTypes; package me.libraryaddict.disguise.disguisetypes;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import me.libraryaddict.disguise.DisguiseAPI; import me.libraryaddict.disguise.DisguiseAPI;
import me.libraryaddict.disguise.PacketsManager; import me.libraryaddict.disguise.PacketsManager;
import me.libraryaddict.disguise.DisguiseTypes.Watchers.AgeableWatcher; import me.libraryaddict.disguise.disguisetypes.watchers.AgeableWatcher;
import me.libraryaddict.disguise.DisguiseTypes.Watchers.HorseWatcher; import me.libraryaddict.disguise.disguisetypes.watchers.HorseWatcher;
import me.libraryaddict.disguise.DisguiseTypes.Watchers.ZombieWatcher; import me.libraryaddict.disguise.disguisetypes.watchers.ZombieWatcher;
import net.minecraft.server.v1_6_R3.EntityAgeable; import net.minecraft.server.v1_6_R3.EntityAgeable;
import net.minecraft.server.v1_6_R3.EntityInsentient; import net.minecraft.server.v1_6_R3.EntityInsentient;
import net.minecraft.server.v1_6_R3.EntityLiving; import net.minecraft.server.v1_6_R3.EntityLiving;
@ -25,6 +26,7 @@ import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import com.comphenix.protocol.Packets; import com.comphenix.protocol.Packets;
import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketContainer;

2
src/me/libraryaddict/disguise/DisguiseTypes/DisguiseSound.java
View File

@ -1,4 +1,4 @@
package me.libraryaddict.disguise.DisguiseTypes; package me.libraryaddict.disguise.disguisetypes;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;

2
src/me/libraryaddict/disguise/DisguiseTypes/DisguiseType.java
View File

@ -1,4 +1,4 @@
package me.libraryaddict.disguise.DisguiseTypes; package me.libraryaddict.disguise.disguisetypes;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;

3
src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java
View File

@ -1,4 +1,4 @@
package me.libraryaddict.disguise.DisguiseTypes; package me.libraryaddict.disguise.disguisetypes;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList; import java.util.ArrayList;
@ -12,6 +12,7 @@ import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.EntityEquipment; import org.bukkit.inventory.EntityEquipment;
import com.comphenix.protocol.Packets; import com.comphenix.protocol.Packets;
import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketContainer;

2
src/me/libraryaddict/disguise/DisguiseTypes/MiscDisguise.java
View File

@ -1,4 +1,4 @@
package me.libraryaddict.disguise.DisguiseTypes; package me.libraryaddict.disguise.disguisetypes;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;

8
src/me/libraryaddict/disguise/DisguiseTypes/MobDisguise.java
View File

@ -1,10 +1,10 @@
package me.libraryaddict.disguise.DisguiseTypes; package me.libraryaddict.disguise.disguisetypes;
import me.libraryaddict.disguise.disguisetypes.watchers.AgeableWatcher;
import me.libraryaddict.disguise.disguisetypes.watchers.ZombieWatcher;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import me.libraryaddict.disguise.DisguiseTypes.Watchers.AgeableWatcher;
import me.libraryaddict.disguise.DisguiseTypes.Watchers.ZombieWatcher;
public class MobDisguise extends Disguise { public class MobDisguise extends Disguise {
private boolean isAdult; private boolean isAdult;

2
src/me/libraryaddict/disguise/DisguiseTypes/PlayerDisguise.java
View File

@ -1,4 +1,4 @@
package me.libraryaddict.disguise.DisguiseTypes; package me.libraryaddict.disguise.disguisetypes;
public class PlayerDisguise extends Disguise { public class PlayerDisguise extends Disguise {
private String playerName; private String playerName;

2
src/me/libraryaddict/disguise/DisguiseTypes/Values.java
View File

@ -1,4 +1,4 @@
package me.libraryaddict.disguise.DisguiseTypes; package me.libraryaddict.disguise.disguisetypes;
import java.util.HashMap; import java.util.HashMap;

4
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/AgeableWatcher.java
View File

@ -1,6 +1,6 @@
package me.libraryaddict.disguise.DisguiseTypes.Watchers; package me.libraryaddict.disguise.disguisetypes.watchers;
import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
public class AgeableWatcher extends LivingWatcher { public class AgeableWatcher extends LivingWatcher {

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/ArrowWatcher.java
View File

@ -1,7 +1,7 @@
package me.libraryaddict.disguise.DisguiseTypes.Watchers; package me.libraryaddict.disguise.disguisetypes.watchers;
import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher; import me.libraryaddict.disguise.disguisetypes.FlagWatcher;
public class ArrowWatcher extends FlagWatcher { public class ArrowWatcher extends FlagWatcher {

4
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/BatWatcher.java
View File

@ -1,6 +1,6 @@
package me.libraryaddict.disguise.DisguiseTypes.Watchers; package me.libraryaddict.disguise.disguisetypes.watchers;
import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
public class BatWatcher extends LivingWatcher { public class BatWatcher extends LivingWatcher {

4
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/BlazeWatcher.java
View File

@ -1,6 +1,6 @@
package me.libraryaddict.disguise.DisguiseTypes.Watchers; package me.libraryaddict.disguise.disguisetypes.watchers;
import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
public class BlazeWatcher extends LivingWatcher { public class BlazeWatcher extends LivingWatcher {

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/BoatWatcher.java
View File

@ -1,7 +1,7 @@
package me.libraryaddict.disguise.DisguiseTypes.Watchers; package me.libraryaddict.disguise.disguisetypes.watchers;
import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher; import me.libraryaddict.disguise.disguisetypes.FlagWatcher;
public class BoatWatcher extends FlagWatcher { public class BoatWatcher extends FlagWatcher {

4
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/CreeperWatcher.java
View File

@ -1,6 +1,6 @@
package me.libraryaddict.disguise.DisguiseTypes.Watchers; package me.libraryaddict.disguise.disguisetypes.watchers;
import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
public class CreeperWatcher extends LivingWatcher { public class CreeperWatcher extends LivingWatcher {

8
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/DroppedItemWatcher.java
View File

@ -1,10 +1,12 @@
package me.libraryaddict.disguise.DisguiseTypes.Watchers; package me.libraryaddict.disguise.disguisetypes.watchers;
import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.FlagWatcher;
import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftItemStack; import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftItemStack;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import me.libraryaddict.disguise.DisguiseTypes.Disguise;
import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher;
public class DroppedItemWatcher extends FlagWatcher { public class DroppedItemWatcher extends FlagWatcher {

4
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/EndermanWatcher.java
View File

@ -1,6 +1,6 @@
package me.libraryaddict.disguise.DisguiseTypes.Watchers; package me.libraryaddict.disguise.disguisetypes.watchers;
import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
public class EndermanWatcher extends LivingWatcher { public class EndermanWatcher extends LivingWatcher {

4
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/GhastWatcher.java
View File

@ -1,6 +1,6 @@
package me.libraryaddict.disguise.DisguiseTypes.Watchers; package me.libraryaddict.disguise.disguisetypes.watchers;
import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
public class GhastWatcher extends LivingWatcher { public class GhastWatcher extends LivingWatcher {

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/HorseWatcher.java
View File

@ -1,12 +1,14 @@
package me.libraryaddict.disguise.DisguiseTypes.Watchers; package me.libraryaddict.disguise.disguisetypes.watchers;
import java.util.Random; import java.util.Random;
import me.libraryaddict.disguise.DisguiseTypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.Disguise;
import org.bukkit.entity.Horse.Color; import org.bukkit.entity.Horse.Color;
import org.bukkit.entity.Horse.Style; import org.bukkit.entity.Horse.Style;
public class HorseWatcher extends AgeableWatcher { public class HorseWatcher extends AgeableWatcher {
public HorseWatcher(Disguise disguise) { public HorseWatcher(Disguise disguise) {

8
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/ItemFrameWatcher.java
View File

@ -1,10 +1,12 @@
package me.libraryaddict.disguise.DisguiseTypes.Watchers; package me.libraryaddict.disguise.disguisetypes.watchers;
import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.FlagWatcher;
import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftItemStack; import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftItemStack;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import me.libraryaddict.disguise.DisguiseTypes.Disguise;
import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher;
public class ItemFrameWatcher extends FlagWatcher { public class ItemFrameWatcher extends FlagWatcher {

8
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/LivingWatcher.java
View File

@ -1,15 +1,17 @@
package me.libraryaddict.disguise.DisguiseTypes.Watchers; package me.libraryaddict.disguise.disguisetypes.watchers;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.FlagWatcher;
import net.minecraft.server.v1_6_R3.MobEffect; import net.minecraft.server.v1_6_R3.MobEffect;
import net.minecraft.server.v1_6_R3.PotionBrewer; import net.minecraft.server.v1_6_R3.PotionBrewer;
import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
import me.libraryaddict.disguise.DisguiseTypes.Disguise;
import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher;
public class LivingWatcher extends FlagWatcher { public class LivingWatcher extends FlagWatcher {
private HashSet<MobEffect> potionEffects = new HashSet<MobEffect>(); private HashSet<MobEffect> potionEffects = new HashSet<MobEffect>();

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartWatcher.java
View File

@ -1,7 +1,7 @@
package me.libraryaddict.disguise.DisguiseTypes.Watchers; package me.libraryaddict.disguise.disguisetypes.watchers;
import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher; import me.libraryaddict.disguise.disguisetypes.FlagWatcher;
public class MinecartWatcher extends FlagWatcher { public class MinecartWatcher extends FlagWatcher {

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/OcelotWatcher.java
View File

@ -1,10 +1,12 @@
package me.libraryaddict.disguise.DisguiseTypes.Watchers; package me.libraryaddict.disguise.disguisetypes.watchers;
import me.libraryaddict.disguise.DisguiseTypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.Disguise;
import org.bukkit.entity.Ocelot; import org.bukkit.entity.Ocelot;
import org.bukkit.entity.Ocelot.Type; import org.bukkit.entity.Ocelot.Type;
public class OcelotWatcher extends AgeableWatcher { public class OcelotWatcher extends AgeableWatcher {
public OcelotWatcher(Disguise disguise) { public OcelotWatcher(Disguise disguise) {

4
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/PigWatcher.java
View File

@ -1,6 +1,6 @@
package me.libraryaddict.disguise.DisguiseTypes.Watchers; package me.libraryaddict.disguise.disguisetypes.watchers;
import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
public class PigWatcher extends AgeableWatcher { public class PigWatcher extends AgeableWatcher {

4
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/PlayerWatcher.java
View File

@ -1,6 +1,6 @@
package me.libraryaddict.disguise.DisguiseTypes.Watchers; package me.libraryaddict.disguise.disguisetypes.watchers;
import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
public class PlayerWatcher extends LivingWatcher { public class PlayerWatcher extends LivingWatcher {

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/SheepWatcher.java
View File

@ -1,7 +1,7 @@
package me.libraryaddict.disguise.DisguiseTypes.Watchers; package me.libraryaddict.disguise.disguisetypes.watchers;
import me.libraryaddict.disguise.DisguiseTypes.AnimalColor; import me.libraryaddict.disguise.disguisetypes.AnimalColor;
import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
public class SheepWatcher extends AgeableWatcher { public class SheepWatcher extends AgeableWatcher {

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/SlimeWatcher.java
View File

@ -1,8 +1,10 @@
package me.libraryaddict.disguise.DisguiseTypes.Watchers; package me.libraryaddict.disguise.disguisetypes.watchers;
import java.util.Random; import java.util.Random;
import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
public class SlimeWatcher extends LivingWatcher { public class SlimeWatcher extends LivingWatcher {

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/VillagerWatcher.java
View File

@ -1,11 +1,13 @@
package me.libraryaddict.disguise.DisguiseTypes.Watchers; package me.libraryaddict.disguise.disguisetypes.watchers;
import java.util.Random; import java.util.Random;
import me.libraryaddict.disguise.DisguiseTypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.Disguise;
import org.bukkit.entity.Villager.Profession; import org.bukkit.entity.Villager.Profession;
public class VillagerWatcher extends AgeableWatcher { public class VillagerWatcher extends AgeableWatcher {
public VillagerWatcher(Disguise disguise) { public VillagerWatcher(Disguise disguise) {

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/WitherSkullWatcher.java
View File

@ -1,7 +1,7 @@
package me.libraryaddict.disguise.DisguiseTypes.Watchers; package me.libraryaddict.disguise.disguisetypes.watchers;
import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher; import me.libraryaddict.disguise.disguisetypes.FlagWatcher;
public class WitherSkullWatcher extends FlagWatcher { public class WitherSkullWatcher extends FlagWatcher {

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/WolfWatcher.java
View File

@ -1,7 +1,7 @@
package me.libraryaddict.disguise.DisguiseTypes.Watchers; package me.libraryaddict.disguise.disguisetypes.watchers;
import me.libraryaddict.disguise.DisguiseTypes.AnimalColor; import me.libraryaddict.disguise.disguisetypes.AnimalColor;
import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
public class WolfWatcher extends AgeableWatcher { public class WolfWatcher extends AgeableWatcher {

4
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/ZombieWatcher.java
View File

@ -1,6 +1,6 @@
package me.libraryaddict.disguise.DisguiseTypes.Watchers; package me.libraryaddict.disguise.disguisetypes.watchers;
import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
public class ZombieWatcher extends LivingWatcher { public class ZombieWatcher extends LivingWatcher {

6
src/me/libraryaddict/disguise/Events/DisguiseEvent.java
View File

@ -1,12 +1,14 @@
package me.libraryaddict.disguise.Events; package me.libraryaddict.disguise.events;
import me.libraryaddict.disguise.DisguiseTypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.Disguise;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
public class DisguiseEvent extends Event implements Cancellable { public class DisguiseEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();

6
src/me/libraryaddict/disguise/Events/UndisguiseEvent.java
View File

@ -1,12 +1,14 @@
package me.libraryaddict.disguise.Events; package me.libraryaddict.disguise.events;
import me.libraryaddict.disguise.DisguiseTypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.Disguise;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
public class UndisguiseEvent extends Event implements Cancellable { public class UndisguiseEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();

20
src/me/libraryaddict/disguise/LibsDisguises.java
View File

@ -4,14 +4,15 @@ import java.io.File;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.List; import java.util.List;
import me.libraryaddict.disguise.Commands.*;
import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.commands.*;
import me.libraryaddict.disguise.DisguiseTypes.DisguiseSound; import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.DisguiseTypes.DisguiseType; import me.libraryaddict.disguise.disguisetypes.DisguiseSound;
import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher; import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.DisguiseTypes.Values; import me.libraryaddict.disguise.disguisetypes.FlagWatcher;
import me.libraryaddict.disguise.DisguiseTypes.Watchers.AgeableWatcher; import me.libraryaddict.disguise.disguisetypes.Values;
import me.libraryaddict.disguise.DisguiseTypes.Watchers.LivingWatcher; import me.libraryaddict.disguise.disguisetypes.watchers.AgeableWatcher;
import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher;
import net.minecraft.server.v1_6_R3.ChatMessage; import net.minecraft.server.v1_6_R3.ChatMessage;
import net.minecraft.server.v1_6_R3.ChunkCoordinates; import net.minecraft.server.v1_6_R3.ChunkCoordinates;
import net.minecraft.server.v1_6_R3.EntityHuman; import net.minecraft.server.v1_6_R3.EntityHuman;
@ -27,6 +28,7 @@ import org.bukkit.entity.Ageable;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
public class LibsDisguises extends JavaPlugin { public class LibsDisguises extends JavaPlugin {
private class DisguiseHuman extends EntityHuman { private class DisguiseHuman extends EntityHuman {
@ -121,7 +123,7 @@ public class LibsDisguises extends JavaPlugin {
name = toReadable(disguiseType.name()); name = toReadable(disguiseType.name());
break; break;
} }
watcherClass = Class.forName("me.libraryaddict.disguise.DisguiseTypes.Watchers." + name + "Watcher"); watcherClass = Class.forName("me.libraryaddict.disguise.disguisetypes.Watchers." + name + "Watcher");
} catch (Exception ex) { } catch (Exception ex) {
// There is no watcher for this entity, or a error was thrown. // There is no watcher for this entity, or a error was thrown.
try { try {

19
src/me/libraryaddict/disguise/PacketsManager.java
View File

@ -9,15 +9,15 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.DisguiseTypes.DisguiseSound; import me.libraryaddict.disguise.disguisetypes.DisguiseSound;
import me.libraryaddict.disguise.DisguiseTypes.DisguiseType; import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher; import me.libraryaddict.disguise.disguisetypes.FlagWatcher;
import me.libraryaddict.disguise.DisguiseTypes.MiscDisguise; import me.libraryaddict.disguise.disguisetypes.MiscDisguise;
import me.libraryaddict.disguise.DisguiseTypes.MobDisguise; import me.libraryaddict.disguise.disguisetypes.MobDisguise;
import me.libraryaddict.disguise.DisguiseTypes.PlayerDisguise; import me.libraryaddict.disguise.disguisetypes.PlayerDisguise;
import me.libraryaddict.disguise.DisguiseTypes.Values; import me.libraryaddict.disguise.disguisetypes.Values;
import me.libraryaddict.disguise.DisguiseTypes.DisguiseSound.SoundType; import me.libraryaddict.disguise.disguisetypes.DisguiseSound.SoundType;
import net.minecraft.server.v1_6_R3.AttributeSnapshot; import net.minecraft.server.v1_6_R3.AttributeSnapshot;
import net.minecraft.server.v1_6_R3.Block; import net.minecraft.server.v1_6_R3.Block;
import net.minecraft.server.v1_6_R3.DataWatcher; import net.minecraft.server.v1_6_R3.DataWatcher;
@ -43,6 +43,7 @@ import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import com.comphenix.protocol.Packets; import com.comphenix.protocol.Packets;
import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.ProtocolManager; import com.comphenix.protocol.ProtocolManager;