TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-04-25 16:09:44 +00:00
Code Issues Projects Releases Wiki Activity

[API] fix other modules to use new packages

Browse source
This commit is contained in:
Iaccidentally 2013-07-13 12:40:50 -04:00
parent adb5189d42
commit ecd2484cb9
16 changed files with 28 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java
View file

@ -1,8 +1,8 @@
package com.earth2me.essentials.antibuild; package com.earth2me.essentials.antibuild;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.IEssentials;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import net.ess3.api.IEssentials;
import java.util.logging.Level; import java.util.logging.Level;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
@ -313,14 +313,14 @@ public class EssentialsAntiBuildListener implements Listener
} }
} }
} }
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onBlockDispense(final BlockDispenseEvent event) public void onBlockDispense(final BlockDispenseEvent event)
{ {
final ItemStack item = event.getItem(); final ItemStack item = event.getItem();
if (prot.checkProtectionItems(AntiBuildConfig.blacklist_dispenser, item.getTypeId())) if (prot.checkProtectionItems(AntiBuildConfig.blacklist_dispenser, item.getTypeId()))
{ {
event.setCancelled(true); event.setCancelled(true);
} }
} }
} }

2
EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsConnect.java
View file

@ -1,9 +1,9 @@
package com.earth2me.essentials.antibuild; package com.earth2me.essentials.antibuild;
import com.earth2me.essentials.IConf; import com.earth2me.essentials.IConf;
import com.earth2me.essentials.IEssentials;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import net.ess3.api.IEssentials;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.bukkit.Location; import org.bukkit.Location;

2
EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java
View file

@ -1,8 +1,8 @@
package com.earth2me.essentials.chat; package com.earth2me.essentials.chat;
import com.earth2me.essentials.IEssentials;
import com.earth2me.essentials.Trade; import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import net.ess3.api.IEssentials;
public class ChatStore public class ChatStore

4
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
View file

@ -1,7 +1,7 @@
package com.earth2me.essentials.chat; package com.earth2me.essentials.chat;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.IEssentials; import net.ess3.api.IEssentials;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -43,5 +43,5 @@ public class EssentialsChat extends JavaPlugin
pluginManager.registerEvents(playerListenerHighest, this); pluginManager.registerEvents(playerListenerHighest, this);
} }
} }

11
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
View file

@ -1,17 +1,12 @@
package com.earth2me.essentials.chat; package com.earth2me.essentials.chat;
import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.ChargeException;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.IEssentials;
import com.earth2me.essentials.Trade; import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import net.ess3.api.IEssentials;
import java.util.Map; import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.bukkit.Location;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.entity.Player;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.player.AsyncPlayerChatEvent; import org.bukkit.event.player.AsyncPlayerChatEvent;
@ -23,7 +18,7 @@ public abstract class EssentialsChatPlayer implements Listener
protected final transient Map<AsyncPlayerChatEvent, ChatStore> chatStorage; protected final transient Map<AsyncPlayerChatEvent, ChatStore> chatStorage;
public EssentialsChatPlayer(final Server server, public EssentialsChatPlayer(final Server server,
final IEssentials ess, final IEssentials ess,
final Map<AsyncPlayerChatEvent, ChatStore> chatStorage) final Map<AsyncPlayerChatEvent, ChatStore> chatStorage)
{ {
this.ess = ess; this.ess = ess;
@ -40,7 +35,7 @@ public abstract class EssentialsChatPlayer implements Listener
if (event.isCancelled()) if (event.isCancelled())
{ {
return true; return true;
} }
return false; return false;
} }

2
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java
View file

@ -1,6 +1,6 @@
package com.earth2me.essentials.chat; package com.earth2me.essentials.chat;
import com.earth2me.essentials.IEssentials; import net.ess3.api.IEssentials;
import java.util.Map; import java.util.Map;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;

2
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java
View file

@ -1,8 +1,8 @@
package com.earth2me.essentials.chat; package com.earth2me.essentials.chat;
import com.earth2me.essentials.IEssentials;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.FormatUtil; import com.earth2me.essentials.utils.FormatUtil;
import net.ess3.api.IEssentials;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import org.bukkit.Server; import org.bukkit.Server;

4
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
View file

@ -1,9 +1,9 @@
package com.earth2me.essentials.chat; package com.earth2me.essentials.chat;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.IEssentials;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import static com.earth2me.essentials.chat.EssentialsChatPlayer.logger; import static com.earth2me.essentials.chat.EssentialsChatPlayer.logger;
import net.ess3.api.IEssentials;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.Locale; import java.util.Locale;
@ -134,7 +134,7 @@ public class EssentialsChatPlayerListenerNormal extends EssentialsChatPlayer
} }
} }
} }
if (outList.size() < 2) { if (outList.size() < 2) {
event.getPlayer().sendMessage(_("localNoOne")); event.getPlayer().sendMessage(_("localNoOne"));
} }

2
EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java
View file

@ -1,7 +1,7 @@
package com.earth2me.essentials.geoip; package com.earth2me.essentials.geoip;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.IEssentials; import net.ess3.api.IEssentials;
import java.util.logging.Level; import java.util.logging.Level;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;

2
EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java
View file

@ -3,8 +3,8 @@ package com.earth2me.essentials.geoip;
import com.earth2me.essentials.EssentialsConf; import com.earth2me.essentials.EssentialsConf;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.IConf; import com.earth2me.essentials.IConf;
import com.earth2me.essentials.IEssentials;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import net.ess3.api.IEssentials;
import com.maxmind.geoip.Location; import com.maxmind.geoip.Location;
import com.maxmind.geoip.LookupService; import com.maxmind.geoip.LookupService;
import com.maxmind.geoip.regionName; import com.maxmind.geoip.regionName;

2
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java
View file

@ -2,7 +2,7 @@ package com.earth2me.essentials.protect;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.IConf; import com.earth2me.essentials.IConf;
import com.earth2me.essentials.IEssentials; import net.ess3.api.IEssentials;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;

9
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
View file

@ -1,6 +1,6 @@
package com.earth2me.essentials.protect; package com.earth2me.essentials.protect;
import com.earth2me.essentials.IEssentials; import net.ess3.api.IEssentials;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
@ -20,7 +20,7 @@ public class EssentialsProtectBlockListener implements Listener
this.prot = parent; this.prot = parent;
this.ess = prot.getEssentialsConnect().getEssentials(); this.ess = prot.getEssentialsConnect().getEssentials();
} }
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onBlockIgnite(BlockIgniteEvent event) public void onBlockIgnite(BlockIgniteEvent event)
{ {
@ -58,7 +58,7 @@ public class EssentialsProtectBlockListener implements Listener
public void onBlockFromTo(final BlockFromToEvent event) public void onBlockFromTo(final BlockFromToEvent event)
{ {
final Block block = event.getBlock(); final Block block = event.getBlock();
if (block.getType() == Material.WATER || block.getType() == Material.STATIONARY_WATER) if (block.getType() == Material.WATER || block.getType() == Material.STATIONARY_WATER)
{ {
event.setCancelled(prot.getSettingBool(ProtectConfig.prevent_water_flow)); event.setCancelled(prot.getSettingBool(ProtectConfig.prevent_water_flow));
@ -79,11 +79,10 @@ public class EssentialsProtectBlockListener implements Listener
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onBlockBurn(final BlockBurnEvent event) public void onBlockBurn(final BlockBurnEvent event)
{ {
if (prot.getSettingBool(ProtectConfig.prevent_fire_spread)) if (prot.getSettingBool(ProtectConfig.prevent_fire_spread))
{ {
event.setCancelled(true); event.setCancelled(true);
} }
} }
} }

2
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
View file

@ -1,7 +1,7 @@
package com.earth2me.essentials.protect; package com.earth2me.essentials.protect;
import com.earth2me.essentials.IEssentials;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import net.ess3.api.IEssentials;
import java.util.Locale; import java.util.Locale;
import org.bukkit.entity.*; import org.bukkit.entity.*;
import org.bukkit.entity.minecart.ExplosiveMinecart; import org.bukkit.entity.minecart.ExplosiveMinecart;

2
EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
View file

@ -1,7 +1,7 @@
package com.earth2me.essentials.spawn; package com.earth2me.essentials.spawn;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.IEssentials; import net.ess3.api.IEssentials;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;

4
EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
View file

@ -1,13 +1,13 @@
package com.earth2me.essentials.spawn; package com.earth2me.essentials.spawn;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.IEssentials;
import com.earth2me.essentials.Kit; import com.earth2me.essentials.Kit;
import com.earth2me.essentials.OfflinePlayer; import com.earth2me.essentials.OfflinePlayer;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.textreader.IText; import com.earth2me.essentials.textreader.IText;
import com.earth2me.essentials.textreader.KeywordReplacer; import com.earth2me.essentials.textreader.KeywordReplacer;
import com.earth2me.essentials.textreader.SimpleTextPager; import com.earth2me.essentials.textreader.SimpleTextPager;
import net.ess3.api.IEssentials;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
@ -104,7 +104,7 @@ public class EssentialsSpawnPlayerListener implements Listener
if (!user.isOnline()) { if (!user.isOnline()) {
return; return;
} }
//This method allows for multiple line player announce messages using multiline yaml syntax #EasterEgg //This method allows for multiple line player announce messages using multiline yaml syntax #EasterEgg
if (ess.getSettings().getAnnounceNewPlayers()) if (ess.getSettings().getAnnounceNewPlayers())
{ {

6
EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java
View file

@ -1,9 +1,9 @@
package com.earth2me.essentials.spawn; package com.earth2me.essentials.spawn;
import com.earth2me.essentials.IEssentials;
import com.earth2me.essentials.IEssentialsModule; import com.earth2me.essentials.IEssentialsModule;
import com.earth2me.essentials.settings.Spawns; import com.earth2me.essentials.settings.Spawns;
import com.earth2me.essentials.storage.AsyncStorageObjectHolder; import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
import net.ess3.api.IEssentials;
import java.io.File; import java.io.File;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale; import java.util.Locale;
@ -25,12 +25,12 @@ public class SpawnStorage extends AsyncStorageObjectHolder<Spawns> implements IE
{ {
return new File(ess.getDataFolder(), "spawn.yml"); return new File(ess.getDataFolder(), "spawn.yml");
} }
@Override @Override
public void finishRead() public void finishRead()
{ {
} }
@Override @Override
public void finishWrite() public void finishWrite()
{ {