Rename

src/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java

@@ -26,7 +26,7 @@ import com.massivecraft.factions.Rel;
 import com.massivecraft.factions.entity.UPlayer;
 import com.massivecraft.factions.entity.Faction;
 
-public abstract class FactionsChannelAbstract implements Channel
+public abstract class ChannelFactionsAbstract implements Channel
 {
 	private static final Pattern msgPattern = Pattern.compile("(.*)<(.*)%1\\$s(.*)> %2\\$s");
 	private final ChannelStorage storage = Herochat.getChannelManager().getStorage();

src/com/massivecraft/factions/integration/herochat/ChannelFactionsAllies.java

@@ -8,7 +8,7 @@ import org.bukkit.ChatColor;
 import com.massivecraft.factions.Rel;
 import com.massivecraft.factions.entity.MConf;
 
-public class AlliesChannel extends FactionsChannelAbstract
+public class ChannelFactionsAllies extends ChannelFactionsAbstract
 {
 	public static final Set<Rel> targetRelations = EnumSet.of(Rel.MEMBER, Rel.RECRUIT, Rel.ALLY);
 	@Override public Set<Rel> getTargetRelations() { return targetRelations; }

src/com/massivecraft/factions/integration/herochat/ChannelFactionsFaction.java

@@ -9,7 +9,7 @@ import org.bukkit.ChatColor;
 import com.massivecraft.factions.Rel;
 import com.massivecraft.factions.entity.MConf;
 
-public class FactionChannel extends FactionsChannelAbstract
+public class ChannelFactionsFaction extends ChannelFactionsAbstract
 {
 	public static final Set<Rel> targetRelations = EnumSet.of(Rel.MEMBER, Rel.RECRUIT);
 	@Override public Set<Rel> getTargetRelations() { return targetRelations; }

src/com/massivecraft/factions/integration/herochat/EngineHerochat.java

@@ -13,15 +13,15 @@ import com.massivecraft.factions.chat.ChatFormatter;
 import com.massivecraft.factions.entity.MConf;
 
 
-public class HerochatEngine implements Listener
+public class EngineHerochat implements Listener
 {
 	// -------------------------------------------- //
 	// INSTANCE & CONSTRUCT
 	// -------------------------------------------- //
 	
-	private static HerochatEngine i = new HerochatEngine();
-	public static HerochatEngine get() { return i; }
-	private HerochatEngine() {}
+	private static EngineHerochat i = new EngineHerochat();
+	public static EngineHerochat get() { return i; }
+	private EngineHerochat() {}
 	
 	// -------------------------------------------- //
 	// ACTIVATE & DEACTIVATE
@@ -29,8 +29,8 @@ public class HerochatEngine implements Listener
 	
 	public void activate()
 	{
-		Herochat.getChannelManager().addChannel(new FactionChannel());
-		Herochat.getChannelManager().addChannel(new AlliesChannel());
+		Herochat.getChannelManager().addChannel(new ChannelFactionsFaction());
+		Herochat.getChannelManager().addChannel(new ChannelFactionsAllies());
 		
 		Bukkit.getPluginManager().registerEvents(this, Factions.get());
 	}

src/com/massivecraft/factions/integration/herochat/HerochatFeatures.java

@@ -1,31 +0,0 @@
-package com.massivecraft.factions.integration.herochat;
-
-import com.massivecraft.mcore.integration.IntegrationFeaturesAbstract;
-
-public class HerochatFeatures extends IntegrationFeaturesAbstract
-{
-	// -------------------------------------------- //
-	// INSTANCE & CONSTRUCT
-	// -------------------------------------------- //
-	
-	private static HerochatFeatures i = new HerochatFeatures();
-	public static HerochatFeatures get() { return i; }
-	private HerochatFeatures() { super("Herochat"); }
-	
-	// -------------------------------------------- //
-	// OVERRIDE
-	// -------------------------------------------- //
-	
-	@Override
-	public void activate()
-	{
-		HerochatEngine.get().activate();
-	}
-	
-	@Override
-	public void deactivate()
-	{
-		HerochatEngine.get().deactivate();
-	}
-	
-}

src/com/massivecraft/factions/integration/herochat/IntegrationHerochat.java

@@ -0,0 +1,31 @@
+package com.massivecraft.factions.integration.herochat;
+
+import com.massivecraft.massivecore.integration.IntegrationAbstract;
+
+public class IntegrationHerochat extends IntegrationAbstract
+{
+	// -------------------------------------------- //
+	// INSTANCE & CONSTRUCT
+	// -------------------------------------------- //
+	
+	private static IntegrationHerochat i = new IntegrationHerochat();
+	public static IntegrationHerochat get() { return i; }
+	private IntegrationHerochat() { super("Herochat"); }
+	
+	// -------------------------------------------- //
+	// OVERRIDE
+	// -------------------------------------------- //
+	
+	@Override
+	public void activate()
+	{
+		EngineHerochat.get().activate();
+	}
+	
+	@Override
+	public void deactivate()
+	{
+		EngineHerochat.get().deactivate();
+	}
+	
+}