diff --git a/src/com/dre/dungeonsxl/P.java b/src/com/dre/dungeonsxl/P.java index 7df1aefa..7c1218ac 100644 --- a/src/com/dre/dungeonsxl/P.java +++ b/src/com/dre/dungeonsxl/P.java @@ -39,7 +39,7 @@ import com.dre.dungeonsxl.listener.EntityListener; import com.dre.dungeonsxl.listener.HangingListener; import com.dre.dungeonsxl.listener.PlayerListener; import com.dre.dungeonsxl.listener.WorldListener; -import com.dre.dungeonsxl.signs.DSignTypeRoot; +import com.dre.dungeonsxl.signs.DSignRoot; public class P extends JavaPlugin{ public static P p; @@ -83,7 +83,7 @@ public class P extends JavaPlugin{ new DCommandRoot(); //Init Signtypes - DSignTypeRoot.init();; + DSignRoot.init();; //InitFolders this.initFolders(); diff --git a/src/com/dre/dungeonsxl/game/GameWorld.java b/src/com/dre/dungeonsxl/game/GameWorld.java index bfa53f26..f6767bd0 100644 --- a/src/com/dre/dungeonsxl/game/GameWorld.java +++ b/src/com/dre/dungeonsxl/game/GameWorld.java @@ -25,8 +25,8 @@ import org.bukkit.entity.Spider; import com.dre.dungeonsxl.DConfig; import com.dre.dungeonsxl.DPlayer; import com.dre.dungeonsxl.P; -import com.dre.dungeonsxl.signs.DSignType; -import com.dre.dungeonsxl.signs.DSignTypeRoot; +import com.dre.dungeonsxl.signs.DSign; +import com.dre.dungeonsxl.signs.DSignRoot; public class GameWorld { private static P p=P.p; @@ -78,7 +78,7 @@ public class GameWorld { Sign sign = (Sign) block.getState(); String[] lines=sign.getLines(); - for(DSignType signType : DSignTypeRoot.get()){ + for(DSign signType : DSignRoot.get()){ if(lines[0].equalsIgnoreCase("["+signType.name+"]")){ signType.onDungeonInit(sign, this); } diff --git a/src/com/dre/dungeonsxl/signs/DSignType.java b/src/com/dre/dungeonsxl/signs/DSign.java similarity index 88% rename from src/com/dre/dungeonsxl/signs/DSignType.java rename to src/com/dre/dungeonsxl/signs/DSign.java index 3a2f3421..8e57d659 100644 --- a/src/com/dre/dungeonsxl/signs/DSignType.java +++ b/src/com/dre/dungeonsxl/signs/DSign.java @@ -5,7 +5,7 @@ import org.bukkit.block.Sign; import com.dre.dungeonsxl.P; import com.dre.dungeonsxl.game.GameWorld; -public abstract class DSignType { +public abstract class DSign { public static P p = P.p; public String name; diff --git a/src/com/dre/dungeonsxl/signs/DSignTypeRoot.java b/src/com/dre/dungeonsxl/signs/DSignRoot.java similarity index 85% rename from src/com/dre/dungeonsxl/signs/DSignTypeRoot.java rename to src/com/dre/dungeonsxl/signs/DSignRoot.java index bca91d8b..61db4497 100644 --- a/src/com/dre/dungeonsxl/signs/DSignTypeRoot.java +++ b/src/com/dre/dungeonsxl/signs/DSignRoot.java @@ -2,8 +2,8 @@ package com.dre.dungeonsxl.signs; import java.util.concurrent.CopyOnWriteArrayList; -public class DSignTypeRoot { - private static CopyOnWriteArrayList signTypes = new CopyOnWriteArrayList(); +public class DSignRoot { + private static CopyOnWriteArrayList signTypes = new CopyOnWriteArrayList(); //SignTypes private static SIGNCheckpoint signCheckpoint = new SIGNCheckpoint(); @@ -37,7 +37,7 @@ public class DSignTypeRoot { signTypes.add(signStart); } - public static CopyOnWriteArrayList get(){ + public static CopyOnWriteArrayList get(){ return signTypes; } } diff --git a/src/com/dre/dungeonsxl/signs/SIGNCheckpoint.java b/src/com/dre/dungeonsxl/signs/SIGNCheckpoint.java index e978e7f6..1a8024c1 100644 --- a/src/com/dre/dungeonsxl/signs/SIGNCheckpoint.java +++ b/src/com/dre/dungeonsxl/signs/SIGNCheckpoint.java @@ -5,7 +5,7 @@ import org.bukkit.block.Sign; import com.dre.dungeonsxl.game.GameCheckpoint; import com.dre.dungeonsxl.game.GameWorld; -public class SIGNCheckpoint extends DSignType{ +public class SIGNCheckpoint extends DSign{ @Override public boolean check(Sign sign) { diff --git a/src/com/dre/dungeonsxl/signs/SIGNChest.java b/src/com/dre/dungeonsxl/signs/SIGNChest.java index 9a7735af..02e4ba1d 100644 --- a/src/com/dre/dungeonsxl/signs/SIGNChest.java +++ b/src/com/dre/dungeonsxl/signs/SIGNChest.java @@ -5,7 +5,7 @@ import org.bukkit.block.Sign; import com.dre.dungeonsxl.game.GameChest; import com.dre.dungeonsxl.game.GameWorld; -public class SIGNChest extends DSignType{ +public class SIGNChest extends DSign{ @Override public boolean check(Sign sign) { diff --git a/src/com/dre/dungeonsxl/signs/SIGNChunkUpdater.java b/src/com/dre/dungeonsxl/signs/SIGNChunkUpdater.java index 39572100..30d55685 100644 --- a/src/com/dre/dungeonsxl/signs/SIGNChunkUpdater.java +++ b/src/com/dre/dungeonsxl/signs/SIGNChunkUpdater.java @@ -4,7 +4,7 @@ import org.bukkit.Chunk; import org.bukkit.block.Sign; import com.dre.dungeonsxl.game.GameWorld; -public class SIGNChunkUpdater extends DSignType{ +public class SIGNChunkUpdater extends DSign{ @Override public boolean check(Sign sign) { diff --git a/src/com/dre/dungeonsxl/signs/SIGNClasses.java b/src/com/dre/dungeonsxl/signs/SIGNClasses.java index 898f8497..019c6ed0 100644 --- a/src/com/dre/dungeonsxl/signs/SIGNClasses.java +++ b/src/com/dre/dungeonsxl/signs/SIGNClasses.java @@ -8,7 +8,7 @@ import com.dre.dungeonsxl.DClass; import com.dre.dungeonsxl.DGSign; import com.dre.dungeonsxl.game.GameWorld; -public class SIGNClasses extends DSignType{ +public class SIGNClasses extends DSign{ @Override public boolean check(Sign sign) { diff --git a/src/com/dre/dungeonsxl/signs/SIGNEnd.java b/src/com/dre/dungeonsxl/signs/SIGNEnd.java index 87fe80a2..79bb7d8c 100644 --- a/src/com/dre/dungeonsxl/signs/SIGNEnd.java +++ b/src/com/dre/dungeonsxl/signs/SIGNEnd.java @@ -4,7 +4,7 @@ import org.bukkit.ChatColor; import org.bukkit.block.Sign; import com.dre.dungeonsxl.game.GameWorld; -public class SIGNEnd extends DSignType{ +public class SIGNEnd extends DSign{ @Override public boolean check(Sign sign) { diff --git a/src/com/dre/dungeonsxl/signs/SIGNLeave.java b/src/com/dre/dungeonsxl/signs/SIGNLeave.java index a677507d..bd4d60bd 100644 --- a/src/com/dre/dungeonsxl/signs/SIGNLeave.java +++ b/src/com/dre/dungeonsxl/signs/SIGNLeave.java @@ -4,7 +4,7 @@ import org.bukkit.ChatColor; import org.bukkit.block.Sign; import com.dre.dungeonsxl.game.GameWorld; -public class SIGNLeave extends DSignType{ +public class SIGNLeave extends DSign{ @Override public boolean check(Sign sign) { diff --git a/src/com/dre/dungeonsxl/signs/SIGNLobby.java b/src/com/dre/dungeonsxl/signs/SIGNLobby.java index 9db7d23b..da842f4b 100644 --- a/src/com/dre/dungeonsxl/signs/SIGNLobby.java +++ b/src/com/dre/dungeonsxl/signs/SIGNLobby.java @@ -3,7 +3,7 @@ package com.dre.dungeonsxl.signs; import org.bukkit.block.Sign; import com.dre.dungeonsxl.game.GameWorld; -public class SIGNLobby extends DSignType{ +public class SIGNLobby extends DSign{ @Override public boolean check(Sign sign) { diff --git a/src/com/dre/dungeonsxl/signs/SIGNMob.java b/src/com/dre/dungeonsxl/signs/SIGNMob.java index 6300d68e..82f74a18 100644 --- a/src/com/dre/dungeonsxl/signs/SIGNMob.java +++ b/src/com/dre/dungeonsxl/signs/SIGNMob.java @@ -4,7 +4,7 @@ import org.bukkit.block.Sign; import com.dre.dungeonsxl.game.GameWorld; import com.dre.dungeonsxl.game.MobSpawner; -public class SIGNMob extends DSignType{ +public class SIGNMob extends DSign{ @Override public boolean check(Sign sign) { diff --git a/src/com/dre/dungeonsxl/signs/SIGNMsg.java b/src/com/dre/dungeonsxl/signs/SIGNMsg.java index aaec44b4..a37a0e28 100644 --- a/src/com/dre/dungeonsxl/signs/SIGNMsg.java +++ b/src/com/dre/dungeonsxl/signs/SIGNMsg.java @@ -5,7 +5,7 @@ import org.bukkit.block.Sign; import com.dre.dungeonsxl.game.GameMessage; import com.dre.dungeonsxl.game.GameWorld; -public class SIGNMsg extends DSignType{ +public class SIGNMsg extends DSign{ @Override public boolean check(Sign sign) { diff --git a/src/com/dre/dungeonsxl/signs/SIGNPlace.java b/src/com/dre/dungeonsxl/signs/SIGNPlace.java index f9c0b688..72fb7a10 100644 --- a/src/com/dre/dungeonsxl/signs/SIGNPlace.java +++ b/src/com/dre/dungeonsxl/signs/SIGNPlace.java @@ -5,7 +5,7 @@ import org.bukkit.block.Sign; import com.dre.dungeonsxl.game.GamePlaceableBlock; import com.dre.dungeonsxl.game.GameWorld; -public class SIGNPlace extends DSignType{ +public class SIGNPlace extends DSign{ @Override public boolean check(Sign sign) { diff --git a/src/com/dre/dungeonsxl/signs/SIGNReady.java b/src/com/dre/dungeonsxl/signs/SIGNReady.java index fe38110b..ffc6e0df 100644 --- a/src/com/dre/dungeonsxl/signs/SIGNReady.java +++ b/src/com/dre/dungeonsxl/signs/SIGNReady.java @@ -4,7 +4,7 @@ import org.bukkit.ChatColor; import org.bukkit.block.Sign; import com.dre.dungeonsxl.game.GameWorld; -public class SIGNReady extends DSignType{ +public class SIGNReady extends DSign{ @Override public boolean check(Sign sign) { diff --git a/src/com/dre/dungeonsxl/signs/SIGNSoundMsg.java b/src/com/dre/dungeonsxl/signs/SIGNSoundMsg.java index f017bfb5..6b98880b 100644 --- a/src/com/dre/dungeonsxl/signs/SIGNSoundMsg.java +++ b/src/com/dre/dungeonsxl/signs/SIGNSoundMsg.java @@ -5,7 +5,7 @@ import org.bukkit.block.Sign; import com.dre.dungeonsxl.game.GameMessage; import com.dre.dungeonsxl.game.GameWorld; -public class SIGNSoundMsg extends DSignType{ +public class SIGNSoundMsg extends DSign{ @Override public boolean check(Sign sign) { diff --git a/src/com/dre/dungeonsxl/signs/SIGNStart.java b/src/com/dre/dungeonsxl/signs/SIGNStart.java index dcb059e0..2ca363ca 100644 --- a/src/com/dre/dungeonsxl/signs/SIGNStart.java +++ b/src/com/dre/dungeonsxl/signs/SIGNStart.java @@ -3,7 +3,7 @@ package com.dre.dungeonsxl.signs; import org.bukkit.block.Sign; import com.dre.dungeonsxl.game.GameWorld; -public class SIGNStart extends DSignType{ +public class SIGNStart extends DSign{ @Override public boolean check(Sign sign) {