Upstream/EpicHoppers
1
0
Fork 0
mirror of https://github.com/songoda/EpicHoppers.git synced 2024-09-27 07:12:36 +02:00
Code Issues Projects Releases Wiki Activity

Move classes from package com.songoda to com.craftaro

Browse Source
This commit is contained in:
Christian Koop 2023-06-29 11:39:53 +02:00
parent 2190393bf5
commit 332a058077
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
65 changed files with 277 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
EpicHoppers-API/src/main/java/com/songoda/epichoppers/EpicHoppersApi.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/EpicHoppersApi.java
View File

@ -1,11 +1,11 @@
package com.songoda.epichoppers;
package com.craftaro.epichoppers;
import com.songoda.epichoppers.boost.BoostManager;
import com.songoda.epichoppers.containers.ContainerManager;
import com.songoda.epichoppers.database.DataManager;
import com.songoda.epichoppers.hopper.levels.LevelManager;
import com.songoda.epichoppers.hopper.teleport.TeleportHandler;
import com.songoda.epichoppers.player.PlayerDataManager;
import com.craftaro.epichoppers.boost.BoostManager;
import com.craftaro.epichoppers.containers.ContainerManager;
import com.craftaro.epichoppers.database.DataManager;
import com.craftaro.epichoppers.hopper.teleport.TeleportHandler;
import com.craftaro.epichoppers.player.PlayerDataManager;
import com.craftaro.epichoppers.hopper.levels.LevelManager;
import org.jetbrains.annotations.ApiStatus;
public class EpicHoppersApi {

4
EpicHoppers-API/src/main/java/com/songoda/epichoppers/api/events/HopperAccessEvent.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/api/events/HopperAccessEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.epichoppers.api.events;
package com.craftaro.epichoppers.api.events;
import com.songoda.epichoppers.hopper.Hopper;
import com.craftaro.epichoppers.hopper.Hopper;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList;

4
EpicHoppers-API/src/main/java/com/songoda/epichoppers/api/events/HopperBreakEvent.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/api/events/HopperBreakEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.epichoppers.api.events;
package com.craftaro.epichoppers.api.events;
import com.songoda.epichoppers.hopper.Hopper;
import com.craftaro.epichoppers.hopper.Hopper;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;

4
EpicHoppers-API/src/main/java/com/songoda/epichoppers/api/events/HopperEvent.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/api/events/HopperEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.epichoppers.api.events;
package com.craftaro.epichoppers.api.events;
import com.songoda.epichoppers.hopper.Hopper;
import com.craftaro.epichoppers.hopper.Hopper;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.player.PlayerEvent;

4
EpicHoppers-API/src/main/java/com/songoda/epichoppers/api/events/HopperPlaceEvent.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/api/events/HopperPlaceEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.epichoppers.api.events;
package com.craftaro.epichoppers.api.events;
import com.songoda.epichoppers.hopper.Hopper;
import com.craftaro.epichoppers.hopper.Hopper;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;

2
EpicHoppers-API/src/main/java/com/songoda/epichoppers/boost/BoostData.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/boost/BoostData.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.boost;
package com.craftaro.epichoppers.boost;
import java.util.Objects;
import java.util.UUID;

2
EpicHoppers-API/src/main/java/com/songoda/epichoppers/boost/BoostManager.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/boost/BoostManager.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.boost;
package com.craftaro.epichoppers.boost;
import java.util.List;
import java.util.Set;

2
EpicHoppers-API/src/main/java/com/songoda/epichoppers/containers/ContainerManager.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/containers/ContainerManager.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.containers;
package com.craftaro.epichoppers.containers;
import org.bukkit.block.Block;

2
EpicHoppers-API/src/main/java/com/songoda/epichoppers/containers/CustomContainer.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/containers/CustomContainer.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.containers;
package com.craftaro.epichoppers.containers;
import org.bukkit.inventory.ItemStack;

2
EpicHoppers-API/src/main/java/com/songoda/epichoppers/containers/IContainer.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/containers/IContainer.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.containers;
package com.craftaro.epichoppers.containers;
import org.bukkit.block.Block;

10
EpicHoppers-API/src/main/java/com/songoda/epichoppers/database/DataManager.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/database/DataManager.java
View File

@ -1,9 +1,9 @@
package com.songoda.epichoppers.database;
package com.craftaro.epichoppers.database;
import com.songoda.epichoppers.boost.BoostData;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.hopper.ItemType;
import com.songoda.epichoppers.hopper.LinkType;
import com.craftaro.epichoppers.boost.BoostData;
import com.craftaro.epichoppers.hopper.Hopper;
import com.craftaro.epichoppers.hopper.ItemType;
import com.craftaro.epichoppers.hopper.LinkType;
import org.bukkit.Location;
import org.bukkit.inventory.ItemStack;

2
EpicHoppers-API/src/main/java/com/songoda/epichoppers/hopper/Filter.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/hopper/Filter.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.hopper;
package com.craftaro.epichoppers.hopper;
import org.bukkit.Location;
import org.bukkit.inventory.ItemStack;

22
EpicHoppers-API/src/main/java/com/songoda/epichoppers/hopper/Hopper.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/hopper/Hopper.java
View File

@ -1,20 +1,20 @@
package com.songoda.epichoppers.hopper;
package com.craftaro.epichoppers.hopper;
import com.craftaro.core.SongodaPlugin;
import com.craftaro.core.compatibility.CompatibleParticleHandler;
import com.craftaro.core.compatibility.ServerVersion;
import com.craftaro.core.hooks.EconomyManager;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
import com.songoda.epichoppers.EpicHoppersApi;
import com.songoda.epichoppers.api.events.HopperAccessEvent;
import com.songoda.epichoppers.database.DataManager;
import com.songoda.epichoppers.hopper.levels.Level;
import com.songoda.epichoppers.hopper.levels.LevelManager;
import com.songoda.epichoppers.hopper.teleport.TeleportTrigger;
import com.songoda.epichoppers.player.PlayerData;
import com.songoda.epichoppers.player.PlayerDataManager;
import com.songoda.epichoppers.utils.CostType;
import com.songoda.epichoppers.utils.Methods;
import com.craftaro.epichoppers.EpicHoppersApi;
import com.craftaro.epichoppers.api.events.HopperAccessEvent;
import com.craftaro.epichoppers.database.DataManager;
import com.craftaro.epichoppers.hopper.levels.Level;
import com.craftaro.epichoppers.hopper.levels.LevelManager;
import com.craftaro.epichoppers.player.PlayerData;
import com.craftaro.epichoppers.player.PlayerDataManager;
import com.craftaro.epichoppers.utils.CostType;
import com.craftaro.epichoppers.utils.Methods;
import com.craftaro.epichoppers.hopper.teleport.TeleportTrigger;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.Location;

2
EpicHoppers-API/src/main/java/com/songoda/epichoppers/hopper/ItemType.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/hopper/ItemType.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.hopper;
package com.craftaro.epichoppers.hopper;
public enum ItemType {
WHITELIST, BLACKLIST, VOID, AUTO_SELL_WHITELIST, AUTO_SELL_BLACKLIST

2
EpicHoppers-API/src/main/java/com/songoda/epichoppers/hopper/LinkType.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/hopper/LinkType.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.hopper;
package com.craftaro.epichoppers.hopper;
public enum LinkType {
REGULAR, REJECT

4
EpicHoppers-API/src/main/java/com/songoda/epichoppers/hopper/levels/Level.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/hopper/levels/Level.java
View File

@ -1,7 +1,7 @@
package com.songoda.epichoppers.hopper.levels;
package com.craftaro.epichoppers.hopper.levels;
import com.craftaro.core.SongodaPlugin;
import com.songoda.epichoppers.hopper.levels.modules.Module;
import com.craftaro.epichoppers.hopper.levels.modules.Module;
import org.bukkit.Bukkit;
import java.util.ArrayList;

4
EpicHoppers-API/src/main/java/com/songoda/epichoppers/hopper/levels/LevelManager.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/hopper/levels/LevelManager.java
View File

@ -1,6 +1,6 @@
package com.songoda.epichoppers.hopper.levels;
package com.craftaro.epichoppers.hopper.levels;
import com.songoda.epichoppers.hopper.levels.modules.Module;
import com.craftaro.epichoppers.hopper.levels.modules.Module;
import org.bukkit.inventory.ItemStack;
import java.util.ArrayList;

6
EpicHoppers-API/src/main/java/com/songoda/epichoppers/hopper/levels/modules/Module.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/Module.java
View File

@ -1,10 +1,10 @@
package com.songoda.epichoppers.hopper.levels.modules;
package com.craftaro.epichoppers.hopper.levels.modules;
import com.craftaro.core.SongodaPlugin;
import com.craftaro.core.configuration.Config;
import com.craftaro.core.gui.GuiManager;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.utils.StorageContainerCache;
import com.craftaro.epichoppers.utils.StorageContainerCache;
import com.craftaro.epichoppers.hopper.Hopper;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.entity.Player;

4
EpicHoppers-API/src/main/java/com/songoda/epichoppers/hopper/teleport/TeleportHandler.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/hopper/teleport/TeleportHandler.java
View File

@ -1,6 +1,6 @@
package com.songoda.epichoppers.hopper.teleport;
package com.craftaro.epichoppers.hopper.teleport;
import com.songoda.epichoppers.hopper.Hopper;
import com.craftaro.epichoppers.hopper.Hopper;
import org.bukkit.entity.Entity;
public interface TeleportHandler {

2
EpicHoppers-API/src/main/java/com/songoda/epichoppers/hopper/teleport/TeleportTrigger.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/hopper/teleport/TeleportTrigger.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.hopper.teleport;
package com.craftaro.epichoppers.hopper.teleport;
public enum TeleportTrigger {
DISABLED, WALK_ON, SNEAK

4
EpicHoppers-API/src/main/java/com/songoda/epichoppers/player/PlayerData.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/player/PlayerData.java
View File

@ -1,6 +1,6 @@
package com.songoda.epichoppers.player;
package com.craftaro.epichoppers.player;
import com.songoda.epichoppers.hopper.Hopper;
import com.craftaro.epichoppers.hopper.Hopper;
public class PlayerData {
private Hopper lastHopper = null;

2
EpicHoppers-API/src/main/java/com/songoda/epichoppers/player/PlayerDataManager.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/player/PlayerDataManager.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.player;
package com.craftaro.epichoppers.player;
import org.bukkit.entity.Player;

2
EpicHoppers-API/src/main/java/com/songoda/epichoppers/player/SyncType.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/player/SyncType.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.player;
package com.craftaro.epichoppers.player;
public enum SyncType {
REGULAR, FILTERED

2
EpicHoppers-API/src/main/java/com/songoda/epichoppers/utils/CostType.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/utils/CostType.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.utils;
package com.craftaro.epichoppers.utils;
public enum CostType {
ECONOMY, EXPERIENCE

2
EpicHoppers-API/src/main/java/com/songoda/epichoppers/utils/Methods.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/utils/Methods.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.utils;
package com.craftaro.epichoppers.utils;
import com.craftaro.core.SongodaPlugin;
import com.craftaro.core.compatibility.ServerVersion;

2
EpicHoppers-API/src/main/java/com/songoda/epichoppers/utils/StorageContainerCache.java → EpicHoppers-API/src/main/java/com/craftaro/epichoppers/utils/StorageContainerCache.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.utils;
package com.craftaro.epichoppers.utils;
import com.craftaro.core.compatibility.CompatibleMaterial;
import com.craftaro.core.compatibility.ServerVersion;

2
EpicHoppers-Plugin/pom.xml
View File

@ -36,7 +36,7 @@
<relocations>
<relocation>
<pattern>com.craftaro.core</pattern>
<shadedPattern>com.songoda.epichoppers.core</shadedPattern>
<shadedPattern>com.craftaro.epichoppers.core</shadedPattern>
</relocation>
</relocations>

73
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/EpicHoppers.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/EpicHoppers.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers;
package com.craftaro.epichoppers;
import com.craftaro.core.SongodaCore;
import com.craftaro.core.SongodaPlugin;
@ -15,40 +15,40 @@ import com.craftaro.core.hooks.ProtectionManager;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem;
import com.craftaro.core.utils.TextUtils;
import com.songoda.epichoppers.boost.BoostManager;
import com.songoda.epichoppers.boost.BoostManagerImpl;
import com.songoda.epichoppers.commands.CommandBoost;
import com.songoda.epichoppers.commands.CommandGive;
import com.songoda.epichoppers.commands.CommandReload;
import com.songoda.epichoppers.commands.CommandSettings;
import com.songoda.epichoppers.containers.ContainerManager;
import com.songoda.epichoppers.containers.ContainerManagerImpl;
import com.songoda.epichoppers.database.DataManager;
import com.songoda.epichoppers.database.DataManagerImpl;
import com.songoda.epichoppers.database.migrations._1_InitialMigration;
import com.songoda.epichoppers.hopper.HopperManager;
import com.songoda.epichoppers.hopper.levels.Level;
import com.songoda.epichoppers.hopper.levels.LevelManager;
import com.songoda.epichoppers.hopper.levels.LevelManagerImpl;
import com.songoda.epichoppers.hopper.levels.modules.Module;
import com.songoda.epichoppers.hopper.levels.modules.ModuleAutoCrafting;
import com.songoda.epichoppers.hopper.levels.modules.ModuleAutoSell;
import com.songoda.epichoppers.hopper.levels.modules.ModuleAutoSmelter;
import com.songoda.epichoppers.hopper.levels.modules.ModuleBlockBreak;
import com.songoda.epichoppers.hopper.levels.modules.ModuleMobHopper;
import com.songoda.epichoppers.hopper.levels.modules.ModuleSuction;
import com.songoda.epichoppers.hopper.teleport.TeleportHandler;
import com.songoda.epichoppers.hopper.teleport.TeleportHandlerImpl;
import com.songoda.epichoppers.listeners.BlockListeners;
import com.songoda.epichoppers.listeners.EntityListeners;
import com.songoda.epichoppers.listeners.HopperListeners;
import com.songoda.epichoppers.listeners.InteractListeners;
import com.songoda.epichoppers.listeners.InventoryListeners;
import com.songoda.epichoppers.player.PlayerDataManager;
import com.songoda.epichoppers.player.PlayerDataManagerImpl;
import com.songoda.epichoppers.settings.Settings;
import com.songoda.epichoppers.tasks.HopTask;
import com.songoda.epichoppers.utils.Methods;
import com.craftaro.epichoppers.boost.BoostManager;
import com.craftaro.epichoppers.boost.BoostManagerImpl;
import com.craftaro.epichoppers.commands.CommandBoost;
import com.craftaro.epichoppers.commands.CommandGive;
import com.craftaro.epichoppers.commands.CommandReload;
import com.craftaro.epichoppers.commands.CommandSettings;
import com.craftaro.epichoppers.containers.ContainerManager;
import com.craftaro.epichoppers.containers.ContainerManagerImpl;
import com.craftaro.epichoppers.database.DataManager;
import com.craftaro.epichoppers.database.DataManagerImpl;
import com.craftaro.epichoppers.database.migrations._1_InitialMigration;
import com.craftaro.epichoppers.hopper.HopperManager;
import com.craftaro.epichoppers.hopper.levels.Level;
import com.craftaro.epichoppers.hopper.levels.LevelManager;
import com.craftaro.epichoppers.hopper.levels.LevelManagerImpl;
import com.craftaro.epichoppers.hopper.levels.modules.Module;
import com.craftaro.epichoppers.hopper.levels.modules.ModuleAutoCrafting;
import com.craftaro.epichoppers.hopper.levels.modules.ModuleAutoSell;
import com.craftaro.epichoppers.hopper.levels.modules.ModuleAutoSmelter;
import com.craftaro.epichoppers.hopper.levels.modules.ModuleBlockBreak;
import com.craftaro.epichoppers.hopper.levels.modules.ModuleMobHopper;
import com.craftaro.epichoppers.hopper.levels.modules.ModuleSuction;
import com.craftaro.epichoppers.hopper.teleport.TeleportHandler;
import com.craftaro.epichoppers.listeners.BlockListeners;
import com.craftaro.epichoppers.listeners.EntityListeners;
import com.craftaro.epichoppers.listeners.HopperListeners;
import com.craftaro.epichoppers.listeners.InteractListeners;
import com.craftaro.epichoppers.listeners.InventoryListeners;
import com.craftaro.epichoppers.player.PlayerDataManager;
import com.craftaro.epichoppers.player.PlayerDataManagerImpl;
import com.craftaro.epichoppers.settings.Settings;
import com.craftaro.epichoppers.tasks.HopTask;
import com.craftaro.epichoppers.utils.Methods;
import com.craftaro.epichoppers.hopper.teleport.TeleportHandlerImpl;
import com.songoda.skyblock.SkyBlock;
import com.songoda.skyblock.permission.BasicPermission;
import org.bukkit.Bukkit;
@ -90,7 +90,6 @@ public class EpicHoppers extends SongodaPlugin {
@Override
public void onPluginEnable() {
// Run Songoda Updater
SongodaCore.registerPlugin(this, 15, XMaterial.HOPPER);
// Load Economy
@ -172,7 +171,7 @@ public class EpicHoppers extends SongodaPlugin {
if (pluginManager.isPluginEnabled("FabledSkyBlock")) {
try {
SkyBlock.getInstance().getPermissionManager().registerPermission(
(BasicPermission) Class.forName("com.songoda.epichoppers.compatibility.EpicHoppersPermission").getDeclaredConstructor().newInstance());
(BasicPermission) Class.forName("com.craftaro.epichoppers.compatibility.EpicHoppersPermission").getDeclaredConstructor().newInstance());
} catch (ReflectiveOperationException ex) {
ex.printStackTrace();
}

2
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/boost/BoostManagerImpl.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/boost/BoostManagerImpl.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.boost;
package com.craftaro.epichoppers.boost;
import java.util.Collections;
import java.util.HashSet;

6
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/commands/CommandBoost.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/commands/CommandBoost.java
View File

@ -1,10 +1,10 @@
package com.songoda.epichoppers.commands;
package com.craftaro.epichoppers.commands;
import com.craftaro.core.commands.AbstractCommand;
import com.craftaro.core.utils.NumberUtils;
import com.craftaro.core.utils.TimeUtils;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.boost.BoostData;
import com.craftaro.epichoppers.boost.BoostData;
import com.craftaro.epichoppers.EpicHoppers;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

6
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/commands/CommandGive.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/commands/CommandGive.java
View File

@ -1,8 +1,8 @@
package com.songoda.epichoppers.commands;
package com.craftaro.epichoppers.commands;
import com.craftaro.core.commands.AbstractCommand;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.hopper.levels.Level;
import com.craftaro.epichoppers.EpicHoppers;
import com.craftaro.epichoppers.hopper.levels.Level;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

4
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/commands/CommandReload.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/commands/CommandReload.java
View File

@ -1,7 +1,7 @@
package com.songoda.epichoppers.commands;
package com.craftaro.epichoppers.commands;
import com.craftaro.core.commands.AbstractCommand;
import com.songoda.epichoppers.EpicHoppers;
import com.craftaro.epichoppers.EpicHoppers;
import org.bukkit.command.CommandSender;
import java.util.List;

4
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/commands/CommandSettings.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/commands/CommandSettings.java
View File

@ -1,8 +1,8 @@
package com.songoda.epichoppers.commands;
package com.craftaro.epichoppers.commands;
import com.craftaro.core.commands.AbstractCommand;
import com.craftaro.core.configuration.editor.PluginConfigGui;
import com.songoda.epichoppers.EpicHoppers;
import com.craftaro.epichoppers.EpicHoppers;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

2
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/compatibility/EpicHoppersPermission.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/compatibility/EpicHoppersPermission.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.compatibility;
package com.craftaro.epichoppers.compatibility;
import com.songoda.skyblock.core.compatibility.CompatibleMaterial;
import com.songoda.skyblock.permission.BasicPermission;

8
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/containers/ContainerManagerImpl.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/containers/ContainerManagerImpl.java
View File

@ -1,8 +1,8 @@
package com.songoda.epichoppers.containers;
package com.craftaro.epichoppers.containers;
import com.songoda.epichoppers.containers.impl.AdvancedChestImpl;
import com.songoda.epichoppers.containers.impl.EpicFarmingImpl;
import com.songoda.epichoppers.containers.impl.FabledSkyBlockImpl;
import com.craftaro.epichoppers.containers.impl.AdvancedChestImpl;
import com.craftaro.epichoppers.containers.impl.EpicFarmingImpl;
import com.craftaro.epichoppers.containers.impl.FabledSkyBlockImpl;
import org.bukkit.Bukkit;
import org.bukkit.block.Block;
import org.bukkit.plugin.PluginManager;

6
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/containers/impl/AdvancedChestImpl.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/containers/impl/AdvancedChestImpl.java
View File

@ -1,7 +1,7 @@
package com.songoda.epichoppers.containers.impl;
package com.craftaro.epichoppers.containers.impl;
import com.songoda.epichoppers.containers.CustomContainer;
import com.songoda.epichoppers.containers.IContainer;
import com.craftaro.epichoppers.containers.CustomContainer;
import com.craftaro.epichoppers.containers.IContainer;
import org.bukkit.block.Block;
import org.bukkit.inventory.ItemStack;
import us.lynuxcraft.deadsilenceiv.advancedchests.AdvancedChestsAPI;

6
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/containers/impl/EpicFarmingImpl.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/containers/impl/EpicFarmingImpl.java
View File

@ -1,10 +1,10 @@
package com.songoda.epichoppers.containers.impl;
package com.craftaro.epichoppers.containers.impl;
import com.songoda.epicfarming.EpicFarming;
import com.songoda.epicfarming.core.compatibility.CompatibleMaterial;
import com.songoda.epicfarming.farming.Farm;
import com.songoda.epichoppers.containers.CustomContainer;
import com.songoda.epichoppers.containers.IContainer;
import com.craftaro.epichoppers.containers.CustomContainer;
import com.craftaro.epichoppers.containers.IContainer;
import org.bukkit.block.Block;
import org.bukkit.inventory.ItemStack;

6
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/containers/impl/FabledSkyBlockImpl.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/containers/impl/FabledSkyBlockImpl.java
View File

@ -1,7 +1,7 @@
package com.songoda.epichoppers.containers.impl;
package com.craftaro.epichoppers.containers.impl;
import com.songoda.epichoppers.containers.CustomContainer;
import com.songoda.epichoppers.containers.IContainer;
import com.craftaro.epichoppers.containers.CustomContainer;
import com.craftaro.epichoppers.containers.IContainer;
import com.songoda.skyblock.SkyBlock;
import com.songoda.skyblock.core.compatibility.CompatibleMaterial;
import com.songoda.skyblock.stackable.Stackable;

18
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/database/DataManagerImpl.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/database/DataManagerImpl.java
View File

@ -1,15 +1,15 @@
package com.songoda.epichoppers.database;
package com.craftaro.epichoppers.database;
import com.craftaro.core.database.DataManagerAbstract;
import com.craftaro.core.database.DatabaseConnector;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.boost.BoostData;
import com.songoda.epichoppers.hopper.Filter;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.hopper.HopperBuilder;
import com.songoda.epichoppers.hopper.ItemType;
import com.songoda.epichoppers.hopper.LinkType;
import com.songoda.epichoppers.hopper.teleport.TeleportTrigger;
import com.craftaro.epichoppers.boost.BoostData;
import com.craftaro.epichoppers.EpicHoppers;
import com.craftaro.epichoppers.hopper.Filter;
import com.craftaro.epichoppers.hopper.Hopper;
import com.craftaro.epichoppers.hopper.HopperBuilder;
import com.craftaro.epichoppers.hopper.ItemType;
import com.craftaro.epichoppers.hopper.LinkType;
import com.craftaro.epichoppers.hopper.teleport.TeleportTrigger;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;

4
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/database/migrations/_1_InitialMigration.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/database/migrations/_1_InitialMigration.java
View File

@ -1,8 +1,8 @@
package com.songoda.epichoppers.database.migrations;
package com.craftaro.epichoppers.database.migrations;
import com.craftaro.core.database.DataMigration;
import com.craftaro.core.database.MySQLConnector;
import com.songoda.epichoppers.EpicHoppers;
import com.craftaro.epichoppers.EpicHoppers;
import java.sql.Connection;
import java.sql.SQLException;

16
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/gui/GUIAutoSellFilter.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIAutoSellFilter.java
View File

@ -1,16 +1,16 @@
package com.songoda.epichoppers.gui;
package com.craftaro.epichoppers.gui;
import com.craftaro.core.SongodaPlugin;
import com.craftaro.core.gui.CustomizableGui;
import com.craftaro.core.gui.GuiUtils;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
import com.craftaro.core.utils.TextUtils;
import com.songoda.epichoppers.EpicHoppersApi;
import com.songoda.epichoppers.hopper.Filter;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.hopper.ItemType;
import com.songoda.epichoppers.settings.Settings;
import com.songoda.epichoppers.utils.Methods;
import com.craftaro.epichoppers.EpicHoppersApi;
import com.craftaro.epichoppers.hopper.Filter;
import com.craftaro.epichoppers.hopper.Hopper;
import com.craftaro.epichoppers.hopper.ItemType;
import com.craftaro.epichoppers.settings.Settings;
import com.craftaro.epichoppers.utils.Methods;
import org.bukkit.Bukkit;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
@ -21,7 +21,6 @@ import java.util.List;
public class GUIAutoSellFilter extends CustomizableGui {
private static final List<GUIAutoSellFilter> OPEN_INVENTORIES = new ArrayList<>();
private final SongodaPlugin plugin;
private final Hopper hopper;
private final int[] whiteListSlots = {9, 10, 11, 18, 19, 20, 27, 28, 29, 36, 37, 38};
@ -29,7 +28,6 @@ public class GUIAutoSellFilter extends CustomizableGui {
public GUIAutoSellFilter(SongodaPlugin plugin, Hopper hopper) {
super(plugin, "autosell");
this.plugin = plugin;
this.hopper = hopper;
setRows(6);

10
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/gui/GUICrafting.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUICrafting.java
View File

@ -1,14 +1,14 @@
package com.songoda.epichoppers.gui;
package com.craftaro.epichoppers.gui;
import com.craftaro.core.SongodaPlugin;
import com.craftaro.core.gui.CustomizableGui;
import com.craftaro.core.gui.GuiUtils;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
import com.craftaro.core.utils.TextUtils;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.hopper.levels.modules.ModuleAutoCrafting;
import com.songoda.epichoppers.settings.Settings;
import com.songoda.epichoppers.utils.Methods;
import com.craftaro.epichoppers.hopper.levels.modules.ModuleAutoCrafting;
import com.craftaro.epichoppers.settings.Settings;
import com.craftaro.epichoppers.utils.Methods;
import com.craftaro.epichoppers.hopper.Hopper;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;

16
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/gui/GUIFilter.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIFilter.java
View File

@ -1,17 +1,17 @@
package com.songoda.epichoppers.gui;
package com.craftaro.epichoppers.gui;
import com.craftaro.core.SongodaPlugin;
import com.craftaro.core.gui.CustomizableGui;
import com.craftaro.core.gui.GuiUtils;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
import com.craftaro.core.utils.TextUtils;
import com.songoda.epichoppers.EpicHoppersApi;
import com.songoda.epichoppers.hopper.Filter;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.hopper.ItemType;
import com.songoda.epichoppers.player.SyncType;
import com.songoda.epichoppers.settings.Settings;
import com.songoda.epichoppers.utils.Methods;
import com.craftaro.epichoppers.EpicHoppersApi;
import com.craftaro.epichoppers.hopper.ItemType;
import com.craftaro.epichoppers.player.SyncType;
import com.craftaro.epichoppers.settings.Settings;
import com.craftaro.epichoppers.utils.Methods;
import com.craftaro.epichoppers.hopper.Filter;
import com.craftaro.epichoppers.hopper.Hopper;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.Player;

22
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/gui/GUIOverview.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIOverview.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.gui;
package com.craftaro.epichoppers.gui;
import com.craftaro.core.SongodaPlugin;
import com.craftaro.core.compatibility.ServerVersion;
@ -8,16 +8,16 @@ import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
import com.craftaro.core.utils.NumberUtils;
import com.craftaro.core.utils.TextUtils;
import com.craftaro.core.utils.TimeUtils;
import com.songoda.epichoppers.EpicHoppersApi;
import com.songoda.epichoppers.boost.BoostData;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.hopper.levels.Level;
import com.songoda.epichoppers.hopper.levels.modules.Module;
import com.songoda.epichoppers.hopper.teleport.TeleportTrigger;
import com.songoda.epichoppers.player.SyncType;
import com.songoda.epichoppers.settings.Settings;
import com.songoda.epichoppers.utils.CostType;
import com.songoda.epichoppers.utils.Methods;
import com.craftaro.epichoppers.EpicHoppersApi;
import com.craftaro.epichoppers.boost.BoostData;
import com.craftaro.epichoppers.hopper.Hopper;
import com.craftaro.epichoppers.hopper.levels.Level;
import com.craftaro.epichoppers.hopper.levels.modules.Module;
import com.craftaro.epichoppers.hopper.teleport.TeleportTrigger;
import com.craftaro.epichoppers.player.SyncType;
import com.craftaro.epichoppers.settings.Settings;
import com.craftaro.epichoppers.utils.CostType;
import com.craftaro.epichoppers.utils.Methods;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.Player;

10
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/gui/GUISmeltable.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUISmeltable.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.gui;
package com.craftaro.epichoppers.gui;
import com.craftaro.core.SongodaPlugin;
import com.craftaro.core.compatibility.CompatibleMaterial;
@ -6,10 +6,10 @@ import com.craftaro.core.gui.CustomizableGui;
import com.craftaro.core.gui.GuiUtils;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
import com.craftaro.core.utils.TextUtils;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.hopper.levels.modules.ModuleAutoSmelter;
import com.songoda.epichoppers.settings.Settings;
import com.songoda.epichoppers.utils.Methods;
import com.craftaro.epichoppers.hopper.levels.modules.ModuleAutoSmelter;
import com.craftaro.epichoppers.settings.Settings;
import com.craftaro.epichoppers.utils.Methods;
import com.craftaro.epichoppers.hopper.Hopper;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;

6
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/HopperBuilder.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/HopperBuilder.java
View File

@ -1,7 +1,7 @@
package com.songoda.epichoppers.hopper;
package com.craftaro.epichoppers.hopper;
import com.songoda.epichoppers.hopper.levels.Level;
import com.songoda.epichoppers.hopper.teleport.TeleportTrigger;
import com.craftaro.epichoppers.hopper.levels.Level;
import com.craftaro.epichoppers.hopper.teleport.TeleportTrigger;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.block.Block;

8
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/HopperManager.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/HopperManager.java
View File

@ -1,8 +1,8 @@
package com.songoda.epichoppers.hopper;
package com.craftaro.epichoppers.hopper;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.hopper.levels.Level;
import com.songoda.epichoppers.hopper.levels.modules.Module;
import com.craftaro.epichoppers.EpicHoppers;
import com.craftaro.epichoppers.hopper.levels.Level;
import com.craftaro.epichoppers.hopper.levels.modules.Module;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;

4
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/LevelManagerImpl.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/LevelManagerImpl.java
View File

@ -1,9 +1,9 @@
package com.songoda.epichoppers.hopper.levels;
package com.craftaro.epichoppers.hopper.levels;
import com.craftaro.core.nms.NmsManager;
import com.craftaro.core.nms.nbt.NBTCore;
import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem;
import com.songoda.epichoppers.hopper.levels.modules.Module;
import com.craftaro.epichoppers.hopper.levels.modules.Module;
import org.bukkit.ChatColor;
import org.bukkit.inventory.ItemStack;

12
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java
View File

@ -1,14 +1,14 @@
package com.songoda.epichoppers.hopper.levels.modules;
package com.craftaro.epichoppers.hopper.levels.modules;
import com.craftaro.core.SongodaPlugin;
import com.craftaro.core.gui.GuiManager;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
import com.craftaro.core.utils.TextUtils;
import com.songoda.epichoppers.gui.GUICrafting;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.settings.Settings;
import com.songoda.epichoppers.utils.Methods;
import com.songoda.epichoppers.utils.StorageContainerCache;
import com.craftaro.epichoppers.settings.Settings;
import com.craftaro.epichoppers.utils.Methods;
import com.craftaro.epichoppers.gui.GUICrafting;
import com.craftaro.epichoppers.hopper.Hopper;
import com.craftaro.epichoppers.utils.StorageContainerCache;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.Player;

14
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoSell.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoSell.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.hopper.levels.modules;
package com.craftaro.epichoppers.hopper.levels.modules;
import com.craftaro.core.SongodaPlugin;
import com.craftaro.core.gui.GuiManager;
@ -6,12 +6,12 @@ import com.craftaro.core.hooks.EconomyManager;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
import com.craftaro.core.utils.NumberUtils;
import com.craftaro.core.utils.TextUtils;
import com.songoda.epichoppers.gui.GUIAutoSellFilter;
import com.songoda.epichoppers.hopper.Filter;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.settings.Settings;
import com.songoda.epichoppers.utils.Methods;
import com.songoda.epichoppers.utils.StorageContainerCache;
import com.craftaro.epichoppers.settings.Settings;
import com.craftaro.epichoppers.utils.Methods;
import com.craftaro.epichoppers.gui.GUIAutoSellFilter;
import com.craftaro.epichoppers.hopper.Filter;
import com.craftaro.epichoppers.hopper.Hopper;
import com.craftaro.epichoppers.utils.StorageContainerCache;
import me.gypopo.economyshopgui.api.EconomyShopGUIHook;
import org.bukkit.Bukkit;
import org.bukkit.Material;

10
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoSmelter.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoSmelter.java
View File

@ -1,14 +1,14 @@
package com.songoda.epichoppers.hopper.levels.modules;
package com.craftaro.epichoppers.hopper.levels.modules;
import com.craftaro.core.SongodaPlugin;
import com.craftaro.core.compatibility.CompatibleMaterial;
import com.craftaro.core.gui.GuiManager;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
import com.craftaro.core.utils.TextUtils;
import com.songoda.epichoppers.gui.GUISmeltable;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.settings.Settings;
import com.songoda.epichoppers.utils.StorageContainerCache;
import com.craftaro.epichoppers.settings.Settings;
import com.craftaro.epichoppers.gui.GUISmeltable;
import com.craftaro.epichoppers.hopper.Hopper;
import com.craftaro.epichoppers.utils.StorageContainerCache;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;

10
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleBlockBreak.java
View File

@ -1,13 +1,13 @@
package com.songoda.epichoppers.hopper.levels.modules;
package com.craftaro.epichoppers.hopper.levels.modules;
import com.craftaro.core.SongodaPlugin;
import com.craftaro.core.compatibility.ServerVersion;
import com.craftaro.core.gui.GuiManager;
import com.craftaro.core.utils.TextUtils;
import com.songoda.epichoppers.EpicHoppersApi;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.settings.Settings;
import com.songoda.epichoppers.utils.StorageContainerCache;
import com.craftaro.epichoppers.settings.Settings;
import com.craftaro.epichoppers.EpicHoppersApi;
import com.craftaro.epichoppers.hopper.Hopper;
import com.craftaro.epichoppers.utils.StorageContainerCache;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Particle;

6
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleMobHopper.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleMobHopper.java
View File

@ -1,10 +1,10 @@
package com.songoda.epichoppers.hopper.levels.modules;
package com.craftaro.epichoppers.hopper.levels.modules;
import com.craftaro.core.SongodaPlugin;
import com.craftaro.core.gui.GuiManager;
import com.craftaro.core.utils.TextUtils;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.utils.StorageContainerCache;
import com.craftaro.epichoppers.hopper.Hopper;
import com.craftaro.epichoppers.utils.StorageContainerCache;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;

10
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleSuction.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleSuction.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.hopper.levels.modules;
package com.craftaro.epichoppers.hopper.levels.modules;
import com.bgsoftware.wildstacker.api.WildStackerAPI;
import com.craftaro.core.SongodaPlugin;
@ -7,10 +7,10 @@ import com.craftaro.core.gui.GuiManager;
import com.craftaro.core.locale.Locale;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
import com.craftaro.core.utils.TextUtils;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.settings.Settings;
import com.songoda.epichoppers.utils.Methods;
import com.songoda.epichoppers.utils.StorageContainerCache;
import com.craftaro.epichoppers.settings.Settings;
import com.craftaro.epichoppers.utils.Methods;
import com.craftaro.epichoppers.hopper.Hopper;
import com.craftaro.epichoppers.utils.StorageContainerCache;
import com.songoda.ultimatestacker.UltimateStacker;
import org.bukkit.Bukkit;
import org.bukkit.Material;

10
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/teleport/TeleportHandlerImpl.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/teleport/TeleportHandlerImpl.java
View File

@ -1,11 +1,11 @@
package com.songoda.epichoppers.hopper.teleport;
package com.craftaro.epichoppers.hopper.teleport;
import com.craftaro.core.compatibility.ServerVersion;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.settings.Settings;
import com.songoda.epichoppers.utils.Methods;
import com.craftaro.epichoppers.EpicHoppers;
import com.craftaro.epichoppers.hopper.Hopper;
import com.craftaro.epichoppers.settings.Settings;
import com.craftaro.epichoppers.utils.Methods;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;

51
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/BlockListeners.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/listeners/BlockListeners.java
View File

@ -1,15 +1,15 @@
package com.songoda.epichoppers.listeners;
package com.craftaro.epichoppers.listeners;
import com.craftaro.core.compatibility.ServerVersion;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.api.events.HopperBreakEvent;
import com.songoda.epichoppers.api.events.HopperPlaceEvent;
import com.songoda.epichoppers.gui.GUIAutoSellFilter;
import com.songoda.epichoppers.gui.GUIFilter;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.hopper.HopperBuilder;
import com.songoda.epichoppers.hopper.levels.Level;
import com.songoda.epichoppers.settings.Settings;
import com.craftaro.epichoppers.EpicHoppers;
import com.craftaro.epichoppers.api.events.HopperBreakEvent;
import com.craftaro.epichoppers.api.events.HopperPlaceEvent;
import com.craftaro.epichoppers.gui.GUIAutoSellFilter;
import com.craftaro.epichoppers.gui.GUIFilter;
import com.craftaro.epichoppers.hopper.Hopper;
import com.craftaro.epichoppers.hopper.HopperBuilder;
import com.craftaro.epichoppers.hopper.levels.Level;
import com.craftaro.epichoppers.settings.Settings;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Material;
@ -26,11 +26,7 @@ import org.bukkit.permissions.PermissionAttachmentInfo;
import java.util.Objects;
/**
* Created by songoda on 3/14/2017.
*/
public class BlockListeners implements Listener {
private final EpicHoppers plugin;
private static final boolean hasMinHeight = ServerVersion.isServerVersionAtLeast(ServerVersion.V1_16);
@ -156,22 +152,27 @@ public class BlockListeners implements Listener {
hopper.forceClose();
hopper.getFilter().getWhiteList().stream()
hopper.getFilter().getWhiteList()
.stream()
.filter(Objects::nonNull)
.forEach(m -> event.getBlock().getWorld().dropItemNaturally(event.getBlock().getLocation(), m));
hopper.getFilter().getBlackList().stream()
.forEach(item -> event.getBlock().getWorld().dropItemNaturally(event.getBlock().getLocation(), item));
hopper.getFilter().getBlackList()
.stream()
.filter(Objects::nonNull)
.forEach(m -> event.getBlock().getWorld().dropItemNaturally(event.getBlock().getLocation(), m));
hopper.getFilter().getVoidList().stream().
filter(Objects::nonNull)
.forEach(m -> event.getBlock().getWorld().dropItemNaturally(event.getBlock().getLocation(), m));
.forEach(item -> event.getBlock().getWorld().dropItemNaturally(event.getBlock().getLocation(), item));
hopper.getFilter().getVoidList()
.stream()
.filter(Objects::nonNull)
.forEach(item -> event.getBlock().getWorld().dropItemNaturally(event.getBlock().getLocation(), item));
hopper.getFilter().getAutoSellWhiteList().stream()
hopper.getFilter().getAutoSellWhiteList()
.stream()
.filter(Objects::nonNull)
.forEach(m -> event.getBlock().getWorld().dropItemNaturally(event.getBlock().getLocation(), m));
hopper.getFilter().getAutoSellBlackList().stream()
.forEach(item -> event.getBlock().getWorld().dropItemNaturally(event.getBlock().getLocation(), item));
hopper.getFilter().getAutoSellBlackList()
.stream()
.filter(Objects::nonNull)
.forEach(m -> event.getBlock().getWorld().dropItemNaturally(event.getBlock().getLocation(), m));
.forEach(item -> event.getBlock().getWorld().dropItemNaturally(event.getBlock().getLocation(), item));
this.plugin.getHopperManager().removeHopper(block.getLocation());
this.plugin.getDataManager().deleteHopper(hopper);

4
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/EntityListeners.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/listeners/EntityListeners.java
View File

@ -1,6 +1,6 @@
package com.songoda.epichoppers.listeners;
package com.craftaro.epichoppers.listeners;
import com.songoda.epichoppers.hopper.levels.modules.ModuleSuction;
import com.craftaro.epichoppers.hopper.levels.modules.ModuleSuction;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;

16
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/HopperListeners.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/listeners/HopperListeners.java
View File

@ -1,14 +1,14 @@
package com.songoda.epichoppers.listeners;
package com.craftaro.epichoppers.listeners;
import com.craftaro.core.compatibility.ServerVersion;
import com.craftaro.core.nms.NmsManager;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.hopper.levels.modules.Module;
import com.songoda.epichoppers.hopper.levels.modules.ModuleAutoCrafting;
import com.songoda.epichoppers.settings.Settings;
import com.songoda.epichoppers.utils.HopperDirection;
import com.songoda.epichoppers.utils.Methods;
import com.craftaro.epichoppers.settings.Settings;
import com.craftaro.epichoppers.EpicHoppers;
import com.craftaro.epichoppers.hopper.Hopper;
import com.craftaro.epichoppers.hopper.levels.modules.Module;
import com.craftaro.epichoppers.hopper.levels.modules.ModuleAutoCrafting;
import com.craftaro.epichoppers.utils.HopperDirection;
import com.craftaro.epichoppers.utils.Methods;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.BlockState;

16
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/InteractListeners.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/listeners/InteractListeners.java
View File

@ -1,14 +1,14 @@
package com.songoda.epichoppers.listeners;
package com.craftaro.epichoppers.listeners;
import com.craftaro.core.hooks.ProtectionManager;
import com.craftaro.core.hooks.WorldGuardHook;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.gui.GUIOverview;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.hopper.teleport.TeleportTrigger;
import com.songoda.epichoppers.player.PlayerData;
import com.songoda.epichoppers.player.SyncType;
import com.songoda.epichoppers.settings.Settings;
import com.craftaro.epichoppers.settings.Settings;
import com.craftaro.epichoppers.EpicHoppers;
import com.craftaro.epichoppers.gui.GUIOverview;
import com.craftaro.epichoppers.hopper.Hopper;
import com.craftaro.epichoppers.hopper.teleport.TeleportTrigger;
import com.craftaro.epichoppers.player.PlayerData;
import com.craftaro.epichoppers.player.SyncType;
import com.songoda.skyblock.SkyBlock;
import org.bukkit.Bukkit;
import org.bukkit.Location;

2
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/InventoryListeners.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/listeners/InventoryListeners.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.listeners;
package com.craftaro.epichoppers.listeners;
import org.bukkit.Material;
import org.bukkit.event.EventHandler;

2
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/player/PlayerDataManagerImpl.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/player/PlayerDataManagerImpl.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.player;
package com.craftaro.epichoppers.player;
import org.bukkit.entity.Player;

4
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/settings/Settings.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/settings/Settings.java
View File

@ -1,10 +1,10 @@
package com.songoda.epichoppers.settings;
package com.craftaro.epichoppers.settings;
import com.craftaro.core.compatibility.CompatibleMaterial;
import com.craftaro.core.configuration.Config;
import com.craftaro.core.configuration.ConfigSetting;
import com.craftaro.core.hooks.EconomyManager;
import com.songoda.epichoppers.EpicHoppers;
import com.craftaro.epichoppers.EpicHoppers;
import java.util.Arrays;
import java.util.stream.Collectors;

34
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/tasks/HopTask.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/tasks/HopTask.java
View File

@ -1,14 +1,14 @@
package com.songoda.epichoppers.tasks;
package com.craftaro.epichoppers.tasks;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.boost.BoostData;
import com.songoda.epichoppers.containers.CustomContainer;
import com.songoda.epichoppers.hopper.levels.modules.Module;
import com.songoda.epichoppers.hopper.levels.modules.ModuleAutoCrafting;
import com.songoda.epichoppers.settings.Settings;
import com.songoda.epichoppers.utils.HopperDirection;
import com.songoda.epichoppers.utils.Methods;
import com.songoda.epichoppers.utils.StorageContainerCache;
import com.craftaro.epichoppers.boost.BoostData;
import com.craftaro.epichoppers.containers.CustomContainer;
import com.craftaro.epichoppers.hopper.levels.modules.ModuleAutoCrafting;
import com.craftaro.epichoppers.settings.Settings;
import com.craftaro.epichoppers.utils.HopperDirection;
import com.craftaro.epichoppers.utils.Methods;
import com.craftaro.epichoppers.EpicHoppers;
import com.craftaro.epichoppers.hopper.levels.modules.Module;
import com.craftaro.epichoppers.utils.StorageContainerCache;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
@ -45,7 +45,7 @@ public class HopTask extends BukkitRunnable {
@Override
public void run() {
for (final com.songoda.epichoppers.hopper.Hopper hopper : this.plugin.getHopperManager().getHoppers().values()) {
for (final com.craftaro.epichoppers.hopper.Hopper hopper : this.plugin.getHopperManager().getHoppers().values()) {
try {
// Get this hopper's location.
@ -173,7 +173,7 @@ public class HopTask extends BukkitRunnable {
}
}
private StorageContainerCache.Cache getFilterEndpoint(com.songoda.epichoppers.hopper.Hopper hopper) {
private StorageContainerCache.Cache getFilterEndpoint(com.craftaro.epichoppers.hopper.Hopper hopper) {
// Get endpoint location.
Location endPoint = hopper.getFilter().getEndPoint();
@ -199,7 +199,7 @@ public class HopTask extends BukkitRunnable {
return cache;
}
private void pullItemsFromContainers(com.songoda.epichoppers.hopper.Hopper toHopper, StorageContainerCache.Cache hopperCache, int maxToMove) {
private void pullItemsFromContainers(com.craftaro.epichoppers.hopper.Hopper toHopper, StorageContainerCache.Cache hopperCache, int maxToMove) {
// Grab items from the container above (includes storage/hopper minecarts, EpicFarming farm items and AdvancedChests chest)
// If the container above is a hopper, ignore it if it's pointing down
Block above = toHopper.getBlock().getRelative(BlockFace.UP);
@ -305,7 +305,7 @@ public class HopTask extends BukkitRunnable {
}
}
private void pushItemsIntoContainers(com.songoda.epichoppers.hopper.Hopper hopper, StorageContainerCache.Cache hopperCache, int maxToMove, Collection<Material> blockedMaterials, HopperDirection hopperDirection) {
private void pushItemsIntoContainers(com.craftaro.epichoppers.hopper.Hopper hopper, StorageContainerCache.Cache hopperCache, int maxToMove, Collection<Material> blockedMaterials, HopperDirection hopperDirection) {
// Filter target, if any
StorageContainerCache.Cache filterCache = getFilterEndpoint(hopper);
@ -395,7 +395,7 @@ public class HopTask extends BukkitRunnable {
}
}
private boolean tryPushCustomContainer(com.songoda.epichoppers.hopper.Hopper hopper,
private boolean tryPushCustomContainer(com.craftaro.epichoppers.hopper.Hopper hopper,
StorageContainerCache.Cache hopperCache,
CustomContainer container,
StorageContainerCache.Cache filterCache,
@ -442,7 +442,7 @@ public class HopTask extends BukkitRunnable {
return false;
}
private boolean tryPush(com.songoda.epichoppers.hopper.Hopper hopper,
private boolean tryPush(com.craftaro.epichoppers.hopper.Hopper hopper,
StorageContainerCache.Cache hopperCache,
StorageContainerCache.Cache targetCache,
StorageContainerCache.Cache filterCache,
@ -491,7 +491,7 @@ public class HopTask extends BukkitRunnable {
return false;
}
private void processVoidFilter(com.songoda.epichoppers.hopper.Hopper hopper, StorageContainerCache.Cache hopperCache, int maxToMove) {
private void processVoidFilter(com.craftaro.epichoppers.hopper.Hopper hopper, StorageContainerCache.Cache hopperCache, int maxToMove) {
// Loop over hopper inventory to process void filtering.
if (!hopper.getFilter().getVoidList().isEmpty()) {
ItemStack[] hopperContents = hopperCache.cachedInventory;

2
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/utils/HopperDirection.java → EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/utils/HopperDirection.java
View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.utils;
package com.craftaro.epichoppers.utils;
import org.bukkit.Location;
import org.bukkit.block.BlockFace;

2
EpicHoppers-Plugin/src/main/resources/plugin.yml
View File

@ -3,7 +3,7 @@ description: ${project.parent.description}
version: ${project.version}
api-version: 1.13
main: com.songoda.epichoppers.EpicHoppers
main: com.craftaro.epichoppers.EpicHoppers
softdepend:
- AdvancedChests
- ASkyBlock