EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-01-18 16:35:25 +01:00
Code Issues Projects Releases Wiki Activity

Moving Stuff Around Pt 3

Browse Source
This commit is contained in:
nossr50 2019-02-10 00:31:53 -08:00
parent 83c1dab963
commit d45aac713f
135 changed files with 210 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
package com.gmail.nossr50.commands;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.data.database.FlatfileDatabaseManager;
import com.gmail.nossr50.core.data.database.SQLDatabaseManager;

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

@ -1,7 +1,7 @@
package com.gmail.nossr50.commands;
import com.gmail.nossr50.commands.party.PartySubcommandType;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.mcMMO;

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

@ -1,6 +1,6 @@
package com.gmail.nossr50.commands;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.core.util.commands.CommandUtils;
import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager;

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

@ -1,7 +1,7 @@
package com.gmail.nossr50.commands;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.core.config.skills.AdvancedConfig;
import com.gmail.nossr50.core.config.AdvancedConfig;
import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.core.util.Permissions;
import com.gmail.nossr50.core.util.StringUtils;

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

@ -2,7 +2,7 @@ package com.gmail.nossr50.commands.chat;
import com.gmail.nossr50.core.chat.ChatManager;
import com.gmail.nossr50.core.chat.ChatManagerFactory;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.chat.ChatMode;
import com.gmail.nossr50.core.datatypes.party.PartyFeature;

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

@ -1,7 +1,7 @@
package com.gmail.nossr50.commands.chat;
import com.gmail.nossr50.core.chat.PartyChatManager;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.chat.ChatMode;
import com.gmail.nossr50.core.datatypes.party.Party;

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

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

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

@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.database;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.database.DatabaseManagerFactory;
import com.gmail.nossr50.core.locale.LocaleLoader;
import com.google.common.collect.ImmutableList;

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

@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.hardcore;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.util.Permissions;

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

@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.hardcore;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.util.Permissions;

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

@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.party;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.core.datatypes.party.PartyFeature;

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

@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.party;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;

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

@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.party;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.party.ItemShareType;
import com.gmail.nossr50.core.datatypes.party.Party;

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

@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.party;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.core.datatypes.party.PartyFeature;

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

@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.party.alliance;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.core.datatypes.party.PartyFeature;

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

@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.party.teleport;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.party.PartyTeleportRecord;
import com.gmail.nossr50.core.locale.LocaleLoader;

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

@ -1,7 +1,7 @@
package com.gmail.nossr50.commands.party.teleport;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.skills.WorldBlacklist;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.config.WorldBlacklist;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.core.datatypes.party.PartyFeature;

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

@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.player;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.datatypes.player.PlayerProfile;

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

@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.player;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.locale.LocaleLoader;

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

@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.player;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.locale.LocaleLoader;

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

@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.player;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.core.util.commands.CommandUtils;

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

@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.player;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.locale.LocaleLoader;

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

@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.core.config.skills.AdvancedConfig;
import com.gmail.nossr50.core.config.AdvancedConfig;
import com.gmail.nossr50.core.config.treasure.TreasureConfig;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.locale.LocaleLoader;

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

@ -1,7 +1,7 @@
package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.core.config.skills.AdvancedConfig;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.AdvancedConfig;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.locale.LocaleLoader;

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

@ -1,6 +1,6 @@
package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.core.config.skills.AdvancedConfig;
import com.gmail.nossr50.core.config.AdvancedConfig;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.core.skills.PrimarySkillType;

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

@ -1,9 +1,9 @@
package com.gmail.nossr50.listeners;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.skills.HiddenConfig;
import com.gmail.nossr50.core.config.skills.WorldBlacklist;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.config.HiddenConfig;
import com.gmail.nossr50.core.config.WorldBlacklist;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.skills.PrimarySkillType;

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

@ -1,9 +1,9 @@
package com.gmail.nossr50.listeners;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.core.config.skills.AdvancedConfig;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.skills.WorldBlacklist;
import com.gmail.nossr50.core.config.AdvancedConfig;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.config.WorldBlacklist;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.meta.OldName;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;

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

@ -1,7 +1,7 @@
package com.gmail.nossr50.listeners;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.skills.WorldBlacklist;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.config.WorldBlacklist;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.runnables.player.PlayerUpdateInventoryTask;
import com.gmail.nossr50.core.skills.PrimarySkillType;

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

@ -4,8 +4,8 @@ import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.core.chat.ChatManager;
import com.gmail.nossr50.core.chat.ChatManagerFactory;
import com.gmail.nossr50.core.chat.PartyChatManager;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.skills.WorldBlacklist;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.config.WorldBlacklist;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.chat.ChatMode;
import com.gmail.nossr50.core.datatypes.party.Party;

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

@ -1,7 +1,7 @@
package com.gmail.nossr50.listeners;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;

2
bukkit/src/main/java/com/gmail/nossr50/listeners/WorldListener.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.listeners;
import com.gmail.nossr50.core.config.skills.WorldBlacklist;
import com.gmail.nossr50.core.config.WorldBlacklist;
import com.gmail.nossr50.core.data.blockmeta.conversion.BlockStoreConversionMain;
import com.gmail.nossr50.mcMMO;
import org.bukkit.Chunk;

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

@ -8,7 +8,7 @@ import com.gmail.nossr50.config.mods.ToolConfigManager;
import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
import com.gmail.nossr50.config.skills.repair.RepairConfigManager;
import com.gmail.nossr50.config.skills.salvage.SalvageConfigManager;
import com.gmail.nossr50.core.config.skills.*;
import com.gmail.nossr50.core.config.*;
import com.gmail.nossr50.core.config.treasure.TreasureConfig;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.data.blockmeta.chunkmeta.ChunkManager;

8
core/src/main/java/com/gmail/nossr50/core/api/AbilityAPI.java
View File

@ -2,10 +2,10 @@ package com.gmail.nossr50.core.api;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.mcmmo.entity.Living;
import com.gmail.nossr50.core.mcmmo.entity.Player;
import com.gmail.nossr50.core.runnables.skills.BleedTimerTask;
import com.gmail.nossr50.core.skills.SuperAbilityType;
import com.gmail.nossr50.runnables.skills.BleedTimerTask;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
public final class AbilityAPI {
private AbilityAPI() {
@ -83,7 +83,7 @@ public final class AbilityAPI {
UserManager.getPlayer(player).setAbilityDATS(SuperAbilityType.TREE_FELLER, cooldown);
}
public static boolean isBleeding(LivingEntity entity) {
public static boolean isBleeding(Living entity) {
return BleedTimerTask.isBleeding(entity);
}
}

11
core/src/main/java/com/gmail/nossr50/core/api/ChatAPI.java
View File

@ -1,13 +1,12 @@
package com.gmail.nossr50.core.api;
import com.gmail.nossr50.chat.ChatManager;
import com.gmail.nossr50.chat.ChatManagerFactory;
import com.gmail.nossr50.chat.PartyChatManager;
import com.gmail.nossr50.core.chat.ChatManager;
import com.gmail.nossr50.core.chat.ChatManagerFactory;
import com.gmail.nossr50.core.chat.PartyChatManager;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.chat.ChatMode;
import com.gmail.nossr50.party.PartyManager;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import com.gmail.nossr50.core.mcmmo.entity.Player;
import com.gmail.nossr50.core.party.PartyManager;
public final class ChatAPI {
private ChatAPI() {

12
core/src/main/java/com/gmail/nossr50/core/api/ExperienceAPI.java
View File

@ -1,20 +1,18 @@
package com.gmail.nossr50.core.api;
import com.gmail.nossr50.api.exceptions.*;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.core.api.exceptions.*;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.experience.ExperienceConfig;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.experience.FormulaType;
import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
import com.gmail.nossr50.core.datatypes.experience.XPGainSource;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
import com.gmail.nossr50.core.mcmmo.block.BlockState;
import com.gmail.nossr50.core.mcmmo.entity.Player;
import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.skills.child.FamilyTree;
import org.bukkit.block.BlockState;
import org.bukkit.entity.Player;
import com.gmail.nossr50.core.skills.child.FamilyTree;
import java.util.ArrayList;
import java.util.Set;

2
core/src/main/java/com/gmail/nossr50/core/api/PartyAPI.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.api;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
import com.gmail.nossr50.core.datatypes.party.Party;

4
core/src/main/java/com/gmail/nossr50/core/api/exceptions/McMMOPlayerNotFoundException.java
View File

@ -1,11 +1,11 @@
package com.gmail.nossr50.core.api.exceptions;
import org.bukkit.entity.Player;
import com.gmail.nossr50.core.mcmmo.entity.Player;
public class McMMOPlayerNotFoundException extends RuntimeException {
private static final long serialVersionUID = 761917904993202836L;
public McMMOPlayerNotFoundException(Player player) {
super("McMMOPlayer object was not found for: " + player.getName() + " " + player.getUniqueId());
super("McMMOPlayer object was not found for: " + player.getName() + " " + player.getUUID());
}
}

2
core/src/main/java/com/gmail/nossr50/core/chat/AdminChatManager.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.chat;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
import org.bukkit.plugin.Plugin;

2
core/src/main/java/com/gmail/nossr50/core/chat/PartyChatManager.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.chat;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.core.runnables.party.PartyChatTask;
import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;

2
core/src/main/java/com/gmail/nossr50/core/config/AdvancedConfig.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.core.config.skills;
package com.gmail.nossr50.core.config;
import com.gmail.nossr50.core.mcmmo.interactions.NotificationType;
import com.gmail.nossr50.core.mcmmo.skills.SubSkillType;

2
core/src/main/java/com/gmail/nossr50/core/config/AutoUpdateConfigLoader.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.core.config.skills;
package com.gmail.nossr50.core.config;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;

14
core/src/main/java/com/gmail/nossr50/core/config/Config.java
View File

@ -1,15 +1,11 @@
package com.gmail.nossr50.core.config;
import com.gmail.nossr50.core.data.database.SQLDatabaseManager;
import com.gmail.nossr50.core.mcmmo.MobHealthbarType;
import com.gmail.nossr50.core.mcmmo.party.PartyFeature;
import com.gmail.nossr50.core.mcmmo.skills.PrimarySkillType;
import com.gmail.nossr50.core.mcmmo.skills.SuperAbilityType;
import com.gmail.nossr50.util.StringUtils;
import org.bukkit.Material;
import org.bukkit.block.data.BlockData;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.entity.EntityType;
import com.gmail.nossr50.core.datatypes.party.PartyFeature;
import com.gmail.nossr50.core.skills.MobHealthbarType;
import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.skills.SuperAbilityType;
import com.gmail.nossr50.core.util.StringUtils;
import java.util.ArrayList;
import java.util.List;

2
core/src/main/java/com/gmail/nossr50/core/config/ConfigLoader.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.core.config.skills;
package com.gmail.nossr50.core.config;
import com.gmail.nossr50.mcMMO;
import org.bukkit.configuration.file.FileConfiguration;

2
core/src/main/java/com/gmail/nossr50/core/config/CoreSkillsConfig.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.core.config.skills;
package com.gmail.nossr50.core.config;
import com.gmail.nossr50.core.mcmmo.skills.PrimarySkillType;
import com.gmail.nossr50.core.mcmmo.skills.subskills.AbstractSubSkill;

2
core/src/main/java/com/gmail/nossr50/core/config/HiddenConfig.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.core.config.skills;
package com.gmail.nossr50.core.config;
import com.gmail.nossr50.mcMMO;
import org.bukkit.configuration.file.YamlConfiguration;

2
core/src/main/java/com/gmail/nossr50/core/config/RankConfig.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.core.config.skills;
package com.gmail.nossr50.core.config;
import com.gmail.nossr50.core.mcmmo.skills.SubSkillType;
import com.gmail.nossr50.core.mcmmo.skills.subskills.AbstractSubSkill;

2
core/src/main/java/com/gmail/nossr50/core/config/SoundConfig.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.core.config.skills;
package com.gmail.nossr50.core.config;
import com.gmail.nossr50.util.sounds.SoundType;

2
core/src/main/java/com/gmail/nossr50/core/config/WorldBlacklist.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.core.config.skills;
package com.gmail.nossr50.core.config;
import com.gmail.nossr50.mcMMO;
import org.bukkit.World;

2
core/src/main/java/com/gmail/nossr50/core/config/experience/ExperienceConfig.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.config.experience;
import com.gmail.nossr50.core.config.skills.AutoUpdateConfigLoader;
import com.gmail.nossr50.core.config.AutoUpdateConfigLoader;
import com.gmail.nossr50.core.mcmmo.experience.FormulaType;
import com.gmail.nossr50.core.mcmmo.skills.MaterialType;
import com.gmail.nossr50.core.mcmmo.skills.PrimarySkillType;

2
core/src/main/java/com/gmail/nossr50/core/config/mods/CustomArmorConfig.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.config.mods;
import com.gmail.nossr50.core.config.skills.ConfigLoader;
import com.gmail.nossr50.core.config.ConfigLoader;
import com.gmail.nossr50.core.mcmmo.skills.ItemType;
import com.gmail.nossr50.core.mcmmo.skills.MaterialType;
import com.gmail.nossr50.skills.repair.repairables.Repairable;

2
core/src/main/java/com/gmail/nossr50/core/config/mods/CustomBlockConfig.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.config.mods;
import com.gmail.nossr50.core.config.skills.ConfigLoader;
import com.gmail.nossr50.core.config.ConfigLoader;
import com.gmail.nossr50.core.mcmmo.mods.CustomBlock;
import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection;

2
core/src/main/java/com/gmail/nossr50/core/config/mods/CustomEntityConfig.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.config.mods;
import com.gmail.nossr50.core.config.skills.ConfigLoader;
import com.gmail.nossr50.core.config.ConfigLoader;
import com.gmail.nossr50.core.mcmmo.mods.CustomEntity;
import org.apache.commons.lang.ClassUtils;
import org.bukkit.Material;

2
core/src/main/java/com/gmail/nossr50/core/config/mods/CustomToolConfig.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.config.mods;
import com.gmail.nossr50.core.config.skills.ConfigLoader;
import com.gmail.nossr50.core.config.ConfigLoader;
import com.gmail.nossr50.core.mcmmo.mods.CustomTool;
import com.gmail.nossr50.core.mcmmo.skills.ItemType;
import com.gmail.nossr50.core.mcmmo.skills.MaterialType;

2
core/src/main/java/com/gmail/nossr50/core/config/party/ItemWeightConfig.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.config.party;
import com.gmail.nossr50.core.config.skills.ConfigLoader;
import com.gmail.nossr50.core.config.ConfigLoader;
import com.gmail.nossr50.util.StringUtils;
import org.bukkit.Material;

2
core/src/main/java/com/gmail/nossr50/core/config/treasure/TreasureConfig.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.config.treasure;
import com.gmail.nossr50.core.config.skills.ConfigLoader;
import com.gmail.nossr50.core.config.ConfigLoader;
import com.gmail.nossr50.util.EnchantmentUtils;
import com.gmail.nossr50.util.StringUtils;
import org.bukkit.ChatColor;

8
core/src/main/java/com/gmail/nossr50/core/data/UserManager.java
View File

@ -1,12 +1,8 @@
package com.gmail.nossr50.core.data;
import com.gmail.nossr50.core.mcmmo.player.McMMOPlayer;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.mcmmo.entity.Player;
import com.google.common.collect.ImmutableList;
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.metadata.FixedMetadataValue;
import java.util.ArrayList;
import java.util.Collection;

2
core/src/main/java/com/gmail/nossr50/core/data/blockmeta/ChunkletManagerFactory.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.data.blockmeta;
import com.gmail.nossr50.core.config.skills.HiddenConfig;
import com.gmail.nossr50.core.config.HiddenConfig;
public class ChunkletManagerFactory {
public static ChunkletManager getChunkletManager() {

2
core/src/main/java/com/gmail/nossr50/core/data/blockmeta/chunkmeta/ChunkManagerFactory.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.data.blockmeta.chunkmeta;
import com.gmail.nossr50.core.config.skills.HiddenConfig;
import com.gmail.nossr50.core.config.HiddenConfig;
public class ChunkManagerFactory {
public static ChunkManager getChunkManager() {

2
core/src/main/java/com/gmail/nossr50/core/data/blockmeta/conversion/BlockStoreConversionMain.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.data.blockmeta.conversion;
import com.gmail.nossr50.core.config.skills.HiddenConfig;
import com.gmail.nossr50.core.config.HiddenConfig;
import com.gmail.nossr50.mcMMO;
import org.bukkit.scheduler.BukkitScheduler;

2
core/src/main/java/com/gmail/nossr50/core/data/blockmeta/conversion/BlockStoreConversionXDirectory.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.data.blockmeta.conversion;
import com.gmail.nossr50.core.config.skills.HiddenConfig;
import com.gmail.nossr50.core.config.HiddenConfig;
import com.gmail.nossr50.mcMMO;
import org.bukkit.scheduler.BukkitScheduler;

2
core/src/main/java/com/gmail/nossr50/core/datatypes/party/Party.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.core.datatypes.party;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.datatypes.experience.FormulaType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO;

2
core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyFeature.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.core.datatypes.party;
import com.gmail.nossr50.commands.party.PartySubcommandType;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.StringUtils;

2
core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyTeleportRecord.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.datatypes.party;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.util.Misc;
import org.bukkit.entity.Player;

6
core/src/main/java/com/gmail/nossr50/core/datatypes/player/McMMOPlayer.java
View File

@ -1,9 +1,9 @@
package com.gmail.nossr50.core.datatypes.player;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.core.config.skills.AdvancedConfig;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.skills.WorldBlacklist;
import com.gmail.nossr50.core.config.AdvancedConfig;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.config.WorldBlacklist;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.chat.ChatMode;
import com.gmail.nossr50.core.datatypes.experience.XPGainReason;

4
core/src/main/java/com/gmail/nossr50/core/datatypes/player/PlayerProfile.java
View File

@ -1,8 +1,8 @@
package com.gmail.nossr50.core.datatypes.player;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.core.config.skills.AdvancedConfig;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.AdvancedConfig;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.experience.FormulaType;
import com.gmail.nossr50.core.datatypes.experience.SkillXpGain;

2
core/src/main/java/com/gmail/nossr50/core/locale/LocaleLoader.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.locale;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.mcMMO;
import org.bukkit.ChatColor;

8
core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Living.java
View File

@ -3,7 +3,7 @@ package com.gmail.nossr50.core.mcmmo.entity;
/**
* Living means you can die, you have health, and you can be damaged
*/
public interface Living {
public interface Living extends Entity {
/**
* Whether or not this entity is still alive
*
@ -34,4 +34,10 @@ public interface Living {
* @param damage the damage to deal to this entity
*/
void damage(Entity source, int damage);
/**
* Whether or not this entity still exists
* @return true if valid
*/
Boolean isValid();
}

2
core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Player.java
View File

@ -3,6 +3,8 @@ package com.gmail.nossr50.core.mcmmo.entity;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.mcmmo.Nameable;
import java.util.UUID;
/**
* Players
*/

2
core/src/main/java/com/gmail/nossr50/core/party/PartyManager.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.party;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.chat.ChatMode;
import com.gmail.nossr50.core.datatypes.database.UpgradeType;

2
core/src/main/java/com/gmail/nossr50/core/party/ShareHandler.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.core.party;
import com.gmail.nossr50.config.party.ItemWeightConfig;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
import com.gmail.nossr50.core.datatypes.experience.XPGainSource;

2
core/src/main/java/com/gmail/nossr50/core/runnables/backups/CleanBackupsTask.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.runnables.backups;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.mcMMO;
import org.bukkit.scheduler.BukkitRunnable;

2
core/src/main/java/com/gmail/nossr50/core/runnables/commands/McrankCommandDisplayTask.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.runnables.commands;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.mcMMO;

2
core/src/main/java/com/gmail/nossr50/core/runnables/commands/MctopCommandDisplayTask.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.runnables.commands;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.datatypes.database.PlayerStat;
import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.core.skills.PrimarySkillType;

2
core/src/main/java/com/gmail/nossr50/core/runnables/database/UUIDUpdateAsyncTask.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.runnables.database;
import com.gmail.nossr50.core.config.skills.HiddenConfig;
import com.gmail.nossr50.core.config.HiddenConfig;
import com.gmail.nossr50.core.data.database.DatabaseManager;
import com.gmail.nossr50.core.datatypes.database.UpgradeType;
import com.gmail.nossr50.mcMMO;

2
core/src/main/java/com/gmail/nossr50/core/runnables/database/UserPurgeTask.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.runnables.database;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.mcMMO;
import org.bukkit.scheduler.BukkitRunnable;

2
core/src/main/java/com/gmail/nossr50/core/runnables/items/ChimaeraWingWarmup.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.runnables.items;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.util.ChimaeraWing;

2
core/src/main/java/com/gmail/nossr50/core/runnables/items/TeleportationWarmup.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.runnables.items;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.locale.LocaleLoader;
import com.gmail.nossr50.party.PartyManager;

2
core/src/main/java/com/gmail/nossr50/core/runnables/party/PartyAutoKickTask.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.runnables.party;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.party.PartyManager;

2
core/src/main/java/com/gmail/nossr50/core/runnables/party/PartyChatTask.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.runnables.party;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.datatypes.party.Party;
import com.gmail.nossr50.core.locale.LocaleLoader;
import org.bukkit.ChatColor;

2
core/src/main/java/com/gmail/nossr50/core/runnables/player/PlayerProfileLoadingTask.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.runnables.player;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.datatypes.player.PlayerProfile;

2
core/src/main/java/com/gmail/nossr50/core/runnables/skills/AbilityDisableTask.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.runnables.skills;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.skills.SuperAbilityType;

9
core/src/main/java/com/gmail/nossr50/core/runnables/skills/BleedContainer.java
View File

@ -1,14 +1,15 @@
package com.gmail.nossr50.core.runnables.skills;
import org.bukkit.entity.LivingEntity;
import com.gmail.nossr50.core.mcmmo.entity.Living;
public class BleedContainer {
public int bleedTicks;
public int bleedRank;
public LivingEntity target;
public LivingEntity damageSource;
public Living target;
public Living damageSource;
public BleedContainer(LivingEntity target, int bleedTicks, int bleedRank, LivingEntity damageSource) {
public BleedContainer(Living target, int bleedTicks, int bleedRank, Living damageSource) {
this.target = target;
this.bleedTicks = bleedTicks;
this.bleedRank = bleedRank;

47
core/src/main/java/com/gmail/nossr50/core/runnables/skills/BleedTimerTask.java
View File

@ -1,29 +1,28 @@
package com.gmail.nossr50.core.runnables.skills;
import com.gmail.nossr50.core.config.skills.AdvancedConfig;
import com.gmail.nossr50.core.config.AdvancedConfig;
import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.MobHealthbarUtils;
import com.gmail.nossr50.util.player.NotificationManager;
import com.gmail.nossr50.util.skills.CombatUtils;
import com.gmail.nossr50.util.skills.ParticleEffectUtils;
import com.gmail.nossr50.util.sounds.SoundManager;
import com.gmail.nossr50.util.sounds.SoundType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;
import com.gmail.nossr50.core.mcmmo.entity.Living;
import com.gmail.nossr50.core.mcmmo.entity.Player;
import com.gmail.nossr50.core.util.MobHealthbarUtils;
import com.gmail.nossr50.core.util.player.NotificationManager;
import com.gmail.nossr50.core.util.skills.CombatUtils;
import com.gmail.nossr50.core.util.skills.ParticleEffectUtils;
import com.gmail.nossr50.core.util.sounds.SoundManager;
import com.gmail.nossr50.core.util.sounds.SoundType;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
public class BleedTimerTask extends BukkitRunnable {
private static Map<LivingEntity, BleedContainer> bleedList = new HashMap<LivingEntity, BleedContainer>();
private static Map<UUID, BleedContainer> bleedList = new HashMap<UUID, BleedContainer>();
public static BleedContainer copyContainer(BleedContainer container) {
LivingEntity target = container.target;
LivingEntity source = container.damageSource;
Living target = container.target;
Living source = container.damageSource;
int bleedTicks = container.bleedTicks;
int bleedRank = container.bleedRank;
@ -32,11 +31,11 @@ public class BleedTimerTask extends BukkitRunnable {
}
/**
* Instantly Bleed out a LivingEntity
* Instantly Bleed out a Living
*
* @param entity LivingEntity to bleed out
* @param entity Living to bleed out
*/
public static void bleedOut(LivingEntity entity) {
public static void bleedOut(Living entity) {
/*
* Don't remove anything from the list outside of run()
*/
@ -47,27 +46,27 @@ public class BleedTimerTask extends BukkitRunnable {
}
/**
* Add a LivingEntity to the bleedList if it is not in it.
* Add a Living to the bleedList if it is not in it.
*
* @param entity LivingEntity to add
* @param entity Living to add
* @param ticks Number of bleeding ticks
*/
public static void add(LivingEntity entity, LivingEntity attacker, int ticks, int bleedRank) {
public static void add(Living entity, Living attacker, int ticks, int bleedRank) {
BleedContainer newBleedContainer = new BleedContainer(entity, ticks, bleedRank, attacker);
bleedList.put(entity, newBleedContainer);
}
public static boolean isBleeding(LivingEntity entity) {
public static boolean isBleeding(Living entity) {
return bleedList.containsKey(entity);
}
@Override
public void run() {
Iterator<Entry<LivingEntity, BleedContainer>> bleedIterator = bleedList.entrySet().iterator();
Iterator<Entry<Living, BleedContainer>> bleedIterator = bleedList.entrySet().iterator();
while (bleedIterator.hasNext()) {
Entry<LivingEntity, BleedContainer> containerEntry = bleedIterator.next();
LivingEntity target = containerEntry.getKey();
Entry<Living, BleedContainer> containerEntry = bleedIterator.next();
Living target = containerEntry.getKey();
int bleedTicks = containerEntry.getValue().bleedTicks;

2
core/src/main/java/com/gmail/nossr50/core/runnables/skills/ToolLowerTask.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.runnables.skills;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.skills.ToolType;

2
core/src/main/java/com/gmail/nossr50/core/skills/PrimarySkillType.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.core.skills;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.skills.acrobatics.AcrobaticsManager;

2
core/src/main/java/com/gmail/nossr50/core/skills/SuperAbilityType.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.skills;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.util.BlockUtils;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.StringUtils;

2
core/src/main/java/com/gmail/nossr50/core/skills/child/ChildConfig.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.skills.child;
import com.gmail.nossr50.core.config.skills.AutoUpdateConfigLoader;
import com.gmail.nossr50.core.config.AutoUpdateConfigLoader;
import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.util.StringUtils;
import org.bukkit.configuration.file.YamlConfiguration;

4
core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/Salvage.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.core.skills.child.salvage;
import com.gmail.nossr50.core.config.skills.AdvancedConfig;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.AdvancedConfig;
import com.gmail.nossr50.core.config.Config;
import org.bukkit.Material;
public class Salvage {

4
core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/SalvageManager.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.core.skills.child.salvage;
import com.gmail.nossr50.core.config.skills.AdvancedConfig;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.AdvancedConfig;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.locale.LocaleLoader;

2
core/src/main/java/com/gmail/nossr50/core/skills/child/smelting/Smelting.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.core.skills.child.smelting;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.core.config.skills.AdvancedConfig;
import com.gmail.nossr50.core.config.AdvancedConfig;
import com.gmail.nossr50.core.skills.PrimarySkillType;
import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.mcMMO;

2
core/src/main/java/com/gmail/nossr50/core/skills/child/smelting/SmeltingManager.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.skills.child.smelting;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
import com.gmail.nossr50.core.datatypes.experience.XPGainSource;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;

4
core/src/main/java/com/gmail/nossr50/core/skills/primary/acrobatics/Acrobatics.java
View File

@ -1,8 +1,8 @@
package com.gmail.nossr50.core.skills.primary.acrobatics;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.core.config.skills.AdvancedConfig;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.AdvancedConfig;
import com.gmail.nossr50.core.config.Config;
public final class Acrobatics {
public static double dodgeDamageModifier = AdvancedConfig.getInstance().getDodgeDamageModifier();

2
core/src/main/java/com/gmail/nossr50/core/skills/primary/alchemy/Alchemy.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.skills.primary.alchemy;
import com.gmail.nossr50.core.config.skills.AdvancedConfig;
import com.gmail.nossr50.core.config.AdvancedConfig;
import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.runnables.skills.AlchemyBrewTask;

2
core/src/main/java/com/gmail/nossr50/core/skills/primary/archery/Archery.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.core.skills.primary.archery;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.core.config.skills.AdvancedConfig;
import com.gmail.nossr50.core.config.AdvancedConfig;
import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.skills.RankUtils;

2
core/src/main/java/com/gmail/nossr50/core/skills/primary/axes/Axes.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.skills.primary.axes;
import com.gmail.nossr50.core.config.skills.AdvancedConfig;
import com.gmail.nossr50.core.config.AdvancedConfig;
import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.util.ItemUtils;
import com.gmail.nossr50.util.skills.RankUtils;

2
core/src/main/java/com/gmail/nossr50/core/skills/primary/excavation/ExcavationManager.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.skills.primary.excavation;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.core.skills.PrimarySkillType;

2
core/src/main/java/com/gmail/nossr50/core/skills/primary/fishing/Fishing.java
View File

@ -1,6 +1,6 @@
package com.gmail.nossr50.core.skills.primary.fishing;
import com.gmail.nossr50.core.config.skills.AdvancedConfig;
import com.gmail.nossr50.core.config.AdvancedConfig;
import com.gmail.nossr50.core.config.treasure.TreasureConfig;
import com.gmail.nossr50.core.skills.treasure.ShakeTreasure;
import com.gmail.nossr50.util.Misc;

4
core/src/main/java/com/gmail/nossr50/core/skills/primary/fishing/FishingManager.java
View File

@ -1,8 +1,8 @@
package com.gmail.nossr50.core.skills.primary.fishing;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.core.config.skills.AdvancedConfig;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.AdvancedConfig;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.config.treasure.TreasureConfig;
import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
import com.gmail.nossr50.core.datatypes.interactions.NotificationType;

2
core/src/main/java/com/gmail/nossr50/core/skills/primary/herbalism/HerbalismManager.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.core.skills.primary.herbalism;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.config.treasure.TreasureConfig;
import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
import com.gmail.nossr50.core.datatypes.interactions.NotificationType;

4
core/src/main/java/com/gmail/nossr50/core/skills/primary/mining/BlastMining.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.core.skills.primary.mining;
import com.gmail.nossr50.core.config.skills.AdvancedConfig;
import com.gmail.nossr50.core.config.skills.Config;
import com.gmail.nossr50.core.config.AdvancedConfig;
import com.gmail.nossr50.core.config.Config;
import com.gmail.nossr50.core.data.UserManager;
import com.gmail.nossr50.core.skills.SubSkillType;
import com.gmail.nossr50.mcMMO;

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