EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-10-16 17:13:38 +02:00
Code Issues Projects Releases Wiki Activity

Moving Stuff around pt 2

Browse Source
This commit is contained in:
nossr50 2019-02-09 22:37:22 -08:00
parent 4d4dad0ccb
commit e749d5eb7f
282 changed files with 1547 additions and 1541 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bukkit/src/main/java/com/gmail/nossr50/commands/McImportCommand.java
View File

@ -1,8 +1,8 @@
package com.gmail.nossr50.commands; package com.gmail.nossr50.commands;
import com.gmail.nossr50.core.datatypes.skills.ModConfigType; import com.gmail.nossr50.core.skills.ModConfigType;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.core.util.Misc;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

4
bukkit/src/main/java/com/gmail/nossr50/commands/McabilityCommand.java
View File

@ -1,8 +1,8 @@
package com.gmail.nossr50.commands; package com.gmail.nossr50.commands;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
public class McabilityCommand extends ToggleCommand { public class McabilityCommand extends ToggleCommand {

4
bukkit/src/main/java/com/gmail/nossr50/commands/McgodCommand.java
View File

@ -1,8 +1,8 @@
package com.gmail.nossr50.commands; package com.gmail.nossr50.commands;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
public class McgodCommand extends ToggleCommand { public class McgodCommand extends ToggleCommand {

4
bukkit/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java
View File

@ -2,9 +2,9 @@ package com.gmail.nossr50.commands;
import com.gmail.nossr50.commands.party.PartySubcommandType; import com.gmail.nossr50.commands.party.PartySubcommandType;
import com.gmail.nossr50.core.config.skills.Config; import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

2
bukkit/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.commands; package com.gmail.nossr50.commands;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.bukkit.command.Command; import org.bukkit.command.Command;

4
bukkit/src/main/java/com/gmail/nossr50/commands/McrefreshCommand.java
View File

@ -1,8 +1,8 @@
package com.gmail.nossr50.commands; package com.gmail.nossr50.commands;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
public class McrefreshCommand extends ToggleCommand { public class McrefreshCommand extends ToggleCommand {

6
bukkit/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java
View File

@ -1,9 +1,9 @@
package com.gmail.nossr50.commands; package com.gmail.nossr50.commands;
import com.gmail.nossr50.core.config.skills.Config; import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.util.scoreboards.ScoreboardManager; import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;

2
bukkit/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.commands; package com.gmail.nossr50.commands;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.bukkit.command.Command; import org.bukkit.command.Command;

10
bukkit/src/main/java/com/gmail/nossr50/commands/XprateCommand.java
View File

@ -2,12 +2,12 @@ package com.gmail.nossr50.commands;
import com.gmail.nossr50.core.config.skills.AdvancedConfig; import com.gmail.nossr50.core.config.skills.AdvancedConfig;
import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.util.StringUtils; import com.gmail.nossr50.core.util.StringUtils;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.util.player.NotificationManager; import com.gmail.nossr50.core.util.player.NotificationManager;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.Command; import org.bukkit.command.Command;

8
bukkit/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java
View File

@ -1,14 +1,14 @@
package com.gmail.nossr50.commands.chat; package com.gmail.nossr50.commands.chat;
import com.gmail.nossr50.chat.ChatManager; import com.gmail.nossr50.core.chat.ChatManager;
import com.gmail.nossr50.chat.ChatManagerFactory; import com.gmail.nossr50.core.chat.ChatManagerFactory;
import com.gmail.nossr50.core.config.skills.Config; import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.datatypes.chat.ChatMode; import com.gmail.nossr50.core.datatypes.chat.ChatMode;
import com.gmail.nossr50.core.datatypes.party.PartyFeature; import com.gmail.nossr50.core.datatypes.party.PartyFeature;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.bukkit.command.Command; import org.bukkit.command.Command;

4
bukkit/src/main/java/com/gmail/nossr50/commands/chat/McChatSpy.java
View File

@ -2,8 +2,8 @@ package com.gmail.nossr50.commands.chat;
import com.gmail.nossr50.commands.ToggleCommand; import com.gmail.nossr50.commands.ToggleCommand;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
public class McChatSpy extends ToggleCommand { public class McChatSpy extends ToggleCommand {

6
bukkit/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java
View File

@ -1,12 +1,12 @@
package com.gmail.nossr50.commands.chat; package com.gmail.nossr50.commands.chat;
import com.gmail.nossr50.chat.PartyChatManager; import com.gmail.nossr50.core.chat.PartyChatManager;
import com.gmail.nossr50.core.config.skills.Config; import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.datatypes.chat.ChatMode; import com.gmail.nossr50.core.datatypes.chat.ChatMode;
import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.core.datatypes.party.PartyFeature; import com.gmail.nossr50.core.datatypes.party.PartyFeature;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.party.PartyManager; import com.gmail.nossr50.core.party.PartyManager;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

6
bukkit/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java
View File

@ -4,10 +4,10 @@ import com.gmail.nossr50.core.data.database.DatabaseManager;
import com.gmail.nossr50.core.data.database.DatabaseManagerFactory; import com.gmail.nossr50.core.data.database.DatabaseManagerFactory;
import com.gmail.nossr50.core.datatypes.database.DatabaseType; import com.gmail.nossr50.core.datatypes.database.DatabaseType;
import com.gmail.nossr50.core.datatypes.player.PlayerProfile; import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.runnables.database.DatabaseConversionTask; import com.gmail.nossr50.core.runnables.database.DatabaseConversionTask;
import com.gmail.nossr50.runnables.player.PlayerProfileLoadingTask; import com.gmail.nossr50.core.runnables.player.PlayerProfileLoadingTask;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

2
bukkit/src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.commands.database; package com.gmail.nossr50.commands.database;
import com.gmail.nossr50.core.config.skills.Config; import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.bukkit.command.Command; import org.bukkit.command.Command;

4
bukkit/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java
View File

@ -1,8 +1,8 @@
package com.gmail.nossr50.commands.database; package com.gmail.nossr50.commands.database;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.bukkit.command.Command; import org.bukkit.command.Command;

2
bukkit/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java
View File

@ -2,7 +2,7 @@ package com.gmail.nossr50.commands.database;
import com.gmail.nossr50.core.config.skills.Config; import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.data.database.DatabaseManagerFactory; import com.gmail.nossr50.core.data.database.DatabaseManagerFactory;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;

8
bukkit/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java
View File

@ -2,10 +2,10 @@ package com.gmail.nossr50.commands.experience;
import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
import com.gmail.nossr50.core.datatypes.player.PlayerProfile; import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.EventUtils; import com.gmail.nossr50.core.util.EventUtils;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

6
bukkit/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java
View File

@ -3,9 +3,9 @@ package com.gmail.nossr50.commands.experience;
import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
import com.gmail.nossr50.core.datatypes.experience.XPGainSource; import com.gmail.nossr50.core.datatypes.experience.XPGainSource;
import com.gmail.nossr50.core.datatypes.player.PlayerProfile; import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

6
bukkit/src/main/java/com/gmail/nossr50/commands/experience/ConvertExperienceCommand.java
View File

@ -1,10 +1,10 @@
package com.gmail.nossr50.commands.experience; package com.gmail.nossr50.commands.experience;
import com.gmail.nossr50.core.datatypes.experience.FormulaType; import com.gmail.nossr50.core.datatypes.experience.FormulaType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.runnables.database.FormulaConversionTask; import com.gmail.nossr50.core.runnables.database.FormulaConversionTask;
import com.gmail.nossr50.runnables.player.PlayerProfileLoadingTask; import com.gmail.nossr50.core.runnables.player.PlayerProfileLoadingTask;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

6
bukkit/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java
View File

@ -2,10 +2,10 @@ package com.gmail.nossr50.commands.experience;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.datatypes.player.PlayerProfile; import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;

8
bukkit/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java
View File

@ -2,10 +2,10 @@ package com.gmail.nossr50.commands.experience;
import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
import com.gmail.nossr50.core.datatypes.player.PlayerProfile; import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.EventUtils; import com.gmail.nossr50.core.util.EventUtils;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

10
bukkit/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java
View File

@ -3,12 +3,12 @@ package com.gmail.nossr50.commands.experience;
import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.datatypes.player.PlayerProfile; import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.EventUtils; import com.gmail.nossr50.core.util.EventUtils;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;

6
bukkit/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java
View File

@ -1,10 +1,10 @@
package com.gmail.nossr50.commands.hardcore; package com.gmail.nossr50.commands.hardcore;
import com.gmail.nossr50.core.config.skills.Config; import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
public class HardcoreCommand extends HardcoreModeCommand { public class HardcoreCommand extends HardcoreModeCommand {

8
bukkit/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java
View File

@ -1,9 +1,9 @@
package com.gmail.nossr50.commands.hardcore; package com.gmail.nossr50.commands.hardcore;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.util.StringUtils; import com.gmail.nossr50.core.util.StringUtils;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;

6
bukkit/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java
View File

@ -1,10 +1,10 @@
package com.gmail.nossr50.commands.hardcore; package com.gmail.nossr50.commands.hardcore;
import com.gmail.nossr50.core.config.skills.Config; import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
public class VampirismCommand extends HardcoreModeCommand { public class VampirismCommand extends HardcoreModeCommand {

4
bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java
View File

@ -1,8 +1,8 @@
package com.gmail.nossr50.commands.party; package com.gmail.nossr50.commands.party;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.party.PartyManager; import com.gmail.nossr50.core.party.PartyManager;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

6
bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java
View File

@ -1,10 +1,10 @@
package com.gmail.nossr50.commands.party; package com.gmail.nossr50.commands.party;
import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.party.PartyManager; import com.gmail.nossr50.core.party.PartyManager;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.command.Command; import org.bukkit.command.Command;

2
bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.commands.party; package com.gmail.nossr50.commands.party;
import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

6
bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java
View File

@ -5,9 +5,9 @@ import com.gmail.nossr50.commands.party.alliance.PartyAllianceCommand;
import com.gmail.nossr50.commands.party.teleport.PtpCommand; import com.gmail.nossr50.commands.party.teleport.PtpCommand;
import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.bukkit.command.Command; import org.bukkit.command.Command;

4
bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java
View File

@ -1,8 +1,8 @@
package com.gmail.nossr50.commands.party; package com.gmail.nossr50.commands.party;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.party.PartyManager; import com.gmail.nossr50.core.party.PartyManager;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

4
bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java
View File

@ -2,8 +2,8 @@ package com.gmail.nossr50.commands.party;
import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason; import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.party.PartyManager; import com.gmail.nossr50.core.party.PartyManager;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

2
bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyHelpCommand.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.party; package com.gmail.nossr50.commands.party;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;

4
bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java
View File

@ -5,8 +5,8 @@ import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.core.datatypes.party.PartyFeature; import com.gmail.nossr50.core.datatypes.party.PartyFeature;
import com.gmail.nossr50.core.datatypes.party.ShareMode; import com.gmail.nossr50.core.datatypes.party.ShareMode;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.party.PartyManager; import com.gmail.nossr50.core.party.PartyManager;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.Command; import org.bukkit.command.Command;

6
bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java
View File

@ -3,9 +3,9 @@ package com.gmail.nossr50.commands.party;
import com.gmail.nossr50.core.config.skills.Config; import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.party.PartyManager; import com.gmail.nossr50.core.party.PartyManager;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

6
bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java
View File

@ -5,9 +5,9 @@ import com.gmail.nossr50.core.datatypes.party.ItemShareType;
import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.core.datatypes.party.PartyFeature; import com.gmail.nossr50.core.datatypes.party.PartyFeature;
import com.gmail.nossr50.core.datatypes.party.ShareMode; import com.gmail.nossr50.core.datatypes.party.ShareMode;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.StringUtils; import com.gmail.nossr50.core.util.StringUtils;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

6
bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java
View File

@ -2,9 +2,9 @@ package com.gmail.nossr50.commands.party;
import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.party.PartyManager; import com.gmail.nossr50.core.party.PartyManager;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

6
bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java
View File

@ -2,10 +2,10 @@ package com.gmail.nossr50.commands.party;
import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason; import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.party.PartyManager; import com.gmail.nossr50.core.party.PartyManager;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.command.Command; import org.bukkit.command.Command;

6
bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java
View File

@ -1,9 +1,9 @@
package com.gmail.nossr50.commands.party; package com.gmail.nossr50.commands.party;
import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

4
bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java
View File

@ -3,8 +3,8 @@ package com.gmail.nossr50.commands.party;
import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason; import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.party.PartyManager; import com.gmail.nossr50.core.party.PartyManager;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

4
bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java
View File

@ -3,8 +3,8 @@ package com.gmail.nossr50.commands.party;
import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason; import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.party.PartyManager; import com.gmail.nossr50.core.party.PartyManager;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

6
bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java
View File

@ -4,9 +4,9 @@ import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.core.datatypes.party.PartyFeature; import com.gmail.nossr50.core.datatypes.party.PartyFeature;
import com.gmail.nossr50.core.datatypes.party.ShareMode; import com.gmail.nossr50.core.datatypes.party.ShareMode;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.StringUtils; import com.gmail.nossr50.core.util.StringUtils;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

4
bukkit/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceAcceptCommand.java
View File

@ -1,8 +1,8 @@
package com.gmail.nossr50.commands.party.alliance; package com.gmail.nossr50.commands.party.alliance;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.party.PartyManager; import com.gmail.nossr50.core.party.PartyManager;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

6
bukkit/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java
View File

@ -4,9 +4,9 @@ import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.core.datatypes.party.PartyFeature; import com.gmail.nossr50.core.datatypes.party.PartyFeature;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.party.PartyManager; import com.gmail.nossr50.core.party.PartyManager;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;

4
bukkit/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceDisbandCommand.java
View File

@ -2,8 +2,8 @@ package com.gmail.nossr50.commands.party.alliance;
import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.party.PartyManager; import com.gmail.nossr50.core.party.PartyManager;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

6
bukkit/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceInviteCommand.java
View File

@ -2,9 +2,9 @@ package com.gmail.nossr50.commands.party.alliance;
import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.party.PartyManager; import com.gmail.nossr50.core.party.PartyManager;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

4
bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java
View File

@ -1,8 +1,8 @@
package com.gmail.nossr50.commands.party.teleport; package com.gmail.nossr50.commands.party.teleport;
import com.gmail.nossr50.core.datatypes.party.PartyTeleportRecord; import com.gmail.nossr50.core.datatypes.party.PartyTeleportRecord;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

6
bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java
View File

@ -2,10 +2,10 @@ package com.gmail.nossr50.commands.party.teleport;
import com.gmail.nossr50.core.config.skills.Config; import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.datatypes.party.PartyTeleportRecord; import com.gmail.nossr50.core.datatypes.party.PartyTeleportRecord;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.util.skills.SkillUtils; import com.gmail.nossr50.core.util.skills.SkillUtils;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

20
bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java
View File

@ -6,18 +6,18 @@ import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.core.datatypes.party.PartyFeature; import com.gmail.nossr50.core.datatypes.party.PartyFeature;
import com.gmail.nossr50.core.datatypes.party.PartyTeleportRecord; import com.gmail.nossr50.core.datatypes.party.PartyTeleportRecord;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.party.PartyManager; import com.gmail.nossr50.core.party.PartyManager;
import com.gmail.nossr50.runnables.items.TeleportationWarmup; import com.gmail.nossr50.core.runnables.items.TeleportationWarmup;
import com.gmail.nossr50.util.EventUtils; import com.gmail.nossr50.core.util.EventUtils;
import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.core.util.Misc;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.util.skills.SkillUtils; import com.gmail.nossr50.core.util.skills.SkillUtils;
import com.gmail.nossr50.worldguard.WorldGuardManager; import com.gmail.nossr50.core.worldguard.WorldGuardManager;
import com.gmail.nossr50.worldguard.WorldGuardUtils; import com.gmail.nossr50.core.worldguard.WorldGuardUtils;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

4
bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java
View File

@ -1,8 +1,8 @@
package com.gmail.nossr50.commands.party.teleport; package com.gmail.nossr50.commands.party.teleport;
import com.gmail.nossr50.core.datatypes.party.PartyTeleportRecord; import com.gmail.nossr50.core.datatypes.party.PartyTeleportRecord;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

10
bukkit/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java
View File

@ -3,13 +3,13 @@ package com.gmail.nossr50.commands.player;
import com.gmail.nossr50.core.config.skills.Config; import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.datatypes.player.PlayerProfile; import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.util.scoreboards.ScoreboardManager; import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;

8
bukkit/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java
View File

@ -2,11 +2,11 @@ package com.gmail.nossr50.commands.player;
import com.gmail.nossr50.core.config.skills.Config; import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.datatypes.skills.SuperAbilityType; import com.gmail.nossr50.core.skills.SuperAbilityType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.util.scoreboards.ScoreboardManager; import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;

8
bukkit/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java
View File

@ -2,11 +2,11 @@ package com.gmail.nossr50.commands.player;
import com.gmail.nossr50.core.config.skills.Config; import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.runnables.commands.McrankCommandAsyncTask; import com.gmail.nossr50.core.runnables.commands.McrankCommandAsyncTask;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.bukkit.command.Command; import org.bukkit.command.Command;

6
bukkit/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java
View File

@ -1,10 +1,10 @@
package com.gmail.nossr50.commands.player; package com.gmail.nossr50.commands.player;
import com.gmail.nossr50.core.config.skills.Config; import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.util.scoreboards.ScoreboardManager; import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;

12
bukkit/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java
View File

@ -2,13 +2,13 @@ package com.gmail.nossr50.commands.player;
import com.gmail.nossr50.core.config.skills.Config; import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.runnables.commands.MctopCommandAsyncTask; import com.gmail.nossr50.core.runnables.commands.MctopCommandAsyncTask;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.util.StringUtils; import com.gmail.nossr50.core.util.StringUtils;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.bukkit.command.Command; import org.bukkit.command.Command;

16
bukkit/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java
View File

@ -1,14 +1,14 @@
package com.gmail.nossr50.commands.skills; package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.datatypes.skills.SubSkillType; import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.core.datatypes.skills.subskills.AbstractSubSkill; import com.gmail.nossr50.core.skills.subskills.AbstractSubSkill;
import com.gmail.nossr50.listeners.InteractionManager; import com.gmail.nossr50.listeners.InteractionManager;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.TextComponentFactory; import com.gmail.nossr50.core.util.TextComponentFactory;
import com.gmail.nossr50.util.random.RandomChanceSkill; import com.gmail.nossr50.core.util.random.RandomChanceSkill;
import com.gmail.nossr50.util.random.RandomChanceUtil; import com.gmail.nossr50.core.util.random.RandomChanceUtil;
import com.gmail.nossr50.util.skills.SkillActivationType; import com.gmail.nossr50.core.util.skills.SkillActivationType;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

14
bukkit/src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java
View File

@ -1,13 +1,13 @@
package com.gmail.nossr50.commands.skills; package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.datatypes.skills.SubSkillType; import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.skills.alchemy.AlchemyManager; import com.gmail.nossr50.core.skills.primary.alchemy.AlchemyManager;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.util.TextComponentFactory; import com.gmail.nossr50.core.util.TextComponentFactory;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.util.skills.RankUtils; import com.gmail.nossr50.core.util.skills.RankUtils;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

10
bukkit/src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java
View File

@ -1,10 +1,10 @@
package com.gmail.nossr50.commands.skills; package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.HolidayManager.FakeSkillType; import com.gmail.nossr50.core.util.HolidayManager.FakeSkillType;
import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.core.util.Misc;
import com.gmail.nossr50.util.StringUtils; import com.gmail.nossr50.core.util.StringUtils;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;

12
bukkit/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java
View File

@ -1,11 +1,11 @@
package com.gmail.nossr50.commands.skills; package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.datatypes.skills.SubSkillType; import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.skills.archery.Archery; import com.gmail.nossr50.core.skills.primary.archery.Archery;
import com.gmail.nossr50.util.TextComponentFactory; import com.gmail.nossr50.core.util.TextComponentFactory;
import com.gmail.nossr50.util.skills.SkillActivationType; import com.gmail.nossr50.core.util.skills.SkillActivationType;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

16
bukkit/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java
View File

@ -1,14 +1,14 @@
package com.gmail.nossr50.commands.skills; package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.datatypes.skills.SubSkillType; import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.skills.axes.Axes; import com.gmail.nossr50.core.skills.primary.axes.Axes;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.util.TextComponentFactory; import com.gmail.nossr50.core.util.TextComponentFactory;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.util.skills.RankUtils; import com.gmail.nossr50.core.util.skills.RankUtils;
import com.gmail.nossr50.util.skills.SkillActivationType; import com.gmail.nossr50.core.util.skills.SkillActivationType;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

12
bukkit/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java
View File

@ -1,11 +1,11 @@
package com.gmail.nossr50.commands.skills; package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.datatypes.skills.SubSkillType; import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.util.TextComponentFactory; import com.gmail.nossr50.core.util.TextComponentFactory;
import com.gmail.nossr50.util.skills.RankUtils; import com.gmail.nossr50.core.util.skills.RankUtils;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

20
bukkit/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
View File

@ -2,17 +2,17 @@ package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.core.config.skills.AdvancedConfig; import com.gmail.nossr50.core.config.skills.AdvancedConfig;
import com.gmail.nossr50.core.config.treasure.TreasureConfig; import com.gmail.nossr50.core.config.treasure.TreasureConfig;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.datatypes.skills.SubSkillType; import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.core.datatypes.treasure.Rarity; import com.gmail.nossr50.core.skills.treasure.Rarity;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.skills.fishing.Fishing; import com.gmail.nossr50.core.skills.primary.fishing.Fishing;
import com.gmail.nossr50.skills.fishing.FishingManager; import com.gmail.nossr50.core.skills.primary.fishing.FishingManager;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.util.TextComponentFactory; import com.gmail.nossr50.core.util.TextComponentFactory;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.util.random.RandomChanceUtil; import com.gmail.nossr50.core.util.random.RandomChanceUtil;
import com.gmail.nossr50.util.skills.RankUtils; import com.gmail.nossr50.core.util.skills.RankUtils;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;

14
bukkit/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java
View File

@ -1,12 +1,12 @@
package com.gmail.nossr50.commands.skills; package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.datatypes.skills.SubSkillType; import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.util.TextComponentFactory; import com.gmail.nossr50.core.util.TextComponentFactory;
import com.gmail.nossr50.util.skills.RankUtils; import com.gmail.nossr50.core.util.skills.RankUtils;
import com.gmail.nossr50.util.skills.SkillActivationType; import com.gmail.nossr50.core.util.skills.SkillActivationType;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

16
bukkit/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java
View File

@ -1,14 +1,14 @@
package com.gmail.nossr50.commands.skills; package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.datatypes.skills.SubSkillType; import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.skills.mining.MiningManager; import com.gmail.nossr50.core.skills.primary.mining.MiningManager;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.util.TextComponentFactory; import com.gmail.nossr50.core.util.TextComponentFactory;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.util.skills.RankUtils; import com.gmail.nossr50.core.util.skills.RankUtils;
import com.gmail.nossr50.util.skills.SkillActivationType; import com.gmail.nossr50.core.util.skills.SkillActivationType;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

12
bukkit/src/main/java/com/gmail/nossr50/commands/skills/MmoInfoCommand.java
View File

@ -1,12 +1,12 @@
package com.gmail.nossr50.commands.skills; package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.datatypes.skills.SubSkillType; import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.core.datatypes.skills.subskills.AbstractSubSkill; import com.gmail.nossr50.core.skills.subskills.AbstractSubSkill;
import com.gmail.nossr50.listeners.InteractionManager; import com.gmail.nossr50.listeners.InteractionManager;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.util.TextComponentFactory; import com.gmail.nossr50.core.util.TextComponentFactory;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;

24
bukkit/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java
View File

@ -1,19 +1,19 @@
package com.gmail.nossr50.commands.skills; package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.core.datatypes.skills.MaterialType; import com.gmail.nossr50.core.skills.MaterialType;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.datatypes.skills.SubSkillType; import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.skills.repair.ArcaneForging; import com.gmail.nossr50.core.skills.primary.repair.ArcaneForging;
import com.gmail.nossr50.skills.repair.Repair; import com.gmail.nossr50.core.skills.primary.repair.Repair;
import com.gmail.nossr50.skills.repair.RepairManager; import com.gmail.nossr50.core.skills.primary.repair.RepairManager;
import com.gmail.nossr50.skills.repair.repairables.Repairable; import com.gmail.nossr50.core.skills.primary.repair.repairables.Repairable;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.util.TextComponentFactory; import com.gmail.nossr50.core.util.TextComponentFactory;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.util.skills.RankUtils; import com.gmail.nossr50.core.util.skills.RankUtils;
import com.gmail.nossr50.util.skills.SkillActivationType; import com.gmail.nossr50.core.util.skills.SkillActivationType;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

14
bukkit/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java
View File

@ -1,13 +1,13 @@
package com.gmail.nossr50.commands.skills; package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.datatypes.skills.SubSkillType; import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.skills.salvage.Salvage; import com.gmail.nossr50.core.skills.child.salvage.Salvage;
import com.gmail.nossr50.skills.salvage.SalvageManager; import com.gmail.nossr50.core.skills.child.salvage.SalvageManager;
import com.gmail.nossr50.util.TextComponentFactory; import com.gmail.nossr50.core.util.TextComponentFactory;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.util.skills.RankUtils; import com.gmail.nossr50.core.util.skills.RankUtils;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

26
bukkit/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java
View File

@ -3,20 +3,20 @@ package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.core.config.skills.AdvancedConfig; import com.gmail.nossr50.core.config.skills.AdvancedConfig;
import com.gmail.nossr50.core.config.skills.Config; import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.datatypes.skills.SubSkillType; import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.skills.child.FamilyTree; import com.gmail.nossr50.core.skills.child.FamilyTree;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.util.StringUtils; import com.gmail.nossr50.core.util.StringUtils;
import com.gmail.nossr50.util.TextComponentFactory; import com.gmail.nossr50.core.util.TextComponentFactory;
import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.util.random.RandomChanceUtil; import com.gmail.nossr50.core.util.random.RandomChanceUtil;
import com.gmail.nossr50.util.scoreboards.ScoreboardManager; import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager;
import com.gmail.nossr50.util.skills.PerksUtils; import com.gmail.nossr50.core.util.skills.PerksUtils;
import com.gmail.nossr50.util.skills.RankUtils; import com.gmail.nossr50.core.util.skills.RankUtils;
import com.gmail.nossr50.util.skills.SkillActivationType; import com.gmail.nossr50.core.util.skills.SkillActivationType;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;

6
bukkit/src/main/java/com/gmail/nossr50/commands/skills/SkillGuideCommand.java
View File

@ -1,8 +1,8 @@
package com.gmail.nossr50.commands.skills; package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.StringUtils; import com.gmail.nossr50.core.util.StringUtils;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;

16
bukkit/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java
View File

@ -1,14 +1,14 @@
package com.gmail.nossr50.commands.skills; package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.datatypes.skills.SubSkillType; import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.skills.smelting.Smelting; import com.gmail.nossr50.core.skills.child.smelting.Smelting;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.util.TextComponentFactory; import com.gmail.nossr50.core.util.TextComponentFactory;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.util.skills.RankUtils; import com.gmail.nossr50.core.util.skills.RankUtils;
import com.gmail.nossr50.util.skills.SkillActivationType; import com.gmail.nossr50.core.util.skills.SkillActivationType;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

14
bukkit/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java
View File

@ -1,14 +1,14 @@
package com.gmail.nossr50.commands.skills; package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.core.config.skills.AdvancedConfig; import com.gmail.nossr50.core.config.skills.AdvancedConfig;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.datatypes.skills.SubSkillType; import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.util.TextComponentFactory; import com.gmail.nossr50.core.util.TextComponentFactory;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.util.skills.RankUtils; import com.gmail.nossr50.core.util.skills.RankUtils;
import com.gmail.nossr50.util.skills.SkillActivationType; import com.gmail.nossr50.core.util.skills.SkillActivationType;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

14
bukkit/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java
View File

@ -1,12 +1,12 @@
package com.gmail.nossr50.commands.skills; package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.datatypes.skills.SubSkillType; import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.skills.taming.Taming; import com.gmail.nossr50.core.skills.primary.taming.Taming;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.util.TextComponentFactory; import com.gmail.nossr50.core.util.TextComponentFactory;
import com.gmail.nossr50.util.skills.SkillActivationType; import com.gmail.nossr50.core.util.skills.SkillActivationType;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

14
bukkit/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java
View File

@ -1,13 +1,13 @@
package com.gmail.nossr50.commands.skills; package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.datatypes.skills.SubSkillType; import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.util.TextComponentFactory; import com.gmail.nossr50.core.util.TextComponentFactory;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.util.skills.RankUtils; import com.gmail.nossr50.core.util.skills.RankUtils;
import com.gmail.nossr50.util.skills.SkillActivationType; import com.gmail.nossr50.core.util.skills.SkillActivationType;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

14
bukkit/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java
View File

@ -1,12 +1,12 @@
package com.gmail.nossr50.commands.skills; package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.datatypes.skills.SubSkillType; import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.util.TextComponentFactory; import com.gmail.nossr50.core.util.TextComponentFactory;
import com.gmail.nossr50.util.skills.RankUtils; import com.gmail.nossr50.core.util.skills.RankUtils;
import com.gmail.nossr50.util.skills.SkillActivationType; import com.gmail.nossr50.core.util.skills.SkillActivationType;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

2
bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.events.experience; package com.gmail.nossr50.events.experience;
import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;

2
bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelChangeEvent.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.events.experience; package com.gmail.nossr50.events.experience;
import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
/** /**

2
bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelDownEvent.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.events.experience; package com.gmail.nossr50.events.experience;
import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;

2
bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.events.experience; package com.gmail.nossr50.events.experience;
import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;

2
bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.events.experience; package com.gmail.nossr50.events.experience;
import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;

2
bukkit/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.events.skills; package com.gmail.nossr50.events.skills;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;

2
bukkit/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.events.skills.abilities; package com.gmail.nossr50.events.skills.abilities;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;

2
bukkit/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.events.skills.abilities; package com.gmail.nossr50.events.skills.abilities;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class McMMOPlayerAbilityDeactivateEvent extends McMMOPlayerAbilityEvent { public class McMMOPlayerAbilityDeactivateEvent extends McMMOPlayerAbilityEvent {

4
bukkit/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityEvent.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.events.skills.abilities; package com.gmail.nossr50.events.skills.abilities;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.datatypes.skills.SuperAbilityType; import com.gmail.nossr50.core.skills.SuperAbilityType;
import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent; import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

2
bukkit/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerBrewEvent.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.events.skills.alchemy; package com.gmail.nossr50.events.skills.alchemy;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent; import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;

2
bukkit/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerCatalysisEvent.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.events.skills.alchemy; package com.gmail.nossr50.events.skills.alchemy;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent; import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;

2
bukkit/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingEvent.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.events.skills.fishing; package com.gmail.nossr50.events.skills.fishing;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent; import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;

2
bukkit/src/main/java/com/gmail/nossr50/events/skills/repair/McMMOPlayerRepairCheckEvent.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.events.skills.repair; package com.gmail.nossr50.events.skills.repair;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent; import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;

2
bukkit/src/main/java/com/gmail/nossr50/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.events.skills.salvage; package com.gmail.nossr50.events.skills.salvage;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent; import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;

6
bukkit/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillEvent.java
View File

@ -1,8 +1,8 @@
package com.gmail.nossr50.events.skills.secondaryabilities; package com.gmail.nossr50.events.skills.secondaryabilities;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.datatypes.skills.SubSkillType; import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.core.datatypes.skills.subskills.AbstractSubSkill; import com.gmail.nossr50.core.skills.subskills.AbstractSubSkill;
import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent; import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;

4
bukkit/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillRandomCheckEvent.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.events.skills.secondaryabilities; package com.gmail.nossr50.events.skills.secondaryabilities;
import com.gmail.nossr50.core.datatypes.skills.SubSkillType; import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.core.datatypes.skills.subskills.AbstractSubSkill; import com.gmail.nossr50.core.skills.subskills.AbstractSubSkill;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class SubSkillRandomCheckEvent extends SubSkillEvent { public class SubSkillRandomCheckEvent extends SubSkillEvent {

2
bukkit/src/main/java/com/gmail/nossr50/events/skills/unarmed/McMMOPlayerDisarmEvent.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.events.skills.unarmed; package com.gmail.nossr50.events.skills.unarmed;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent; import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;

40
bukkit/src/main/java/com/gmail/nossr50/listeners/BlockListener.java
View File

@ -5,30 +5,30 @@ import com.gmail.nossr50.core.config.skills.HiddenConfig;
import com.gmail.nossr50.core.config.skills.WorldBlacklist; import com.gmail.nossr50.core.config.skills.WorldBlacklist;
import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.datatypes.skills.SuperAbilityType; import com.gmail.nossr50.core.skills.SuperAbilityType;
import com.gmail.nossr50.core.datatypes.skills.ToolType; import com.gmail.nossr50.core.skills.ToolType;
import com.gmail.nossr50.events.fake.FakeBlockBreakEvent; import com.gmail.nossr50.events.fake.FakeBlockBreakEvent;
import com.gmail.nossr50.events.fake.FakeBlockDamageEvent; import com.gmail.nossr50.events.fake.FakeBlockDamageEvent;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.skills.alchemy.Alchemy; import com.gmail.nossr50.core.skills.primary.alchemy.Alchemy;
import com.gmail.nossr50.skills.excavation.ExcavationManager; import com.gmail.nossr50.core.skills.primary.excavation.ExcavationManager;
import com.gmail.nossr50.skills.herbalism.Herbalism; import com.gmail.nossr50.core.skills.primary.herbalism.Herbalism;
import com.gmail.nossr50.skills.herbalism.HerbalismManager; import com.gmail.nossr50.core.skills.primary.herbalism.HerbalismManager;
import com.gmail.nossr50.skills.mining.MiningManager; import com.gmail.nossr50.core.skills.primary.mining.MiningManager;
import com.gmail.nossr50.skills.repair.Repair; import com.gmail.nossr50.core.skills.primary.repair.Repair;
import com.gmail.nossr50.skills.salvage.Salvage; import com.gmail.nossr50.core.skills.child.salvage.Salvage;
import com.gmail.nossr50.skills.woodcutting.WoodcuttingManager; import com.gmail.nossr50.core.skills.primary.woodcutting.WoodcuttingManager;
import com.gmail.nossr50.util.BlockUtils; import com.gmail.nossr50.core.util.BlockUtils;
import com.gmail.nossr50.util.EventUtils; import com.gmail.nossr50.core.util.EventUtils;
import com.gmail.nossr50.util.ItemUtils; import com.gmail.nossr50.core.util.ItemUtils;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.util.skills.SkillUtils; import com.gmail.nossr50.core.util.skills.SkillUtils;
import com.gmail.nossr50.util.sounds.SoundManager; import com.gmail.nossr50.core.util.sounds.SoundManager;
import com.gmail.nossr50.util.sounds.SoundType; import com.gmail.nossr50.core.util.sounds.SoundType;
import com.gmail.nossr50.worldguard.WorldGuardManager; import com.gmail.nossr50.core.worldguard.WorldGuardManager;
import com.gmail.nossr50.worldguard.WorldGuardUtils; import com.gmail.nossr50.core.worldguard.WorldGuardUtils;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;

30
bukkit/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
View File

@ -6,26 +6,26 @@ import com.gmail.nossr50.core.config.skills.WorldBlacklist;
import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.core.datatypes.meta.OldName; import com.gmail.nossr50.core.datatypes.meta.OldName;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.datatypes.skills.SubSkillType; import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.core.datatypes.skills.subskills.interfaces.InteractType; import com.gmail.nossr50.core.skills.subskills.interfaces.InteractType;
import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent; import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent;
import com.gmail.nossr50.events.fake.FakeEntityDamageEvent; import com.gmail.nossr50.events.fake.FakeEntityDamageEvent;
import com.gmail.nossr50.events.fake.FakeEntityTameEvent; import com.gmail.nossr50.events.fake.FakeEntityTameEvent;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.party.PartyManager; import com.gmail.nossr50.core.party.PartyManager;
import com.gmail.nossr50.skills.archery.Archery; import com.gmail.nossr50.core.skills.primary.archery.Archery;
import com.gmail.nossr50.skills.fishing.Fishing; import com.gmail.nossr50.core.skills.primary.fishing.Fishing;
import com.gmail.nossr50.skills.mining.BlastMining; import com.gmail.nossr50.core.skills.primary.mining.BlastMining;
import com.gmail.nossr50.skills.mining.MiningManager; import com.gmail.nossr50.core.skills.primary.mining.MiningManager;
import com.gmail.nossr50.skills.taming.Taming; import com.gmail.nossr50.core.skills.primary.taming.Taming;
import com.gmail.nossr50.skills.taming.TamingManager; import com.gmail.nossr50.core.skills.primary.taming.TamingManager;
import com.gmail.nossr50.util.BlockUtils; import com.gmail.nossr50.core.util.BlockUtils;
import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.core.util.Misc;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.util.skills.CombatUtils; import com.gmail.nossr50.core.util.skills.CombatUtils;
import com.gmail.nossr50.worldguard.WorldGuardManager; import com.gmail.nossr50.core.worldguard.WorldGuardManager;
import com.gmail.nossr50.worldguard.WorldGuardUtils; import com.gmail.nossr50.core.worldguard.WorldGuardUtils;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.block.Block; import org.bukkit.block.Block;

8
bukkit/src/main/java/com/gmail/nossr50/listeners/InteractionManager.java
View File

@ -1,9 +1,9 @@
package com.gmail.nossr50.listeners; package com.gmail.nossr50.listeners;
import com.gmail.nossr50.core.datatypes.skills.SubSkillType; import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.core.datatypes.skills.subskills.AbstractSubSkill; import com.gmail.nossr50.core.skills.subskills.AbstractSubSkill;
import com.gmail.nossr50.core.datatypes.skills.subskills.interfaces.InteractType; import com.gmail.nossr50.core.skills.subskills.interfaces.InteractType;
import com.gmail.nossr50.core.datatypes.skills.subskills.interfaces.Interaction; import com.gmail.nossr50.core.skills.subskills.interfaces.Interaction;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import org.bukkit.event.Event; import org.bukkit.event.Event;

20
bukkit/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java
View File

@ -2,19 +2,19 @@ package com.gmail.nossr50.listeners;
import com.gmail.nossr50.core.config.skills.Config; import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.skills.WorldBlacklist; import com.gmail.nossr50.core.config.skills.WorldBlacklist;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.datatypes.skills.SubSkillType; import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.events.fake.FakeBrewEvent; import com.gmail.nossr50.events.fake.FakeBrewEvent;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.runnables.player.PlayerUpdateInventoryTask; import com.gmail.nossr50.core.runnables.player.PlayerUpdateInventoryTask;
import com.gmail.nossr50.skills.alchemy.Alchemy; import com.gmail.nossr50.core.skills.primary.alchemy.Alchemy;
import com.gmail.nossr50.skills.alchemy.AlchemyPotionBrewer; import com.gmail.nossr50.core.skills.primary.alchemy.AlchemyPotionBrewer;
import com.gmail.nossr50.util.ItemUtils; import com.gmail.nossr50.core.util.ItemUtils;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.util.skills.SkillUtils; import com.gmail.nossr50.core.util.skills.SkillUtils;
import com.gmail.nossr50.worldguard.WorldGuardManager; import com.gmail.nossr50.core.worldguard.WorldGuardManager;
import com.gmail.nossr50.worldguard.WorldGuardUtils; import com.gmail.nossr50.core.worldguard.WorldGuardUtils;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;

41
bukkit/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
View File

@ -1,34 +1,35 @@
package com.gmail.nossr50.listeners; package com.gmail.nossr50.listeners;
import com.gmail.nossr50.chat.ChatManager; import com.gmail.nossr50.core.chat.ChatManager;
import com.gmail.nossr50.chat.ChatManagerFactory; import com.gmail.nossr50.core.chat.ChatManagerFactory;
import com.gmail.nossr50.chat.PartyChatManager; import com.gmail.nossr50.core.chat.PartyChatManager;
import com.gmail.nossr50.core.config.skills.Config; import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.skills.WorldBlacklist; import com.gmail.nossr50.core.config.skills.WorldBlacklist;
import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.core.datatypes.chat.ChatMode; import com.gmail.nossr50.core.datatypes.chat.ChatMode;
import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.core.util.*;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.party.ShareHandler; import com.gmail.nossr50.core.party.ShareHandler;
import com.gmail.nossr50.runnables.player.PlayerProfileLoadingTask; import com.gmail.nossr50.core.runnables.player.PlayerProfileLoadingTask;
import com.gmail.nossr50.skills.fishing.FishingManager; import com.gmail.nossr50.core.skills.primary.fishing.FishingManager;
import com.gmail.nossr50.skills.herbalism.HerbalismManager; import com.gmail.nossr50.core.skills.primary.herbalism.HerbalismManager;
import com.gmail.nossr50.skills.mining.MiningManager; import com.gmail.nossr50.core.skills.primary.mining.MiningManager;
import com.gmail.nossr50.skills.repair.Repair; import com.gmail.nossr50.core.skills.primary.repair.Repair;
import com.gmail.nossr50.skills.repair.RepairManager; import com.gmail.nossr50.core.skills.primary.repair.RepairManager;
import com.gmail.nossr50.skills.salvage.Salvage; import com.gmail.nossr50.core.skills.child.salvage.Salvage;
import com.gmail.nossr50.skills.salvage.SalvageManager; import com.gmail.nossr50.core.skills.child.salvage.SalvageManager;
import com.gmail.nossr50.skills.taming.TamingManager; import com.gmail.nossr50.core.skills.primary.taming.TamingManager;
import com.gmail.nossr50.util.*; import com.gmail.nossr50.util.*;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.util.skills.SkillUtils; import com.gmail.nossr50.core.util.skills.SkillUtils;
import com.gmail.nossr50.util.sounds.SoundManager; import com.gmail.nossr50.core.util.sounds.SoundManager;
import com.gmail.nossr50.util.sounds.SoundType; import com.gmail.nossr50.core.util.sounds.SoundType;
import com.gmail.nossr50.worldguard.WorldGuardManager; import com.gmail.nossr50.core.worldguard.WorldGuardManager;
import com.gmail.nossr50.worldguard.WorldGuardUtils; import com.gmail.nossr50.core.worldguard.WorldGuardUtils;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;

8
bukkit/src/main/java/com/gmail/nossr50/listeners/SelfListener.java
View File

@ -4,15 +4,15 @@ import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent; import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent; import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
import com.gmail.nossr50.events.skills.abilities.McMMOPlayerAbilityActivateEvent; import com.gmail.nossr50.events.skills.abilities.McMMOPlayerAbilityActivateEvent;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.util.scoreboards.ScoreboardManager; import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager;
import com.gmail.nossr50.worldguard.WorldGuardManager; import com.gmail.nossr50.core.worldguard.WorldGuardManager;
import com.gmail.nossr50.worldguard.WorldGuardUtils; import com.gmail.nossr50.core.worldguard.WorldGuardUtils;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;

53
bukkit/src/main/java/com/gmail/nossr50/mcMMO.java
View File

@ -12,37 +12,38 @@ import com.gmail.nossr50.core.config.treasure.TreasureConfig;
import com.gmail.nossr50.core.config.skills.*; import com.gmail.nossr50.core.config.skills.*;
import com.gmail.nossr50.core.data.database.DatabaseManager; import com.gmail.nossr50.core.data.database.DatabaseManager;
import com.gmail.nossr50.core.data.database.DatabaseManagerFactory; import com.gmail.nossr50.core.data.database.DatabaseManagerFactory;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.datatypes.skills.subskills.acrobatics.Roll; import com.gmail.nossr50.core.skills.subskills.acrobatics.Roll;
import com.gmail.nossr50.core.util.*;
import com.gmail.nossr50.listeners.*; import com.gmail.nossr50.listeners.*;
import com.gmail.nossr50.party.PartyManager; import com.gmail.nossr50.core.party.PartyManager;
import com.gmail.nossr50.runnables.CheckDateTask; import com.gmail.nossr50.core.runnables.CheckDateTask;
import com.gmail.nossr50.runnables.SaveTimerTask; import com.gmail.nossr50.core.runnables.SaveTimerTask;
import com.gmail.nossr50.runnables.backups.CleanBackupsTask; import com.gmail.nossr50.core.runnables.backups.CleanBackupsTask;
import com.gmail.nossr50.runnables.database.UserPurgeTask; import com.gmail.nossr50.core.runnables.database.UserPurgeTask;
import com.gmail.nossr50.runnables.party.PartyAutoKickTask; import com.gmail.nossr50.core.runnables.party.PartyAutoKickTask;
import com.gmail.nossr50.runnables.player.ClearRegisteredXPGainTask; import com.gmail.nossr50.core.runnables.player.ClearRegisteredXPGainTask;
import com.gmail.nossr50.runnables.player.PlayerProfileLoadingTask; import com.gmail.nossr50.core.runnables.player.PlayerProfileLoadingTask;
import com.gmail.nossr50.runnables.player.PowerLevelUpdatingTask; import com.gmail.nossr50.core.runnables.player.PowerLevelUpdatingTask;
import com.gmail.nossr50.runnables.skills.BleedTimerTask; import com.gmail.nossr50.core.runnables.skills.BleedTimerTask;
import com.gmail.nossr50.skills.alchemy.Alchemy; import com.gmail.nossr50.core.skills.primary.alchemy.Alchemy;
import com.gmail.nossr50.skills.child.ChildConfig; import com.gmail.nossr50.core.skills.child.ChildConfig;
import com.gmail.nossr50.skills.repair.repairables.Repairable; import com.gmail.nossr50.core.skills.primary.repair.repairables.Repairable;
import com.gmail.nossr50.skills.repair.repairables.RepairableManager; import com.gmail.nossr50.core.skills.primary.repair.repairables.RepairableManager;
import com.gmail.nossr50.skills.repair.repairables.SimpleRepairableManager; import com.gmail.nossr50.core.skills.primary.repair.repairables.SimpleRepairableManager;
import com.gmail.nossr50.skills.salvage.salvageables.Salvageable; import com.gmail.nossr50.core.skills.child.salvage.salvageables.Salvageable;
import com.gmail.nossr50.skills.salvage.salvageables.SalvageableManager; import com.gmail.nossr50.core.skills.child.salvage.salvageables.SalvageableManager;
import com.gmail.nossr50.skills.salvage.salvageables.SimpleSalvageableManager; import com.gmail.nossr50.core.skills.child.salvage.salvageables.SimpleSalvageableManager;
import com.gmail.nossr50.util.*; import com.gmail.nossr50.util.*;
import com.gmail.nossr50.core.data.blockmeta.chunkmeta.ChunkManager; import com.gmail.nossr50.core.data.blockmeta.chunkmeta.ChunkManager;
import com.gmail.nossr50.core.data.blockmeta.chunkmeta.ChunkManagerFactory; import com.gmail.nossr50.core.data.blockmeta.chunkmeta.ChunkManagerFactory;
import com.gmail.nossr50.util.commands.CommandRegistrationManager; import com.gmail.nossr50.core.util.commands.CommandRegistrationManager;
import com.gmail.nossr50.util.experience.FormulaManager; import com.gmail.nossr50.core.util.experience.FormulaManager;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.util.scoreboards.ScoreboardManager; import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager;
import com.gmail.nossr50.util.skills.RankUtils; import com.gmail.nossr50.core.util.skills.RankUtils;
import com.gmail.nossr50.util.upgrade.UpgradeManager; import com.gmail.nossr50.core.util.upgrade.UpgradeManager;
import com.gmail.nossr50.worldguard.WorldGuardManager; import com.gmail.nossr50.core.worldguard.WorldGuardManager;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;
import net.shatteredlands.shatt.backup.ZipLibrary; import net.shatteredlands.shatt.backup.ZipLibrary;
import org.bstats.bukkit.Metrics; import org.bstats.bukkit.Metrics;

167
bukkit/src/main/java/com/gmail/nossr50/skills/mining/Mining.java
View File

@ -1,167 +0,0 @@
package com.gmail.nossr50.skills.mining;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.Misc;
import org.bukkit.Material;
import org.bukkit.block.BlockState;
import org.bukkit.inventory.ItemStack;
public class Mining {
/**
* Calculate XP gain for Mining.
*
* @param blockState The {@link BlockState} to check ability activation for
*/
public static int getBlockXp(BlockState blockState) {
int xp = ExperienceConfig.getInstance().getXp(PrimarySkillType.MINING, blockState.getType());
if (xp == 0 && mcMMO.getModManager().isCustomMiningBlock(blockState)) {
xp = mcMMO.getModManager().getBlock(blockState).getXpGain();
}
return xp;
}
/**
* Handle double drops when using Silk Touch.
*
* @param blockState The {@link BlockState} to check ability activation for
*/
protected static void handleSilkTouchDrops(BlockState blockState) {
Material blockType = blockState.getType();
switch (blockType) {
case END_STONE:
case TERRACOTTA:
case CLAY:
case IRON_ORE:
case MOSSY_COBBLESTONE:
case NETHERRACK:
case OBSIDIAN:
case SANDSTONE:
case BLACK_GLAZED_TERRACOTTA:
case BLACK_TERRACOTTA:
case BLUE_GLAZED_TERRACOTTA:
case BLUE_TERRACOTTA:
case BROWN_GLAZED_TERRACOTTA:
case BROWN_TERRACOTTA:
case CYAN_GLAZED_TERRACOTTA:
case CYAN_TERRACOTTA:
case GRAY_GLAZED_TERRACOTTA:
case GRAY_TERRACOTTA:
case GREEN_GLAZED_TERRACOTTA:
case GREEN_TERRACOTTA:
case LIGHT_BLUE_GLAZED_TERRACOTTA:
case LIGHT_BLUE_TERRACOTTA:
case LIGHT_GRAY_GLAZED_TERRACOTTA:
case LIGHT_GRAY_TERRACOTTA:
case LIME_GLAZED_TERRACOTTA:
case LIME_TERRACOTTA:
case MAGENTA_GLAZED_TERRACOTTA:
case MAGENTA_TERRACOTTA:
case ORANGE_GLAZED_TERRACOTTA:
case ORANGE_TERRACOTTA:
case PINK_GLAZED_TERRACOTTA:
case PINK_TERRACOTTA:
case PURPLE_GLAZED_TERRACOTTA:
case PURPLE_TERRACOTTA:
case RED_GLAZED_TERRACOTTA:
case RED_TERRACOTTA:
case WHITE_GLAZED_TERRACOTTA:
case WHITE_TERRACOTTA:
case YELLOW_GLAZED_TERRACOTTA:
case YELLOW_TERRACOTTA:
handleMiningDrops(blockState);
return;
case COAL_ORE:
case DIAMOND_ORE:
case EMERALD_ORE:
case GLOWSTONE:
case LAPIS_ORE:
case PACKED_ICE:
case NETHER_QUARTZ_ORE:
case REDSTONE_ORE:
case STONE:
case PRISMARINE:
Misc.dropItem(Misc.getBlockCenter(blockState), new ItemStack(blockState.getType()));
return;
default:
if (mcMMO.getModManager().isCustomMiningBlock(blockState)) {
Misc.dropItem(Misc.getBlockCenter(blockState), new ItemStack(blockState.getType()));
}
return;
}
}
/**
* Handle double drops from Mining & Blast Mining.
*
* @param blockState The {@link BlockState} to check ability activation for
*/
protected static void handleMiningDrops(BlockState blockState) {
switch (blockState.getType()) {
case COAL_ORE:
case DIAMOND_ORE:
case EMERALD_ORE:
case END_STONE:
case GLOWSTONE:
case GOLD_ORE:
case TERRACOTTA:
case IRON_ORE:
case LAPIS_ORE:
case MOSSY_COBBLESTONE:
case NETHERRACK:
case OBSIDIAN:
case PACKED_ICE:
case REDSTONE_ORE:
case SANDSTONE:
case BLACK_GLAZED_TERRACOTTA:
case BLACK_TERRACOTTA:
case BLUE_GLAZED_TERRACOTTA:
case BLUE_TERRACOTTA:
case BROWN_GLAZED_TERRACOTTA:
case BROWN_TERRACOTTA:
case CYAN_GLAZED_TERRACOTTA:
case CYAN_TERRACOTTA:
case GRAY_GLAZED_TERRACOTTA:
case GRAY_TERRACOTTA:
case GREEN_GLAZED_TERRACOTTA:
case GREEN_TERRACOTTA:
case LIGHT_BLUE_GLAZED_TERRACOTTA:
case LIGHT_BLUE_TERRACOTTA:
case LIGHT_GRAY_GLAZED_TERRACOTTA:
case LIGHT_GRAY_TERRACOTTA:
case LIME_GLAZED_TERRACOTTA:
case LIME_TERRACOTTA:
case MAGENTA_GLAZED_TERRACOTTA:
case MAGENTA_TERRACOTTA:
case ORANGE_GLAZED_TERRACOTTA:
case ORANGE_TERRACOTTA:
case PINK_GLAZED_TERRACOTTA:
case PINK_TERRACOTTA:
case PURPLE_GLAZED_TERRACOTTA:
case PURPLE_TERRACOTTA:
case RED_GLAZED_TERRACOTTA:
case RED_TERRACOTTA:
case WHITE_GLAZED_TERRACOTTA:
case WHITE_TERRACOTTA:
case YELLOW_GLAZED_TERRACOTTA:
case YELLOW_TERRACOTTA:
case STONE:
case NETHER_QUARTZ_ORE:
Misc.dropItems(Misc.getBlockCenter(blockState), blockState.getBlock().getDrops());
return;
default:
if (mcMMO.getModManager().isCustomMiningBlock(blockState)) {
Misc.dropItems(Misc.getBlockCenter(blockState), blockState.getBlock().getDrops());
}
return;
}
}
}

24
bukkit/src/main/java/com/gmail/nossr50/util/MaterialUtils.java
View File

@ -1,24 +0,0 @@
package com.gmail.nossr50.util;
import com.gmail.nossr50.mcMMO;
import org.bukkit.Material;
public final class MaterialUtils {
private MaterialUtils() {}
protected static boolean isOre(Material data) {
switch (data) {
case COAL_ORE:
case DIAMOND_ORE:
case NETHER_QUARTZ_ORE:
case GOLD_ORE:
case IRON_ORE:
case LAPIS_ORE:
case REDSTONE_ORE:
case EMERALD_ORE:
return true;
default:
return mcMMO.getModManager().isCustomOre(data);
}
}
}

4
bukkit/src/main/java/com/gmail/nossr50/api/AbilityAPI.java → core/src/main/java/com/gmail/nossr50/core/api/AbilityAPI.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.api; package com.gmail.nossr50.core.api;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.datatypes.skills.SuperAbilityType; import com.gmail.nossr50.core.skills.SuperAbilityType;
import com.gmail.nossr50.runnables.skills.BleedTimerTask; import com.gmail.nossr50.runnables.skills.BleedTimerTask;
import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.data.UserManager;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;

Some files were not shown because too many files have changed in this diff Show More