diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/pack/BukkitPackManager.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/pack/BukkitPackManager.java index d0134f042..0c6589d7a 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/pack/BukkitPackManager.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/pack/BukkitPackManager.java @@ -121,6 +121,11 @@ public class BukkitPackManager extends AbstractPackManager implements Listener { @EventHandler(priority = EventPriority.MONITOR) public void onAsyncResourcePackGenerate(AsyncResourcePackGenerateEvent event) { if (!Config.autoUpload()) return; + + } + + @Override + public void uploadResourcePack() { resourcePackHost().upload(Config.fileToUpload()).whenComplete((d, e) -> { if (e != null) { CraftEngine.instance().logger().warn("Failed to upload resource pack", e); diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/UploadPackCommand.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/UploadPackCommand.java index b7294437d..1450b37e9 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/UploadPackCommand.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/UploadPackCommand.java @@ -5,7 +5,6 @@ import net.momirealms.craftengine.bukkit.plugin.command.BukkitCommandFeature; import net.momirealms.craftengine.core.pack.host.ResourcePackHost; import net.momirealms.craftengine.core.plugin.CraftEngine; import net.momirealms.craftengine.core.plugin.command.CraftEngineCommandManager; -import net.momirealms.craftengine.core.plugin.config.Config; import net.momirealms.craftengine.core.plugin.locale.MessageConstants; import org.bukkit.command.CommandSender; import org.incendo.cloud.Command; @@ -23,7 +22,7 @@ public class UploadPackCommand extends BukkitCommandFeature { ResourcePackHost host = plugin().packManager().resourcePackHost(); if (host.canUpload()) { handleFeedback(context, MessageConstants.COMMAND_UPLOAD_ON_PROGRESS); - host.upload(Config.fileToUpload()); + plugin().packManager().uploadResourcePack(); } else { handleFeedback(context, MessageConstants.COMMAND_UPLOAD_FAILURE_NOT_SUPPORTED, Component.text(host.type().value())); } diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/PackManager.java b/core/src/main/java/net/momirealms/craftengine/core/pack/PackManager.java index ae3552373..54f85bd89 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/pack/PackManager.java +++ b/core/src/main/java/net/momirealms/craftengine/core/pack/PackManager.java @@ -36,4 +36,6 @@ public interface PackManager extends Manageable { Path resourcePackPath(); ResourcePackHost resourcePackHost(); + + void uploadResourcePack(); }