Merge pull request #26 from unnamed/universal-sender

Make Sender annotation universal (BREAKING API)
FixedDev · Oct 29, 2023 · b493f45 · b493f45
2 parents 67dce01 + f9f04e0
commit b493f45
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 38 deletions.
diff --git a/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/BukkitModule.java b/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/BukkitModule.java
@@ -2,7 +2,7 @@
 
 import me.fixeddev.commandflow.annotated.part.AbstractModule;
 import me.fixeddev.commandflow.annotated.part.Key;
-import me.fixeddev.commandflow.bukkit.annotation.Sender;
+import me.fixeddev.commandflow.annotated.annotation.Sender;
 
 import org.bukkit.GameMode;
 import org.bukkit.OfflinePlayer;

diff --git a/Bungee/src/main/java/me/fixeddev/commandflow/bungee/annotation/Sender.java b/Bungee/src/main/java/me/fixeddev/commandflow/bungee/annotation/Sender.java
diff --git a/Bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/BungeeModule.java b/Bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/BungeeModule.java
@@ -1,8 +1,8 @@
 package me.fixeddev.commandflow.bungee.factory;
 
+import me.fixeddev.commandflow.annotated.annotation.Sender;
 import me.fixeddev.commandflow.annotated.part.AbstractModule;
 import me.fixeddev.commandflow.annotated.part.Key;
-import me.fixeddev.commandflow.bungee.annotation.Sender;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 

diff --git a/Discord/src/main/java/me/fixeddev/commandflow/discord/annotation/Sender.java b/Discord/src/main/java/me/fixeddev/commandflow/discord/annotation/Sender.java
diff --git a/Discord/src/main/java/me/fixeddev/commandflow/discord/factory/DiscordModule.java b/Discord/src/main/java/me/fixeddev/commandflow/discord/factory/DiscordModule.java
@@ -1,8 +1,8 @@
 package me.fixeddev.commandflow.discord.factory;
 
+import me.fixeddev.commandflow.annotated.annotation.Sender;
 import me.fixeddev.commandflow.annotated.part.AbstractModule;
 import me.fixeddev.commandflow.annotated.part.Key;
-import me.fixeddev.commandflow.discord.annotation.Sender;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.TextChannel;

diff --git a/...commandflow/bukkit/annotation/Sender.java → ...mandflow/annotated/annotation/Sender.java b/...commandflow/bukkit/annotation/Sender.java → ...mandflow/annotated/annotation/Sender.java
@@ -1,4 +1,4 @@
-package me.fixeddev.commandflow.bukkit.annotation;
+package me.fixeddev.commandflow.annotated.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/Velocity/src/main/java/me/fixeddev/commandflow/velocity/annotation/Sender.java b/Velocity/src/main/java/me/fixeddev/commandflow/velocity/annotation/Sender.java
diff --git a/Velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/VelocityModule.java b/Velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/VelocityModule.java
@@ -3,9 +3,9 @@
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ProxyServer;
+import me.fixeddev.commandflow.annotated.annotation.Sender;
 import me.fixeddev.commandflow.annotated.part.AbstractModule;
 import me.fixeddev.commandflow.annotated.part.Key;
-import me.fixeddev.commandflow.velocity.annotation.Sender;
 
 public class VelocityModule extends AbstractModule {