minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-18 20:41:37 +02:00
Code Issues Releases Wiki Activity

Change namespace from com.earth2me to org.mcess - net.ess3.api changes still required

Browse Source
This commit is contained in:
ementalo
2015-04-11 21:47:56 +01:00
parent ce8313bd68
commit 9e6c686c29
334 changed files with 1788 additions and 1816 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
EssentialsSpawn/pom.xml
View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.ess3</groupId>
<groupId>org.mcess</groupId>
<artifactId>EssentialsParent</artifactId>
<version>2.x-SNAPSHOT</version>
</parent>
@@ -43,7 +43,7 @@
<dependencies>
<dependency>
<groupId>net.ess3</groupId>
<groupId>org.mcess</groupId>
<artifactId>Essentials</artifactId>
<version>${project.version}</version>
</dependency>

10
EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandsetspawn.java → EssentialsSpawn/src/org/mcess/essentials/spawn/Commandsetspawn.java
View File

@@ -1,9 +1,9 @@
package com.earth2me.essentials.spawn;
package org.mcess.essentials.spawn;
import static com.earth2me.essentials.I18n.tl;
import com.earth2me.essentials.User;
import com.earth2me.essentials.commands.EssentialsCommand;
import org.mcess.essentials.User;
import org.mcess.essentials.commands.EssentialsCommand;
import org.bukkit.Server;
import org.mcess.essentials.I18n;
public class Commandsetspawn extends EssentialsCommand
@@ -18,6 +18,6 @@ public class Commandsetspawn extends EssentialsCommand
{
final String group = args.length > 0 ? getFinalArg(args, 0) : "default";
((SpawnStorage)module).setSpawn(user.getLocation(), group);
user.sendMessage(tl("spawnSet", group));
user.sendMessage(I18n.tl("spawnSet", group));
}
}

18
EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java → EssentialsSpawn/src/org/mcess/essentials/spawn/Commandspawn.java
View File

@@ -1,13 +1,13 @@
package com.earth2me.essentials.spawn;
package org.mcess.essentials.spawn;
import com.earth2me.essentials.CommandSource;
import static com.earth2me.essentials.I18n.tl;
import com.earth2me.essentials.Console;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User;
import com.earth2me.essentials.commands.EssentialsCommand;
import com.earth2me.essentials.commands.NoChargeException;
import com.earth2me.essentials.commands.NotEnoughArgumentsException;
import org.mcess.essentials.CommandSource;
import static org.mcess.essentials.I18n.tl;
import org.mcess.essentials.Console;
import org.mcess.essentials.Trade;
import org.mcess.essentials.User;
import org.mcess.essentials.commands.EssentialsCommand;
import org.mcess.essentials.commands.NoChargeException;
import org.mcess.essentials.commands.NotEnoughArgumentsException;
import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;

8
EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java → EssentialsSpawn/src/org/mcess/essentials/spawn/EssentialsSpawn.java
View File

@@ -1,6 +1,5 @@
package com.earth2me.essentials.spawn;
package org.mcess.essentials.spawn;
import static com.earth2me.essentials.I18n.tl;
import net.ess3.api.IEssentials;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -16,6 +15,7 @@ import org.bukkit.event.player.PlayerRespawnEvent;
import org.bukkit.plugin.EventExecutor;
import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin;
import org.mcess.essentials.I18n;
public class EssentialsSpawn extends JavaPlugin implements IEssentialsSpawn
@@ -31,7 +31,7 @@ public class EssentialsSpawn extends JavaPlugin implements IEssentialsSpawn
ess = (IEssentials)pluginManager.getPlugin("Essentials");
if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion()))
{
LOGGER.log(Level.WARNING, tl("versionMismatchAll"));
LOGGER.log(Level.WARNING, I18n.tl("versionMismatchAll"));
}
if (!ess.isEnabled())
{
@@ -69,7 +69,7 @@ public class EssentialsSpawn extends JavaPlugin implements IEssentialsSpawn
@Override
public boolean onCommand(final CommandSender sender, final Command command, final String commandLabel, final String[] args)
{
return ess.onCommandEssentials(sender, command, commandLabel, args, EssentialsSpawn.class.getClassLoader(), "com.earth2me.essentials.spawn.Command", "essentials.", spawns);
return ess.onCommandEssentials(sender, command, commandLabel, args, EssentialsSpawn.class.getClassLoader(), "org.mcess.spawn.Command", "essentials.", spawns);
}
@Override

21
EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java → EssentialsSpawn/src/org/mcess/essentials/spawn/EssentialsSpawnPlayerListener.java
View File

@@ -1,16 +1,14 @@
package com.earth2me.essentials.spawn;
package org.mcess.essentials.spawn;
import static com.earth2me.essentials.I18n.tl;
import com.earth2me.essentials.Kit;
import com.earth2me.essentials.OfflinePlayer;
import com.earth2me.essentials.User;
import com.earth2me.essentials.textreader.IText;
import com.earth2me.essentials.textreader.KeywordReplacer;
import com.earth2me.essentials.textreader.SimpleTextPager;
import org.mcess.essentials.Kit;
import org.mcess.essentials.OfflinePlayer;
import org.mcess.essentials.User;
import org.mcess.essentials.textreader.IText;
import org.mcess.essentials.textreader.KeywordReplacer;
import org.mcess.essentials.textreader.SimpleTextPager;
import net.ess3.api.IEssentials;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.bukkit.Bukkit;
@@ -20,6 +18,7 @@ import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerRespawnEvent;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
import org.mcess.essentials.I18n;
public class EssentialsSpawnPlayerListener implements Listener
@@ -164,7 +163,7 @@ public class EssentialsSpawnPlayerListener implements Listener
}
catch (Exception ex)
{
Bukkit.getLogger().log(Level.WARNING, tl("teleportNewPlayerError"), ex);
Bukkit.getLogger().log(Level.WARNING, I18n.tl("teleportNewPlayerError"), ex);
}
}
}

2
EssentialsSpawn/src/com/earth2me/essentials/spawn/IEssentialsSpawn.java → EssentialsSpawn/src/org/mcess/essentials/spawn/IEssentialsSpawn.java
View File

@@ -1,4 +1,4 @@
package com.earth2me.essentials.spawn;
package org.mcess.essentials.spawn;
import org.bukkit.Location;
import org.bukkit.plugin.Plugin;

8
EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java → EssentialsSpawn/src/org/mcess/essentials/spawn/SpawnStorage.java
View File

@@ -1,8 +1,8 @@
package com.earth2me.essentials.spawn;
package org.mcess.essentials.spawn;
import com.earth2me.essentials.IEssentialsModule;
import com.earth2me.essentials.settings.Spawns;
import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
import org.mcess.essentials.IEssentialsModule;
import org.mcess.essentials.settings.Spawns;
import org.mcess.essentials.storage.AsyncStorageObjectHolder;
import net.ess3.api.IEssentials;
import java.io.File;
import java.util.HashMap;

2
EssentialsSpawn/src/plugin.yml
View File

@@ -1,6 +1,6 @@
# This determines the command prefix when there are conflicts (/name:home, /name:help, etc.)
name: EssentialsSpawn
main: com.earth2me.essentials.spawn.EssentialsSpawn
main: org.mcess.essentials.spawn.EssentialsSpawn
# Note to developers: This next line cannot change, or the automatic versioning system will break.
version: TeamCity
website: http://tiny.cc/EssentialsCommands