diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Bridge.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Bridge.java index 51ce35c65..1a854c66d 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Bridge.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Bridge.java @@ -18,8 +18,8 @@ import com.djrapitops.pluginbridge.plan.superbvote.SuperbVoteHook; import com.djrapitops.pluginbridge.plan.towny.TownyHook; import com.djrapitops.pluginbridge.plan.vault.VaultHook; import com.djrapitops.pluginbridge.plan.viaversion.ViaVersionHook; -import main.java.com.djrapitops.plan.Settings; -import main.java.com.djrapitops.plan.data.additional.HookHandler; +import main.java.com.djrapitops.plan.data.plugin.HookHandler; +import main.java.com.djrapitops.plan.settings.Settings; /** * Manages connection to other plugins. diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Hook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Hook.java index 6eb17d5d8..3dbd3de20 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Hook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Hook.java @@ -1,7 +1,7 @@ package com.djrapitops.pluginbridge.plan; -import main.java.com.djrapitops.plan.data.additional.HookHandler; -import main.java.com.djrapitops.plan.data.additional.PluginData; +import main.java.com.djrapitops.plan.data.plugin.HookHandler; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import org.bukkit.plugin.java.JavaPlugin; import static org.bukkit.plugin.java.JavaPlugin.getPlugin; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/AdvancedAntiCheatData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/AdvancedAntiCheatData.java index b2677c525..60214db61 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/AdvancedAntiCheatData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/AdvancedAntiCheatData.java @@ -5,7 +5,11 @@ package com.djrapitops.pluginbridge.plan.aac; import com.djrapitops.plugin.utilities.Format; -import main.java.com.djrapitops.plan.data.additional.*; +import main.java.com.djrapitops.plan.data.element.AnalysisContainer; +import main.java.com.djrapitops.plan.data.element.InspectContainer; +import main.java.com.djrapitops.plan.data.element.TableContainer; +import main.java.com.djrapitops.plan.data.plugin.ContainerSize; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import main.java.com.djrapitops.plan.utilities.FormatUtils; import java.util.Collection; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/AdvancedAntiCheatHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/AdvancedAntiCheatHook.java index bd7e5deba..7243c898f 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/AdvancedAntiCheatHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/AdvancedAntiCheatHook.java @@ -8,7 +8,7 @@ import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.pluginbridge.plan.Hook; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -import main.java.com.djrapitops.plan.data.additional.HookHandler; +import main.java.com.djrapitops.plan.data.plugin.HookHandler; import main.java.com.djrapitops.plan.database.databases.SQLDB; /** diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsData.java index a92b55f50..32d0f5865 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsData.java @@ -6,10 +6,10 @@ package com.djrapitops.pluginbridge.plan.advancedachievements; import com.djrapitops.plugin.api.TimeAmount; import com.hm.achievement.api.AdvancedAchievementsAPI; -import main.java.com.djrapitops.plan.data.additional.AnalysisContainer; -import main.java.com.djrapitops.plan.data.additional.ContainerSize; -import main.java.com.djrapitops.plan.data.additional.InspectContainer; -import main.java.com.djrapitops.plan.data.additional.PluginData; +import main.java.com.djrapitops.plan.data.element.AnalysisContainer; +import main.java.com.djrapitops.plan.data.element.InspectContainer; +import main.java.com.djrapitops.plan.data.plugin.ContainerSize; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.MiscUtils; import main.java.com.djrapitops.plan.utilities.analysis.MathUtils; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsHook.java index 6909e4d59..2fbb27e06 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsHook.java @@ -5,7 +5,7 @@ import com.hm.achievement.AdvancedAchievements; import com.hm.achievement.api.AdvancedAchievementsAPI; import com.hm.achievement.api.AdvancedAchievementsBukkitAPI; import main.java.com.djrapitops.plan.api.API; -import main.java.com.djrapitops.plan.data.additional.HookHandler; +import main.java.com.djrapitops.plan.data.plugin.HookHandler; import static org.bukkit.plugin.java.JavaPlugin.getPlugin; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockData.java index ee97d9ec1..bf3c615ca 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockData.java @@ -5,10 +5,10 @@ package com.djrapitops.pluginbridge.plan.askyblock; import com.wasteofplastic.askyblock.ASkyBlockAPI; -import main.java.com.djrapitops.plan.data.additional.AnalysisContainer; -import main.java.com.djrapitops.plan.data.additional.ContainerSize; -import main.java.com.djrapitops.plan.data.additional.InspectContainer; -import main.java.com.djrapitops.plan.data.additional.PluginData; +import main.java.com.djrapitops.plan.data.element.AnalysisContainer; +import main.java.com.djrapitops.plan.data.element.InspectContainer; +import main.java.com.djrapitops.plan.data.plugin.ContainerSize; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import java.util.Collection; import java.util.UUID; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockHook.java index 1806d3f96..aadd1a465 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockHook.java @@ -3,7 +3,7 @@ package com.djrapitops.pluginbridge.plan.askyblock; import com.djrapitops.pluginbridge.plan.Hook; import com.wasteofplastic.askyblock.ASkyBlockAPI; import main.java.com.djrapitops.plan.api.API; -import main.java.com.djrapitops.plan.data.additional.HookHandler; +import main.java.com.djrapitops.plan.data.plugin.HookHandler; /** * A Class responsible for hooking to ASkyBlock and registering data sources. diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/banmanager/BanManagerData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/banmanager/BanManagerData.java index 338b9e184..686af5949 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/banmanager/BanManagerData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/banmanager/BanManagerData.java @@ -5,7 +5,11 @@ package com.djrapitops.pluginbridge.plan.banmanager; import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.additional.*; +import main.java.com.djrapitops.plan.data.element.AnalysisContainer; +import main.java.com.djrapitops.plan.data.element.InspectContainer; +import main.java.com.djrapitops.plan.data.plugin.BanData; +import main.java.com.djrapitops.plan.data.plugin.ContainerSize; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.html.Html; import me.confuser.banmanager.BmAPI; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/banmanager/BanManagerHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/banmanager/BanManagerHook.java index 33b9bd431..a435a2c7d 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/banmanager/BanManagerHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/banmanager/BanManagerHook.java @@ -5,7 +5,7 @@ package com.djrapitops.pluginbridge.plan.banmanager; import com.djrapitops.pluginbridge.plan.Hook; -import main.java.com.djrapitops.plan.data.additional.HookHandler; +import main.java.com.djrapitops.plan.data.plugin.HookHandler; /** * Hook for BanManager plugin. diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/essentials/EssentialsData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/essentials/EssentialsData.java index 0ea454143..6de37aa98 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/essentials/EssentialsData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/essentials/EssentialsData.java @@ -7,7 +7,11 @@ package com.djrapitops.pluginbridge.plan.essentials; import com.earth2me.essentials.Essentials; import com.earth2me.essentials.User; import com.earth2me.essentials.UserMap; -import main.java.com.djrapitops.plan.data.additional.*; +import main.java.com.djrapitops.plan.data.element.AnalysisContainer; +import main.java.com.djrapitops.plan.data.element.InspectContainer; +import main.java.com.djrapitops.plan.data.element.TableContainer; +import main.java.com.djrapitops.plan.data.plugin.ContainerSize; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import java.util.*; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/essentials/EssentialsHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/essentials/EssentialsHook.java index 7fb4dabff..8b4564e1c 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/essentials/EssentialsHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/essentials/EssentialsHook.java @@ -1,9 +1,9 @@ package com.djrapitops.pluginbridge.plan.essentials; -import main.java.com.djrapitops.plan.data.additional.HookHandler; import com.djrapitops.pluginbridge.plan.Hook; import com.earth2me.essentials.Essentials; import main.java.com.djrapitops.plan.api.API; +import main.java.com.djrapitops.plan.data.plugin.HookHandler; import static org.bukkit.plugin.java.JavaPlugin.getPlugin; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionAccordionCreator.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionAccordionCreator.java index 7898f957c..214e61f89 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionAccordionCreator.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionAccordionCreator.java @@ -9,7 +9,7 @@ import com.massivecraft.factions.entity.MPlayer; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.data.PlayerProfile; import main.java.com.djrapitops.plan.data.ServerProfile; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.Session; import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.analysis.Analysis; import main.java.com.djrapitops.plan.utilities.html.HtmlStructure; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionsData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionsData.java index 123884713..7cb420ec9 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionsData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionsData.java @@ -8,11 +8,11 @@ import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.factions.entity.MPlayer; import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.Settings; -import main.java.com.djrapitops.plan.data.additional.AnalysisContainer; -import main.java.com.djrapitops.plan.data.additional.ContainerSize; -import main.java.com.djrapitops.plan.data.additional.InspectContainer; -import main.java.com.djrapitops.plan.data.additional.PluginData; +import main.java.com.djrapitops.plan.data.element.AnalysisContainer; +import main.java.com.djrapitops.plan.data.element.InspectContainer; +import main.java.com.djrapitops.plan.data.plugin.ContainerSize; +import main.java.com.djrapitops.plan.data.plugin.PluginData; +import main.java.com.djrapitops.plan.settings.Settings; import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.html.Html; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionsHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionsHook.java index a052aae16..a56c64a36 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionsHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionsHook.java @@ -2,7 +2,7 @@ package com.djrapitops.pluginbridge.plan.factions; import com.djrapitops.pluginbridge.plan.Hook; import main.java.com.djrapitops.plan.api.API; -import main.java.com.djrapitops.plan.data.additional.HookHandler; +import main.java.com.djrapitops.plan.data.plugin.HookHandler; /** * A Class responsible for hooking to Factions and registering 4 data sources. diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionData.java index ac36cd0d4..dc66df80a 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionData.java @@ -5,7 +5,11 @@ package com.djrapitops.pluginbridge.plan.griefprevention; import com.djrapitops.plugin.utilities.FormatUtils; -import main.java.com.djrapitops.plan.data.additional.*; +import main.java.com.djrapitops.plan.data.element.AnalysisContainer; +import main.java.com.djrapitops.plan.data.element.InspectContainer; +import main.java.com.djrapitops.plan.data.element.TableContainer; +import main.java.com.djrapitops.plan.data.plugin.ContainerSize; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import main.java.com.djrapitops.plan.utilities.analysis.MathUtils; import me.ryanhamshire.GriefPrevention.Claim; import me.ryanhamshire.GriefPrevention.DataStore; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionHook.java index 3fd6129e7..3a82a5203 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionHook.java @@ -2,7 +2,7 @@ package com.djrapitops.pluginbridge.plan.griefprevention; import com.djrapitops.pluginbridge.plan.Hook; import main.java.com.djrapitops.plan.api.API; -import main.java.com.djrapitops.plan.data.additional.HookHandler; +import main.java.com.djrapitops.plan.data.plugin.HookHandler; import me.ryanhamshire.GriefPrevention.DataStore; import me.ryanhamshire.GriefPrevention.GriefPrevention; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsData.java index 3ef1f1ea7..f3a72e99c 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsData.java @@ -6,7 +6,11 @@ package com.djrapitops.pluginbridge.plan.jobs; import com.gamingmesh.jobs.Jobs; import com.gamingmesh.jobs.dao.JobsDAOData; -import main.java.com.djrapitops.plan.data.additional.*; +import main.java.com.djrapitops.plan.data.element.AnalysisContainer; +import main.java.com.djrapitops.plan.data.element.InspectContainer; +import main.java.com.djrapitops.plan.data.element.TableContainer; +import main.java.com.djrapitops.plan.data.plugin.ContainerSize; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.analysis.MathUtils; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsHook.java index aa9b525e1..7b8b1c3f2 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsHook.java @@ -2,7 +2,7 @@ package com.djrapitops.pluginbridge.plan.jobs; import com.djrapitops.pluginbridge.plan.Hook; import main.java.com.djrapitops.plan.api.API; -import main.java.com.djrapitops.plan.data.additional.HookHandler; +import main.java.com.djrapitops.plan.data.plugin.HookHandler; /** * A Class responsible for hooking to Jobs and registering data sources. diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomAccordionCreator.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomAccordionCreator.java index b1d24513e..eaceae865 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomAccordionCreator.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomAccordionCreator.java @@ -6,7 +6,7 @@ package com.djrapitops.pluginbridge.plan.kingdoms; import main.java.com.djrapitops.plan.data.PlayerProfile; import main.java.com.djrapitops.plan.data.ServerProfile; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.Session; import main.java.com.djrapitops.plan.utilities.analysis.Analysis; import main.java.com.djrapitops.plan.utilities.html.HtmlStructure; import org.kingdoms.constants.kingdom.OfflineKingdom; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomsData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomsData.java index f20392c97..8bcebc6b3 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomsData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomsData.java @@ -5,10 +5,10 @@ package com.djrapitops.pluginbridge.plan.kingdoms; import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.additional.AnalysisContainer; -import main.java.com.djrapitops.plan.data.additional.ContainerSize; -import main.java.com.djrapitops.plan.data.additional.InspectContainer; -import main.java.com.djrapitops.plan.data.additional.PluginData; +import main.java.com.djrapitops.plan.data.element.AnalysisContainer; +import main.java.com.djrapitops.plan.data.element.InspectContainer; +import main.java.com.djrapitops.plan.data.plugin.ContainerSize; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import main.java.com.djrapitops.plan.utilities.html.Html; import org.kingdoms.constants.kingdom.OfflineKingdom; import org.kingdoms.constants.player.OfflineKingdomPlayer; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomsHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomsHook.java index 5a571a073..d2344bd73 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomsHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomsHook.java @@ -5,7 +5,7 @@ package com.djrapitops.pluginbridge.plan.kingdoms; import com.djrapitops.pluginbridge.plan.Hook; -import main.java.com.djrapitops.plan.data.additional.HookHandler; +import main.java.com.djrapitops.plan.data.plugin.HookHandler; /** * Hook for Kingdoms and Kingdoms+ plugins. diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansData.java index e60b23081..750596222 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansData.java @@ -6,7 +6,12 @@ package com.djrapitops.pluginbridge.plan.litebans; import com.djrapitops.plugin.api.utility.log.Log; import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.additional.*; +import main.java.com.djrapitops.plan.data.element.AnalysisContainer; +import main.java.com.djrapitops.plan.data.element.InspectContainer; +import main.java.com.djrapitops.plan.data.element.TableContainer; +import main.java.com.djrapitops.plan.data.plugin.BanData; +import main.java.com.djrapitops.plan.data.plugin.ContainerSize; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.html.Html; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansHook.java index a1998ad5f..a52eda276 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansHook.java @@ -3,7 +3,7 @@ package com.djrapitops.pluginbridge.plan.litebans; import com.djrapitops.pluginbridge.plan.Hook; import litebans.api.Database; import main.java.com.djrapitops.plan.api.API; -import main.java.com.djrapitops.plan.data.additional.HookHandler; +import main.java.com.djrapitops.plan.data.plugin.HookHandler; /** * A Class responsible for hooking to LiteBans and registering data diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/mcmmo/McMmoData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/mcmmo/McMmoData.java index 79f58a876..ba007445e 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/mcmmo/McMmoData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/mcmmo/McMmoData.java @@ -10,7 +10,11 @@ import com.gmail.nossr50.datatypes.player.PlayerProfile; import com.gmail.nossr50.datatypes.skills.SkillType; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.player.UserManager; -import main.java.com.djrapitops.plan.data.additional.*; +import main.java.com.djrapitops.plan.data.element.AnalysisContainer; +import main.java.com.djrapitops.plan.data.element.InspectContainer; +import main.java.com.djrapitops.plan.data.element.TableContainer; +import main.java.com.djrapitops.plan.data.plugin.ContainerSize; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.analysis.MathUtils; import main.java.com.djrapitops.plan.utilities.html.Html; @@ -76,8 +80,7 @@ public class McMmoData extends PluginData { skillTable.addRow("No players online"); } - List skills = new ArrayList<>(); - skills.addAll(Arrays.stream(SkillType.values()).distinct().collect(Collectors.toList())); + List skills = Arrays.stream(SkillType.values()).distinct().collect(Collectors.toList()); for (SkillType skill : skills) { long total = MathUtils.sumInt(profiles.stream().map(p -> (Serializable) p.getSkillLevel(skill))); diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/mcmmo/McmmoHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/mcmmo/McmmoHook.java index 185b5af37..a838ca9c5 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/mcmmo/McmmoHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/mcmmo/McmmoHook.java @@ -2,7 +2,7 @@ package com.djrapitops.pluginbridge.plan.mcmmo; import com.djrapitops.pluginbridge.plan.Hook; import main.java.com.djrapitops.plan.api.API; -import main.java.com.djrapitops.plan.data.additional.HookHandler; +import main.java.com.djrapitops.plan.data.plugin.HookHandler; /** * A Class responsible for hooking to MCMMO and registering data sources. diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/ProtocolSupportData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/ProtocolSupportData.java index 13baab2c0..0c6cbdf29 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/ProtocolSupportData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/ProtocolSupportData.java @@ -7,7 +7,11 @@ package com.djrapitops.pluginbridge.plan.protocolsupport; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.pluginbridge.plan.viaversion.Protocol; import com.djrapitops.pluginbridge.plan.viaversion.ProtocolTable; -import main.java.com.djrapitops.plan.data.additional.*; +import main.java.com.djrapitops.plan.data.element.AnalysisContainer; +import main.java.com.djrapitops.plan.data.element.InspectContainer; +import main.java.com.djrapitops.plan.data.element.TableContainer; +import main.java.com.djrapitops.plan.data.plugin.ContainerSize; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import java.sql.SQLException; import java.util.Collection; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/ProtocolSupportHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/ProtocolSupportHook.java index 023e01b55..1215022d6 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/ProtocolSupportHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/ProtocolSupportHook.java @@ -9,7 +9,7 @@ import com.djrapitops.pluginbridge.plan.Hook; import com.djrapitops.pluginbridge.plan.viaversion.ProtocolTable; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -import main.java.com.djrapitops.plan.data.additional.HookHandler; +import main.java.com.djrapitops.plan.data.plugin.HookHandler; import main.java.com.djrapitops.plan.database.databases.SQLDB; /** diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/redprotect/RedProtectData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/redprotect/RedProtectData.java index c85af640e..a490194de 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/redprotect/RedProtectData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/redprotect/RedProtectData.java @@ -6,7 +6,11 @@ package com.djrapitops.pluginbridge.plan.redprotect; import br.net.fabiozumbi12.RedProtect.API.RedProtectAPI; import br.net.fabiozumbi12.RedProtect.Region; -import main.java.com.djrapitops.plan.data.additional.*; +import main.java.com.djrapitops.plan.data.element.AnalysisContainer; +import main.java.com.djrapitops.plan.data.element.InspectContainer; +import main.java.com.djrapitops.plan.data.element.TableContainer; +import main.java.com.djrapitops.plan.data.plugin.ContainerSize; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import main.java.com.djrapitops.plan.utilities.FormatUtils; import java.util.Collection; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/redprotect/RedProtectHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/redprotect/RedProtectHook.java index 6496773a2..2b155c827 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/redprotect/RedProtectHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/redprotect/RedProtectHook.java @@ -5,7 +5,7 @@ package com.djrapitops.pluginbridge.plan.redprotect; import com.djrapitops.pluginbridge.plan.Hook; -import main.java.com.djrapitops.plan.data.additional.HookHandler; +import main.java.com.djrapitops.plan.data.plugin.HookHandler; /** * Hook for RedProtect plugin. diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/superbvote/SuperbVoteData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/superbvote/SuperbVoteData.java index 1f8611ae2..76255cb7c 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/superbvote/SuperbVoteData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/superbvote/SuperbVoteData.java @@ -5,10 +5,10 @@ package com.djrapitops.pluginbridge.plan.superbvote; import io.minimum.minecraft.superbvote.storage.VoteStorage; -import main.java.com.djrapitops.plan.data.additional.AnalysisContainer; -import main.java.com.djrapitops.plan.data.additional.ContainerSize; -import main.java.com.djrapitops.plan.data.additional.InspectContainer; -import main.java.com.djrapitops.plan.data.additional.PluginData; +import main.java.com.djrapitops.plan.data.element.AnalysisContainer; +import main.java.com.djrapitops.plan.data.element.InspectContainer; +import main.java.com.djrapitops.plan.data.plugin.ContainerSize; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import java.util.Collection; import java.util.HashMap; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/superbvote/SuperbVoteHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/superbvote/SuperbVoteHook.java index f35ddad20..86a3f24df 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/superbvote/SuperbVoteHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/superbvote/SuperbVoteHook.java @@ -4,7 +4,7 @@ import com.djrapitops.pluginbridge.plan.Hook; import io.minimum.minecraft.superbvote.SuperbVote; import io.minimum.minecraft.superbvote.storage.VoteStorage; import main.java.com.djrapitops.plan.api.API; -import main.java.com.djrapitops.plan.data.additional.HookHandler; +import main.java.com.djrapitops.plan.data.plugin.HookHandler; import static org.bukkit.plugin.java.JavaPlugin.getPlugin; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownAccordionCreator.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownAccordionCreator.java index 4172140d0..3404dbfaf 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownAccordionCreator.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownAccordionCreator.java @@ -11,7 +11,7 @@ import com.palmergames.bukkit.towny.object.Town; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.data.PlayerProfile; import main.java.com.djrapitops.plan.data.ServerProfile; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.Session; import main.java.com.djrapitops.plan.utilities.analysis.Analysis; import main.java.com.djrapitops.plan.utilities.html.HtmlStructure; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyData.java index 0c6600086..6077f62d2 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyData.java @@ -11,11 +11,11 @@ import com.palmergames.bukkit.towny.object.Resident; import com.palmergames.bukkit.towny.object.Town; import com.palmergames.bukkit.towny.object.TownyUniverse; import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.Settings; -import main.java.com.djrapitops.plan.data.additional.AnalysisContainer; -import main.java.com.djrapitops.plan.data.additional.ContainerSize; -import main.java.com.djrapitops.plan.data.additional.InspectContainer; -import main.java.com.djrapitops.plan.data.additional.PluginData; +import main.java.com.djrapitops.plan.data.element.AnalysisContainer; +import main.java.com.djrapitops.plan.data.element.InspectContainer; +import main.java.com.djrapitops.plan.data.plugin.ContainerSize; +import main.java.com.djrapitops.plan.data.plugin.PluginData; +import main.java.com.djrapitops.plan.settings.Settings; import main.java.com.djrapitops.plan.utilities.html.Html; import java.util.*; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyHook.java index 87af75bae..62c75ee81 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyHook.java @@ -2,7 +2,7 @@ package com.djrapitops.pluginbridge.plan.towny; import com.djrapitops.pluginbridge.plan.Hook; import main.java.com.djrapitops.plan.api.API; -import main.java.com.djrapitops.plan.data.additional.HookHandler; +import main.java.com.djrapitops.plan.data.plugin.HookHandler; /** * A Class responsible for hooking to Towny and registering 2 data sources. diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultEcoData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultEcoData.java index 528337785..fb936bbdf 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultEcoData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultEcoData.java @@ -9,10 +9,10 @@ import com.djrapitops.pluginbridge.plan.FakeOfflinePlayer; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.data.PlayerProfile; import main.java.com.djrapitops.plan.data.ServerProfile; -import main.java.com.djrapitops.plan.data.additional.AnalysisContainer; -import main.java.com.djrapitops.plan.data.additional.ContainerSize; -import main.java.com.djrapitops.plan.data.additional.InspectContainer; -import main.java.com.djrapitops.plan.data.additional.PluginData; +import main.java.com.djrapitops.plan.data.element.AnalysisContainer; +import main.java.com.djrapitops.plan.data.element.InspectContainer; +import main.java.com.djrapitops.plan.data.plugin.ContainerSize; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.analysis.Analysis; import net.milkbowl.vault.economy.Economy; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultHook.java index 8bdd8ab3b..c503b5c2d 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultHook.java @@ -2,7 +2,7 @@ package com.djrapitops.pluginbridge.plan.vault; import com.djrapitops.pluginbridge.plan.Hook; import main.java.com.djrapitops.plan.api.API; -import main.java.com.djrapitops.plan.data.additional.HookHandler; +import main.java.com.djrapitops.plan.data.plugin.HookHandler; import net.milkbowl.vault.economy.Economy; import static org.bukkit.Bukkit.getServer; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultPermData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultPermData.java index 12e818fc0..07dd0ca8d 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultPermData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultPermData.java @@ -9,10 +9,10 @@ import com.djrapitops.pluginbridge.plan.FakeOfflinePlayer; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.data.PlayerProfile; import main.java.com.djrapitops.plan.data.ServerProfile; -import main.java.com.djrapitops.plan.data.additional.AnalysisContainer; -import main.java.com.djrapitops.plan.data.additional.ContainerSize; -import main.java.com.djrapitops.plan.data.additional.InspectContainer; -import main.java.com.djrapitops.plan.data.additional.PluginData; +import main.java.com.djrapitops.plan.data.element.AnalysisContainer; +import main.java.com.djrapitops.plan.data.element.InspectContainer; +import main.java.com.djrapitops.plan.data.plugin.ContainerSize; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import main.java.com.djrapitops.plan.utilities.analysis.Analysis; import net.milkbowl.vault.permission.Permission; import org.apache.commons.lang3.StringUtils; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionData.java index 65e09f47e..2a41a4022 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionData.java @@ -5,7 +5,11 @@ package com.djrapitops.pluginbridge.plan.viaversion; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.data.additional.*; +import main.java.com.djrapitops.plan.data.element.AnalysisContainer; +import main.java.com.djrapitops.plan.data.element.InspectContainer; +import main.java.com.djrapitops.plan.data.element.TableContainer; +import main.java.com.djrapitops.plan.data.plugin.ContainerSize; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import java.sql.SQLException; import java.util.Collection; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionHook.java index d6e5fcd35..39ed17ed3 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionHook.java @@ -5,7 +5,7 @@ import com.djrapitops.pluginbridge.plan.Hook; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.api.API; import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -import main.java.com.djrapitops.plan.data.additional.HookHandler; +import main.java.com.djrapitops.plan.data.plugin.HookHandler; import main.java.com.djrapitops.plan.database.databases.SQLDB; import us.myles.ViaVersion.api.Via; import us.myles.ViaVersion.api.ViaAPI;