Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-09-28 22:47:26 +02:00
Code Issues Projects Releases Wiki Activity

Package levelling renamed

Browse Source
This commit is contained in:
Fabrizio La Rosa 2020-06-25 03:03:27 +02:00
parent 9f36184f79
commit 58da5128d8
21 changed files with 33 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/songoda/skyblock/SkyBlock.java
View File

@ -23,7 +23,7 @@ import com.songoda.skyblock.invite.InviteManager;
import com.songoda.skyblock.island.IslandManager;
import com.songoda.skyblock.island.reward.RewardManager;
import com.songoda.skyblock.leaderboard.LeaderboardManager;
import com.songoda.skyblock.levelling.rework.IslandLevelManager;
import com.songoda.skyblock.levelling.IslandLevelManager;
import com.songoda.skyblock.limit.LimitationInstanceHandler;
import com.songoda.skyblock.listeners.*;
import com.songoda.skyblock.localization.LocalizationManager;

5
src/main/java/com/songoda/skyblock/api/levelling/LevellingManager.java
View File

@ -2,12 +2,13 @@ package com.songoda.skyblock.api.levelling;
import com.google.common.base.Preconditions;
import com.songoda.skyblock.api.island.Island;
import com.songoda.skyblock.levelling.IslandLevelManager;
public class LevellingManager {
private final com.songoda.skyblock.levelling.rework.IslandLevelManager levellingManager;
private final IslandLevelManager levellingManager;
public LevellingManager(com.songoda.skyblock.levelling.rework.IslandLevelManager levellingManager) {
public LevellingManager(IslandLevelManager levellingManager) {
this.levellingManager = levellingManager;
}

2
src/main/java/com/songoda/skyblock/command/commands/admin/LevelScanCommand.java
View File

@ -5,7 +5,7 @@ import com.songoda.skyblock.command.SubCommand;
import com.songoda.skyblock.config.FileManager;
import com.songoda.skyblock.island.Island;
import com.songoda.skyblock.island.IslandManager;
import com.songoda.skyblock.levelling.rework.IslandLevelManager;
import com.songoda.skyblock.levelling.IslandLevelManager;
import com.songoda.skyblock.message.MessageManager;
import com.songoda.skyblock.sound.SoundManager;
import org.bukkit.Bukkit;

2
src/main/java/com/songoda/skyblock/command/commands/admin/ReloadCommand.java
View File

@ -16,7 +16,7 @@ import com.songoda.skyblock.config.FileManager;
import com.songoda.skyblock.config.FileManager.Config;
import com.songoda.skyblock.generator.GeneratorManager;
import com.songoda.skyblock.leaderboard.LeaderboardManager;
import com.songoda.skyblock.levelling.rework.IslandLevelManager;
import com.songoda.skyblock.levelling.IslandLevelManager;
import com.songoda.skyblock.limit.LimitationInstanceHandler;
import com.songoda.skyblock.message.MessageManager;
import com.songoda.skyblock.scoreboard.ScoreboardManager;

2
src/main/java/com/songoda/skyblock/command/commands/island/LevelCommand.java
View File

@ -9,7 +9,7 @@ import com.songoda.skyblock.cooldown.CooldownPlayer;
import com.songoda.skyblock.cooldown.CooldownType;
import com.songoda.skyblock.island.Island;
import com.songoda.skyblock.island.IslandManager;
import com.songoda.skyblock.levelling.rework.IslandLevelManager;
import com.songoda.skyblock.levelling.IslandLevelManager;
import com.songoda.skyblock.menus.Levelling;
import com.songoda.skyblock.message.MessageManager;
import com.songoda.skyblock.playerdata.PlayerDataManager;

2
src/main/java/com/songoda/skyblock/command/commands/island/ValueCommand.java
View File

@ -5,7 +5,7 @@ import com.songoda.core.compatibility.CompatibleSound;
import com.songoda.skyblock.command.SubCommand;
import com.songoda.skyblock.config.FileManager;
import com.songoda.skyblock.config.FileManager.Config;
import com.songoda.skyblock.levelling.rework.IslandLevelManager;
import com.songoda.skyblock.levelling.IslandLevelManager;
import com.songoda.skyblock.message.MessageManager;
import com.songoda.skyblock.sound.SoundManager;
import com.songoda.skyblock.utils.NumberUtil;

12
src/main/java/com/songoda/skyblock/levelling/rework/IslandLevelManager.java → src/main/java/com/songoda/skyblock/levelling/IslandLevelManager.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.levelling.rework;
package com.songoda.skyblock.levelling;
import java.io.File;
import java.util.ArrayList;
@ -9,6 +9,10 @@ import java.util.Map;
import java.util.Map.Entry;
import com.songoda.core.compatibility.CompatibleMaterial;
import com.songoda.skyblock.levelling.calculator.Calculator;
import com.songoda.skyblock.levelling.calculator.CalculatorRegistry;
import com.songoda.skyblock.levelling.calculator.impl.EpicSpawnerCalculator;
import com.songoda.skyblock.levelling.calculator.impl.UltimateStackerCalculator;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.block.Block;
@ -21,11 +25,7 @@ import org.bukkit.plugin.PluginManager;
import com.songoda.skyblock.SkyBlock;
import com.songoda.skyblock.blockscanner.BlockInfo;
import com.songoda.skyblock.island.Island;
import com.songoda.skyblock.levelling.rework.amount.AmountMaterialPair;
import com.songoda.skyblock.levelling.rework.calculator.Calculator;
import com.songoda.skyblock.levelling.rework.calculator.CalculatorRegistry;
import com.songoda.skyblock.levelling.rework.calculator.impl.EpicSpawnerCalculator;
import com.songoda.skyblock.levelling.rework.calculator.impl.UltimateStackerCalculator;
import com.songoda.skyblock.levelling.amount.AmountMaterialPair;
import com.songoda.skyblock.message.MessageManager;
import com.songoda.skyblock.stackable.StackableManager;

6
src/main/java/com/songoda/skyblock/levelling/rework/IslandScan.java → src/main/java/com/songoda/skyblock/levelling/IslandScan.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.levelling.rework;
package com.songoda.skyblock.levelling;
import com.songoda.core.compatibility.CompatibleMaterial;
import com.songoda.skyblock.SkyBlock;
@ -9,8 +9,8 @@ import com.songoda.skyblock.island.Island;
import com.songoda.skyblock.island.IslandLevel;
import com.songoda.skyblock.island.IslandWorld;
import com.songoda.skyblock.blockscanner.ChunkLoader;
import com.songoda.skyblock.levelling.rework.amount.AmountMaterialPair;
import com.songoda.skyblock.levelling.rework.amount.BlockAmount;
import com.songoda.skyblock.levelling.amount.AmountMaterialPair;
import com.songoda.skyblock.levelling.amount.BlockAmount;
import com.songoda.skyblock.message.MessageManager;
import org.bukkit.*;
import org.bukkit.configuration.Configuration;

2
src/main/java/com/songoda/skyblock/levelling/rework/LevellingMaterial.java → src/main/java/com/songoda/skyblock/levelling/LevellingMaterial.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.levelling.rework;
package com.songoda.skyblock.levelling;
import com.songoda.core.compatibility.CompatibleMaterial;
import org.bukkit.inventory.ItemStack;

2
src/main/java/com/songoda/skyblock/levelling/rework/amount/AmountMaterialPair.java → src/main/java/com/songoda/skyblock/levelling/amount/AmountMaterialPair.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.levelling.rework.amount;
package com.songoda.skyblock.levelling.amount;
import com.songoda.core.compatibility.CompatibleMaterial;

2
src/main/java/com/songoda/skyblock/levelling/rework/amount/BlockAmount.java → src/main/java/com/songoda/skyblock/levelling/amount/BlockAmount.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.levelling.rework.amount;
package com.songoda.skyblock.levelling.amount;
public class BlockAmount {

2
src/main/java/com/songoda/skyblock/levelling/rework/calculator/Calculator.java → src/main/java/com/songoda/skyblock/levelling/calculator/Calculator.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.levelling.rework.calculator;
package com.songoda.skyblock.levelling.calculator;
import org.bukkit.block.Block;

3
src/main/java/com/songoda/skyblock/levelling/rework/calculator/CalculatorRegistry.java → src/main/java/com/songoda/skyblock/levelling/calculator/CalculatorRegistry.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.levelling.rework.calculator;
package com.songoda.skyblock.levelling.calculator;
import java.util.ArrayList;
import java.util.HashMap;
@ -6,7 +6,6 @@ import java.util.List;
import java.util.Map;
import com.songoda.core.compatibility.CompatibleMaterial;
import org.bukkit.Material;
public final class CalculatorRegistry {

2
src/main/java/com/songoda/skyblock/levelling/rework/calculator/SpawnerCalculator.java → src/main/java/com/songoda/skyblock/levelling/calculator/SpawnerCalculator.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.levelling.rework.calculator;
package com.songoda.skyblock.levelling.calculator;
import org.bukkit.block.Block;
import org.bukkit.block.CreatureSpawner;

4
src/main/java/com/songoda/skyblock/levelling/rework/calculator/impl/EpicSpawnerCalculator.java → src/main/java/com/songoda/skyblock/levelling/calculator/impl/EpicSpawnerCalculator.java
View File

@ -1,10 +1,10 @@
package com.songoda.skyblock.levelling.rework.calculator.impl;
package com.songoda.skyblock.levelling.calculator.impl;
import org.bukkit.block.CreatureSpawner;
import com.songoda.epicspawners.EpicSpawners;
import com.songoda.epicspawners.spawners.spawner.Spawner;
import com.songoda.skyblock.levelling.rework.calculator.SpawnerCalculator;
import com.songoda.skyblock.levelling.calculator.SpawnerCalculator;
public class EpicSpawnerCalculator implements SpawnerCalculator {

4
src/main/java/com/songoda/skyblock/levelling/rework/calculator/impl/UltimateStackerCalculator.java → src/main/java/com/songoda/skyblock/levelling/calculator/impl/UltimateStackerCalculator.java
View File

@ -1,8 +1,8 @@
package com.songoda.skyblock.levelling.rework.calculator.impl;
package com.songoda.skyblock.levelling.calculator.impl;
import org.bukkit.block.CreatureSpawner;
import com.songoda.skyblock.levelling.rework.calculator.SpawnerCalculator;
import com.songoda.skyblock.levelling.calculator.SpawnerCalculator;
import com.songoda.ultimatestacker.UltimateStacker;
import com.songoda.ultimatestacker.spawner.SpawnerStack;

4
src/main/java/com/songoda/skyblock/listeners/Block.java
View File

@ -8,10 +8,9 @@ import com.songoda.skyblock.config.FileManager.Config;
import com.songoda.skyblock.generator.Generator;
import com.songoda.skyblock.generator.GeneratorManager;
import com.songoda.skyblock.island.*;
import com.songoda.skyblock.levelling.rework.IslandLevelManager;
import com.songoda.skyblock.levelling.IslandLevelManager;
import com.songoda.skyblock.limit.impl.BlockLimitation;
import com.songoda.skyblock.permission.PermissionManager;
import com.songoda.skyblock.permission.event.events.PlayerEnterPortalEvent;
import com.songoda.skyblock.stackable.Stackable;
import com.songoda.skyblock.stackable.StackableManager;
import com.songoda.skyblock.utils.NumberUtil;
@ -31,7 +30,6 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.block.*;
import org.bukkit.event.player.PlayerShearEntityEvent;
import org.bukkit.event.world.PortalCreateEvent;
import org.bukkit.inventory.ItemStack;

4
src/main/java/com/songoda/skyblock/listeners/Interact.java
View File

@ -10,7 +10,7 @@ import com.songoda.skyblock.island.Island;
import com.songoda.skyblock.island.IslandLevel;
import com.songoda.skyblock.island.IslandManager;
import com.songoda.skyblock.island.IslandWorld;
import com.songoda.skyblock.levelling.rework.IslandLevelManager;
import com.songoda.skyblock.levelling.IslandLevelManager;
import com.songoda.skyblock.limit.impl.BlockLimitation;
import com.songoda.skyblock.message.MessageManager;
import com.songoda.skyblock.sound.SoundManager;
@ -18,12 +18,10 @@ import com.songoda.skyblock.stackable.Stackable;
import com.songoda.skyblock.stackable.StackableManager;
import com.songoda.skyblock.utils.NumberUtil;
import com.songoda.skyblock.utils.structure.StructureUtil;
import com.songoda.skyblock.utils.version.NMSUtil;
import com.songoda.skyblock.utils.world.LocationUtil;
import com.songoda.skyblock.world.WorldManager;
import org.apache.commons.lang.WordUtils;
import org.bukkit.*;
import org.bukkit.block.BlockFace;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;

2
src/main/java/com/songoda/skyblock/menus/Levelling.java
View File

@ -28,7 +28,7 @@ import com.songoda.skyblock.cooldown.CooldownType;
import com.songoda.skyblock.island.Island;
import com.songoda.skyblock.island.IslandLevel;
import com.songoda.skyblock.island.IslandManager;
import com.songoda.skyblock.levelling.rework.IslandLevelManager;
import com.songoda.skyblock.levelling.IslandLevelManager;
import com.songoda.skyblock.message.MessageManager;
import com.songoda.skyblock.placeholder.Placeholder;
import com.songoda.skyblock.playerdata.PlayerData;

6
src/main/java/com/songoda/skyblock/menus/admin/Levelling.java
View File

@ -5,8 +5,8 @@ import com.songoda.core.compatibility.CompatibleSound;
import com.songoda.skyblock.SkyBlock;
import com.songoda.skyblock.config.FileManager;
import com.songoda.skyblock.config.FileManager.Config;
import com.songoda.skyblock.levelling.rework.IslandLevelManager;
import com.songoda.skyblock.levelling.rework.LevellingMaterial;
import com.songoda.skyblock.levelling.IslandLevelManager;
import com.songoda.skyblock.levelling.LevellingMaterial;
import com.songoda.skyblock.menus.MenuType;
import com.songoda.skyblock.message.MessageManager;
import com.songoda.skyblock.placeholder.Placeholder;
@ -16,12 +16,10 @@ import com.songoda.skyblock.utils.AbstractAnvilGUI;
import com.songoda.skyblock.utils.NumberUtil;
import com.songoda.skyblock.utils.item.SkullUtil;
import com.songoda.skyblock.utils.item.nInventoryUtil;
import com.songoda.skyblock.utils.version.CompatibleSpawners;
import com.songoda.skyblock.utils.version.NMSUtil;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.block.CreatureSpawner;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;

2
src/main/java/com/songoda/skyblock/placeholder/PlaceholderManager.java
View File

@ -21,7 +21,7 @@ import com.songoda.skyblock.island.IslandManager;
import com.songoda.skyblock.island.IslandRole;
import com.songoda.skyblock.leaderboard.Leaderboard;
import com.songoda.skyblock.leaderboard.LeaderboardManager;
import com.songoda.skyblock.levelling.rework.IslandLevelManager;
import com.songoda.skyblock.levelling.IslandLevelManager;
import com.songoda.skyblock.upgrade.Upgrade;
import com.songoda.skyblock.upgrade.Upgrade.Type;
import com.songoda.skyblock.utils.NumberUtil;