From 67256c118eb843eeb9095f6b581f3b0f0f79a8a9 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 19 May 2013 15:54:44 +1200 Subject: [PATCH] Renamed LibsBaseWatcher to FlagWatcher --- src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java | 6 +++--- .../{LibsBaseWatcher.java => FlagWatcher.java} | 4 ++-- .../disguise/DisguiseTypes/Watchers/AgeableWatcher.java | 4 ++-- .../disguise/DisguiseTypes/Watchers/BlazeWatcher.java | 4 ++-- .../disguise/DisguiseTypes/Watchers/CreeperWatcher.java | 4 ++-- .../disguise/DisguiseTypes/Watchers/EnderDragonWatcher.java | 4 ++-- .../disguise/DisguiseTypes/Watchers/EndermanWatcher.java | 4 ++-- .../disguise/DisguiseTypes/Watchers/GhastWatcher.java | 4 ++-- .../disguise/DisguiseTypes/Watchers/SlimeWatcher.java | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) rename src/me/libraryaddict/disguise/DisguiseTypes/{LibsBaseWatcher.java => FlagWatcher.java} (97%) diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java b/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java index 4585990d..88cf4569 100644 --- a/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java +++ b/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java @@ -20,7 +20,7 @@ import org.bukkit.entity.Player; public class Disguise { protected DisguiseType disguiseType; private Entity entity; - private LibsBaseWatcher watcher; + private FlagWatcher watcher; protected Disguise(DisguiseType newType) { disguiseType = newType; @@ -84,7 +84,7 @@ public class Disguise { } Class watcherClass = Class.forName("me.libraryaddict.disguise.DisguiseTypes.Watchers." + name + "Watcher"); Constructor contructor = watcherClass.getDeclaredConstructor(int.class); - watcher = (LibsBaseWatcher) contructor.newInstance(entityId); + watcher = (FlagWatcher) contructor.newInstance(entityId); } catch (Exception ex) { // There is no watcher for this entity } @@ -101,7 +101,7 @@ public class Disguise { return disguiseType; } - public LibsBaseWatcher getWatcher() { + public FlagWatcher getWatcher() { return watcher; } diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/LibsBaseWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java similarity index 97% rename from src/me/libraryaddict/disguise/DisguiseTypes/LibsBaseWatcher.java rename to src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java index 049ffca9..fc251ea5 100644 --- a/src/me/libraryaddict/disguise/DisguiseTypes/LibsBaseWatcher.java +++ b/src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java @@ -13,7 +13,7 @@ import org.bukkit.entity.Player; import net.minecraft.server.v1_5_R3.Packet40EntityMetadata; import net.minecraft.server.v1_5_R3.WatchableObject; -public abstract class LibsBaseWatcher { +public abstract class FlagWatcher { private static HashMap classTypes = new HashMap(); static { @@ -25,7 +25,7 @@ public abstract class LibsBaseWatcher { private int entityId; private HashMap entityValues = new HashMap(); - protected LibsBaseWatcher(int entityId) { + protected FlagWatcher(int entityId) { this.entityId = entityId; } diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/AgeableWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/AgeableWatcher.java index 5861b3ca..0bd1ad6c 100644 --- a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/AgeableWatcher.java +++ b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/AgeableWatcher.java @@ -1,8 +1,8 @@ package me.libraryaddict.disguise.DisguiseTypes.Watchers; -import me.libraryaddict.disguise.DisguiseTypes.LibsBaseWatcher; +import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher; -public class AgeableWatcher extends LibsBaseWatcher { +public class AgeableWatcher extends FlagWatcher { public AgeableWatcher(int entityId) { super(entityId); diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/BlazeWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/BlazeWatcher.java index a79aa86f..6cbaedf9 100644 --- a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/BlazeWatcher.java +++ b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/BlazeWatcher.java @@ -1,8 +1,8 @@ package me.libraryaddict.disguise.DisguiseTypes.Watchers; -import me.libraryaddict.disguise.DisguiseTypes.LibsBaseWatcher; +import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher; -public class BlazeWatcher extends LibsBaseWatcher { +public class BlazeWatcher extends FlagWatcher { public BlazeWatcher(int entityId) { super(entityId); diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/CreeperWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/CreeperWatcher.java index deded241..522c6843 100644 --- a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/CreeperWatcher.java +++ b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/CreeperWatcher.java @@ -1,8 +1,8 @@ package me.libraryaddict.disguise.DisguiseTypes.Watchers; -import me.libraryaddict.disguise.DisguiseTypes.LibsBaseWatcher; +import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher; -public class CreeperWatcher extends LibsBaseWatcher { +public class CreeperWatcher extends FlagWatcher { public CreeperWatcher(int entityId) { super(entityId); diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/EnderDragonWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/EnderDragonWatcher.java index 484b063b..0dd3cc70 100644 --- a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/EnderDragonWatcher.java +++ b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/EnderDragonWatcher.java @@ -1,8 +1,8 @@ package me.libraryaddict.disguise.DisguiseTypes.Watchers; -import me.libraryaddict.disguise.DisguiseTypes.LibsBaseWatcher; +import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher; -public class EnderDragonWatcher extends LibsBaseWatcher { +public class EnderDragonWatcher extends FlagWatcher { public EnderDragonWatcher(int entityId) { super(entityId); diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/EndermanWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/EndermanWatcher.java index ba457eb3..3294bb46 100644 --- a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/EndermanWatcher.java +++ b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/EndermanWatcher.java @@ -1,8 +1,8 @@ package me.libraryaddict.disguise.DisguiseTypes.Watchers; -import me.libraryaddict.disguise.DisguiseTypes.LibsBaseWatcher; +import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher; -public class EndermanWatcher extends LibsBaseWatcher { +public class EndermanWatcher extends FlagWatcher { public EndermanWatcher(int entityId) { super(entityId); diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/GhastWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/GhastWatcher.java index 2915b340..f7512340 100644 --- a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/GhastWatcher.java +++ b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/GhastWatcher.java @@ -1,8 +1,8 @@ package me.libraryaddict.disguise.DisguiseTypes.Watchers; -import me.libraryaddict.disguise.DisguiseTypes.LibsBaseWatcher; +import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher; -public class GhastWatcher extends LibsBaseWatcher { +public class GhastWatcher extends FlagWatcher { public GhastWatcher(int entityId) { super(entityId); diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/SlimeWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/SlimeWatcher.java index b2ba8133..ceb35547 100644 --- a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/SlimeWatcher.java +++ b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/SlimeWatcher.java @@ -2,9 +2,9 @@ package me.libraryaddict.disguise.DisguiseTypes.Watchers; import java.util.Random; -import me.libraryaddict.disguise.DisguiseTypes.LibsBaseWatcher; +import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher; -public class SlimeWatcher extends LibsBaseWatcher { +public class SlimeWatcher extends FlagWatcher { public SlimeWatcher(int entityId) { super(entityId);