diff --git a/.checkstyle/suppressions.xml b/.checkstyle/suppressions.xml index e5ef7c23..77286cb1 100644 --- a/.checkstyle/suppressions.xml +++ b/.checkstyle/suppressions.xml @@ -3,7 +3,6 @@ - diff --git a/bukkit-example/build.gradle.kts b/bukkit-example/build.gradle.kts index c2e4d456..21b6ed61 100644 --- a/bukkit-example/build.gradle.kts +++ b/bukkit-example/build.gradle.kts @@ -1,10 +1,24 @@ plugins { id("apollo.base-conventions") + id("apollo.shadow-conventions") } dependencies { compileOnly(libs.bukkit.api) + // Used for Proto Implementation + api(libs.protobuf) + api(libs.protobuf.java.util) + + // Used for Proto & Json Implementation + api(libs.bundles.adventure) { + exclude("org.checkerframework") + exclude("net.kyori", "adventure-api") + exclude("net.kyori", "adventure-bom") + exclude("com.google.code.gson", "gson") + } + + // Used for API Implementation compileOnly(project(":extra:apollo-extra-adventure4")) compileOnly(project(path = ":apollo-api", configuration = "bukkit")) } diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/ApolloExamplePlugin.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/ApolloExamplePlugin.java index 56ec642c..1eaf60e0 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/ApolloExamplePlugin.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/ApolloExamplePlugin.java @@ -23,58 +23,136 @@ */ package com.lunarclient.apollo.example; -import com.lunarclient.apollo.event.EventBus; -import com.lunarclient.apollo.example.commands.BeamCommand; -import com.lunarclient.apollo.example.commands.BorderCommand; -import com.lunarclient.apollo.example.commands.ChatCommand; -import com.lunarclient.apollo.example.commands.ColoredFireCommand; -import com.lunarclient.apollo.example.commands.CombatCommand; -import com.lunarclient.apollo.example.commands.CooldownCommand; -import com.lunarclient.apollo.example.commands.EntityCommand; -import com.lunarclient.apollo.example.commands.GlowCommand; -import com.lunarclient.apollo.example.commands.HologramCommand; -import com.lunarclient.apollo.example.commands.LimbCommand; -import com.lunarclient.apollo.example.commands.ModSettingsCommand; -import com.lunarclient.apollo.example.commands.NametagCommand; -import com.lunarclient.apollo.example.commands.NickHiderCommand; -import com.lunarclient.apollo.example.commands.NotificationCommand; -import com.lunarclient.apollo.example.commands.RichPresenceCommand; -import com.lunarclient.apollo.example.commands.ServerRuleCommand; -import com.lunarclient.apollo.example.commands.StaffModCommand; -import com.lunarclient.apollo.example.commands.StopwatchCommand; -import com.lunarclient.apollo.example.commands.TeamCommand; -import com.lunarclient.apollo.example.commands.TebexCommand; -import com.lunarclient.apollo.example.commands.TitleCommand; -import com.lunarclient.apollo.example.commands.TntCountdownCommand; -import com.lunarclient.apollo.example.commands.TransferCommand; -import com.lunarclient.apollo.example.commands.VignetteCommand; -import com.lunarclient.apollo.example.commands.WaypointCommand; -import com.lunarclient.apollo.example.listeners.PlayerListener; -import com.lunarclient.apollo.example.modules.BeamExample; -import com.lunarclient.apollo.example.modules.BorderExample; -import com.lunarclient.apollo.example.modules.ChatExample; -import com.lunarclient.apollo.example.modules.ColoredFireExample; -import com.lunarclient.apollo.example.modules.CombatExample; -import com.lunarclient.apollo.example.modules.CooldownExample; -import com.lunarclient.apollo.example.modules.EntityExample; -import com.lunarclient.apollo.example.modules.GlowExample; -import com.lunarclient.apollo.example.modules.HologramExample; -import com.lunarclient.apollo.example.modules.LimbExample; -import com.lunarclient.apollo.example.modules.ModSettingsExample; -import com.lunarclient.apollo.example.modules.NametagExample; -import com.lunarclient.apollo.example.modules.NickHiderExample; -import com.lunarclient.apollo.example.modules.NotificationExample; -import com.lunarclient.apollo.example.modules.RichPresenceExample; -import com.lunarclient.apollo.example.modules.ServerRuleExample; -import com.lunarclient.apollo.example.modules.StaffModExample; -import com.lunarclient.apollo.example.modules.StopwatchExample; -import com.lunarclient.apollo.example.modules.TeamExample; -import com.lunarclient.apollo.example.modules.TebexExample; -import com.lunarclient.apollo.example.modules.TitleExample; -import com.lunarclient.apollo.example.modules.TntCountdownExample; -import com.lunarclient.apollo.example.modules.TransferExample; -import com.lunarclient.apollo.example.modules.VignetteExample; -import com.lunarclient.apollo.example.modules.WaypointExample; +import com.lunarclient.apollo.example.api.examples.BeamApiExample; +import com.lunarclient.apollo.example.api.examples.BorderApiExample; +import com.lunarclient.apollo.example.api.examples.ChatApiExample; +import com.lunarclient.apollo.example.api.examples.ColoredFireApiExample; +import com.lunarclient.apollo.example.api.examples.CombatApiExample; +import com.lunarclient.apollo.example.api.examples.CooldownApiExample; +import com.lunarclient.apollo.example.api.examples.EntityApiExample; +import com.lunarclient.apollo.example.api.examples.GlowApiExample; +import com.lunarclient.apollo.example.api.examples.HologramApiExample; +import com.lunarclient.apollo.example.api.examples.LimbApiExample; +import com.lunarclient.apollo.example.api.examples.ModSettingsApiExample; +import com.lunarclient.apollo.example.api.examples.NametagApiExample; +import com.lunarclient.apollo.example.api.examples.NickHiderApiExample; +import com.lunarclient.apollo.example.api.examples.NotificationApiExample; +import com.lunarclient.apollo.example.api.examples.RichPresenceApiExample; +import com.lunarclient.apollo.example.api.examples.ServerRuleApiExample; +import com.lunarclient.apollo.example.api.examples.StaffModApiExample; +import com.lunarclient.apollo.example.api.examples.StopwatchApiExample; +import com.lunarclient.apollo.example.api.examples.TeamApiExample; +import com.lunarclient.apollo.example.api.examples.TebexApiExample; +import com.lunarclient.apollo.example.api.examples.TitleApiExample; +import com.lunarclient.apollo.example.api.examples.TntCountdownApiExample; +import com.lunarclient.apollo.example.api.examples.TransferApiExample; +import com.lunarclient.apollo.example.api.examples.VignetteApiExample; +import com.lunarclient.apollo.example.api.examples.WaypointApiExample; +import com.lunarclient.apollo.example.api.listeners.ApolloPlayerApiListener; +import com.lunarclient.apollo.example.common.commands.SwitchCommand; +import com.lunarclient.apollo.example.common.commands.module.BeamCommand; +import com.lunarclient.apollo.example.common.commands.module.BorderCommand; +import com.lunarclient.apollo.example.common.commands.module.ChatCommand; +import com.lunarclient.apollo.example.common.commands.module.ColoredFireCommand; +import com.lunarclient.apollo.example.common.commands.module.CombatCommand; +import com.lunarclient.apollo.example.common.commands.module.CooldownCommand; +import com.lunarclient.apollo.example.common.commands.module.EntityCommand; +import com.lunarclient.apollo.example.common.commands.module.GlowCommand; +import com.lunarclient.apollo.example.common.commands.module.HologramCommand; +import com.lunarclient.apollo.example.common.commands.module.LimbCommand; +import com.lunarclient.apollo.example.common.commands.module.ModSettingsCommand; +import com.lunarclient.apollo.example.common.commands.module.NametagCommand; +import com.lunarclient.apollo.example.common.commands.module.NickHiderCommand; +import com.lunarclient.apollo.example.common.commands.module.NotificationCommand; +import com.lunarclient.apollo.example.common.commands.module.RichPresenceCommand; +import com.lunarclient.apollo.example.common.commands.module.ServerRuleCommand; +import com.lunarclient.apollo.example.common.commands.module.StaffModCommand; +import com.lunarclient.apollo.example.common.commands.module.StopwatchCommand; +import com.lunarclient.apollo.example.common.commands.module.TeamCommand; +import com.lunarclient.apollo.example.common.commands.module.TebexCommand; +import com.lunarclient.apollo.example.common.commands.module.TitleCommand; +import com.lunarclient.apollo.example.common.commands.module.TntCountdownCommand; +import com.lunarclient.apollo.example.common.commands.module.TransferCommand; +import com.lunarclient.apollo.example.common.commands.module.VignetteCommand; +import com.lunarclient.apollo.example.common.commands.module.WaypointCommand; +import com.lunarclient.apollo.example.common.modules.ApolloExampleType; +import com.lunarclient.apollo.example.common.modules.impl.BeamExample; +import com.lunarclient.apollo.example.common.modules.impl.BorderExample; +import com.lunarclient.apollo.example.common.modules.impl.ChatExample; +import com.lunarclient.apollo.example.common.modules.impl.ColoredFireExample; +import com.lunarclient.apollo.example.common.modules.impl.CombatExample; +import com.lunarclient.apollo.example.common.modules.impl.CooldownExample; +import com.lunarclient.apollo.example.common.modules.impl.EntityExample; +import com.lunarclient.apollo.example.common.modules.impl.GlowExample; +import com.lunarclient.apollo.example.common.modules.impl.HologramExample; +import com.lunarclient.apollo.example.common.modules.impl.LimbExample; +import com.lunarclient.apollo.example.common.modules.impl.ModSettingsExample; +import com.lunarclient.apollo.example.common.modules.impl.NametagExample; +import com.lunarclient.apollo.example.common.modules.impl.NickHiderExample; +import com.lunarclient.apollo.example.common.modules.impl.NotificationExample; +import com.lunarclient.apollo.example.common.modules.impl.RichPresenceExample; +import com.lunarclient.apollo.example.common.modules.impl.ServerRuleExample; +import com.lunarclient.apollo.example.common.modules.impl.StaffModExample; +import com.lunarclient.apollo.example.common.modules.impl.StopwatchExample; +import com.lunarclient.apollo.example.common.modules.impl.TeamExample; +import com.lunarclient.apollo.example.common.modules.impl.TebexExample; +import com.lunarclient.apollo.example.common.modules.impl.TitleExample; +import com.lunarclient.apollo.example.common.modules.impl.TntCountdownExample; +import com.lunarclient.apollo.example.common.modules.impl.TransferExample; +import com.lunarclient.apollo.example.common.modules.impl.VignetteExample; +import com.lunarclient.apollo.example.common.modules.impl.WaypointExample; +import com.lunarclient.apollo.example.json.examples.BeamJsonExample; +import com.lunarclient.apollo.example.json.examples.BorderJsonExample; +import com.lunarclient.apollo.example.json.examples.ChatJsonExample; +import com.lunarclient.apollo.example.json.examples.ColoredFireJsonExample; +import com.lunarclient.apollo.example.json.examples.CombatJsonExample; +import com.lunarclient.apollo.example.json.examples.CooldownJsonExample; +import com.lunarclient.apollo.example.json.examples.EntityJsonExample; +import com.lunarclient.apollo.example.json.examples.GlowJsonExample; +import com.lunarclient.apollo.example.json.examples.HologramJsonExample; +import com.lunarclient.apollo.example.json.examples.LimbJsonExample; +import com.lunarclient.apollo.example.json.examples.ModSettingsJsonExample; +import com.lunarclient.apollo.example.json.examples.NametagJsonExample; +import com.lunarclient.apollo.example.json.examples.NickHiderJsonExample; +import com.lunarclient.apollo.example.json.examples.NotificationJsonExample; +import com.lunarclient.apollo.example.json.examples.RichPresenceJsonExample; +import com.lunarclient.apollo.example.json.examples.ServerRuleJsonExample; +import com.lunarclient.apollo.example.json.examples.StaffModJsonExample; +import com.lunarclient.apollo.example.json.examples.StopwatchJsonExample; +import com.lunarclient.apollo.example.json.examples.TeamJsonExample; +import com.lunarclient.apollo.example.json.examples.TebexJsonExample; +import com.lunarclient.apollo.example.json.examples.TitleJsonExample; +import com.lunarclient.apollo.example.json.examples.TntCountdownJsonExample; +import com.lunarclient.apollo.example.json.examples.TransferJsonExample; +import com.lunarclient.apollo.example.json.examples.VignetteJsonExample; +import com.lunarclient.apollo.example.json.examples.WaypointJsonExample; +import com.lunarclient.apollo.example.json.listeners.ApolloPlayerJsonListener; +import com.lunarclient.apollo.example.proto.examples.BeamProtoExample; +import com.lunarclient.apollo.example.proto.examples.BorderProtoExample; +import com.lunarclient.apollo.example.proto.examples.ChatProtoExample; +import com.lunarclient.apollo.example.proto.examples.ColoredFireProtoExample; +import com.lunarclient.apollo.example.proto.examples.CombatProtoExample; +import com.lunarclient.apollo.example.proto.examples.CooldownProtoExample; +import com.lunarclient.apollo.example.proto.examples.EntityProtoExample; +import com.lunarclient.apollo.example.proto.examples.GlowProtoExample; +import com.lunarclient.apollo.example.proto.examples.HologramProtoExample; +import com.lunarclient.apollo.example.proto.examples.LimbProtoExample; +import com.lunarclient.apollo.example.proto.examples.ModSettingsProtoExample; +import com.lunarclient.apollo.example.proto.examples.NametagProtoExample; +import com.lunarclient.apollo.example.proto.examples.NickHiderProtoExample; +import com.lunarclient.apollo.example.proto.examples.NotificationProtoExample; +import com.lunarclient.apollo.example.proto.examples.RichPresenceProtoExample; +import com.lunarclient.apollo.example.proto.examples.ServerRuleProtoExample; +import com.lunarclient.apollo.example.proto.examples.StaffModProtoExample; +import com.lunarclient.apollo.example.proto.examples.StopwatchProtoExample; +import com.lunarclient.apollo.example.proto.examples.TeamProtoExample; +import com.lunarclient.apollo.example.proto.examples.TebexProtoExample; +import com.lunarclient.apollo.example.proto.examples.TitleProtoExample; +import com.lunarclient.apollo.example.proto.examples.TntCountdownProtoExample; +import com.lunarclient.apollo.example.proto.examples.TransferProtoExample; +import com.lunarclient.apollo.example.proto.examples.VignetteProtoExample; +import com.lunarclient.apollo.example.proto.examples.WaypointProtoExample; +import com.lunarclient.apollo.example.proto.listeners.ApolloPlayerProtoListener; import lombok.Getter; import org.bukkit.plugin.java.JavaPlugin; @@ -84,6 +162,12 @@ public class ApolloExamplePlugin extends JavaPlugin { @Getter private static ApolloExamplePlugin plugin; + public static ApolloExampleType TYPE; + + private ApolloPlayerApiListener playerApiListener; + private ApolloPlayerProtoListener playerProtoListener; + private ApolloPlayerJsonListener playerJsonListener; + private BeamExample beamExample; private BorderExample borderExample; private ChatExample chatExample; @@ -114,9 +198,8 @@ public class ApolloExamplePlugin extends JavaPlugin { public void onEnable() { plugin = this; - this.registerModuleExamples(); + this.changeImplementationType(ApolloExampleType.JSON); this.registerCommands(); - this.registerListeners(); } @Override @@ -124,35 +207,9 @@ public void onDisable() { } - private void registerModuleExamples() { - this.beamExample = new BeamExample(); - this.borderExample = new BorderExample(); - this.chatExample = new ChatExample(); - this.coloredFireExample = new ColoredFireExample(); - this.combatExample = new CombatExample(); - this.cooldownExample = new CooldownExample(); - this.entityExample = new EntityExample(); - this.glowExample = new GlowExample(); - this.hologramExample = new HologramExample(); - this.limbExample = new LimbExample(); - this.modSettingsExample = new ModSettingsExample(); - this.nametagExample = new NametagExample(); - this.nickHiderExample = new NickHiderExample(); - this.notificationExample = new NotificationExample(); - this.richPresenceExample = new RichPresenceExample(); - this.serverRuleExample = new ServerRuleExample(); - this.staffModExample = new StaffModExample(); - this.stopwatchExample = new StopwatchExample(); - this.teamExample = new TeamExample(); - this.tebexExample = new TebexExample(); - this.titleExample = new TitleExample(); - this.tntCountdownExample = new TntCountdownExample(); - this.transferExample = new TransferExample(); - this.vignetteExample = new VignetteExample(); - this.waypointExample = new WaypointExample(); - } - private void registerCommands() { + this.getCommand("switch").setExecutor(new SwitchCommand()); + this.getCommand("beam").setExecutor(new BeamCommand()); this.getCommand("border").setExecutor(new BorderCommand()); this.getCommand("chat").setExecutor(new ChatCommand()); @@ -180,8 +237,136 @@ private void registerCommands() { this.getCommand("waypoint").setExecutor(new WaypointCommand()); } + public void changeImplementationType(ApolloExampleType type) { + TYPE = type; + + if (this.playerApiListener != null) { + this.playerApiListener.disable(); + this.playerApiListener = null; + } + + if (this.playerProtoListener != null) { + this.playerProtoListener.disable(); + this.playerProtoListener = null; + } + + if (this.playerJsonListener != null) { + this.playerJsonListener.disable(); + this.playerJsonListener = null; + } + + this.registerModuleExamples(); + this.registerListeners(); + } + + private void registerModuleExamples() { + switch (TYPE) { + case API: { + this.beamExample = new BeamApiExample(); + this.borderExample = new BorderApiExample(); + this.chatExample = new ChatApiExample(); + this.coloredFireExample = new ColoredFireApiExample(); + this.combatExample = new CombatApiExample(); + this.cooldownExample = new CooldownApiExample(); + this.entityExample = new EntityApiExample(); + this.glowExample = new GlowApiExample(); + this.hologramExample = new HologramApiExample(); + this.limbExample = new LimbApiExample(); + this.modSettingsExample = new ModSettingsApiExample(); + this.nametagExample = new NametagApiExample(); + this.nickHiderExample = new NickHiderApiExample(); + this.notificationExample = new NotificationApiExample(); + this.richPresenceExample = new RichPresenceApiExample(); + this.serverRuleExample = new ServerRuleApiExample(); + this.staffModExample = new StaffModApiExample(); + this.stopwatchExample = new StopwatchApiExample(); + this.teamExample = new TeamApiExample(); + this.tebexExample = new TebexApiExample(); + this.titleExample = new TitleApiExample(); + this.tntCountdownExample = new TntCountdownApiExample(); + this.transferExample = new TransferApiExample(); + this.vignetteExample = new VignetteApiExample(); + this.waypointExample = new WaypointApiExample(); + break; + } + + case JSON: { + this.beamExample = new BeamJsonExample(); + this.borderExample = new BorderJsonExample(); + this.chatExample = new ChatJsonExample(); + this.coloredFireExample = new ColoredFireJsonExample(); + this.combatExample = new CombatJsonExample(); + this.cooldownExample = new CooldownJsonExample(); + this.entityExample = new EntityJsonExample(); + this.glowExample = new GlowJsonExample(); + this.hologramExample = new HologramJsonExample(); + this.limbExample = new LimbJsonExample(); + this.modSettingsExample = new ModSettingsJsonExample(); + this.nametagExample = new NametagJsonExample(); + this.nickHiderExample = new NickHiderJsonExample(); + this.notificationExample = new NotificationJsonExample(); + this.richPresenceExample = new RichPresenceJsonExample(); + this.serverRuleExample = new ServerRuleJsonExample(); + this.staffModExample = new StaffModJsonExample(); + this.stopwatchExample = new StopwatchJsonExample(); + this.teamExample = new TeamJsonExample(); + this.tebexExample = new TebexJsonExample(); + this.titleExample = new TitleJsonExample(); + this.tntCountdownExample = new TntCountdownJsonExample(); + this.transferExample = new TransferJsonExample(); + this.vignetteExample = new VignetteJsonExample(); + this.waypointExample = new WaypointJsonExample(); + break; + } + + case PROTO: { + this.beamExample = new BeamProtoExample(); + this.borderExample = new BorderProtoExample(); + this.chatExample = new ChatProtoExample(); + this.coloredFireExample = new ColoredFireProtoExample(); + this.combatExample = new CombatProtoExample(); + this.cooldownExample = new CooldownProtoExample(); + this.entityExample = new EntityProtoExample(); + this.glowExample = new GlowProtoExample(); + this.hologramExample = new HologramProtoExample(); + this.limbExample = new LimbProtoExample(); + this.modSettingsExample = new ModSettingsProtoExample(); + this.nametagExample = new NametagProtoExample(); + this.nickHiderExample = new NickHiderProtoExample(); + this.notificationExample = new NotificationProtoExample(); + this.richPresenceExample = new RichPresenceProtoExample(); + this.serverRuleExample = new ServerRuleProtoExample(); + this.staffModExample = new StaffModProtoExample(); + this.stopwatchExample = new StopwatchProtoExample(); + this.teamExample = new TeamProtoExample(); + this.tebexExample = new TebexProtoExample(); + this.titleExample = new TitleProtoExample(); + this.tntCountdownExample = new TntCountdownProtoExample(); + this.transferExample = new TransferProtoExample(); + this.vignetteExample = new VignetteProtoExample(); + this.waypointExample = new WaypointProtoExample(); + break; + } + } + } + private void registerListeners() { - EventBus.getBus().register(new PlayerListener()); + switch (TYPE) { + case API: { + this.playerApiListener = new ApolloPlayerApiListener(this); + break; + } + + case JSON: { + this.playerJsonListener = new ApolloPlayerJsonListener(this); + break; + } + + case PROTO: { + this.playerProtoListener = new ApolloPlayerProtoListener(this); + break; + } + } } } diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/ApolloGeneralExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/ApolloGeneralExample.java similarity index 98% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/ApolloGeneralExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/ApolloGeneralExample.java index ec1fa966..1be6f101 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/ApolloGeneralExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/ApolloGeneralExample.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example; +package com.lunarclient.apollo.example.api; import com.lunarclient.apollo.Apollo; import com.lunarclient.apollo.module.border.BorderModule; diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/BeamExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/BeamApiExample.java similarity index 92% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/BeamExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/BeamApiExample.java index 0fb01c07..c0abd96a 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/BeamExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/BeamApiExample.java @@ -21,10 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.lunarclient.apollo.Apollo; import com.lunarclient.apollo.common.location.ApolloBlockLocation; +import com.lunarclient.apollo.example.common.modules.impl.BeamExample; import com.lunarclient.apollo.module.beam.Beam; import com.lunarclient.apollo.module.beam.BeamModule; import com.lunarclient.apollo.player.ApolloPlayer; @@ -32,10 +33,11 @@ import java.util.Optional; import org.bukkit.entity.Player; -public class BeamExample { +public class BeamApiExample extends BeamExample { private final BeamModule beamModule = Apollo.getModuleManager().getModule(BeamModule.class); + @Override public void displayBeamExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); @@ -55,11 +57,13 @@ public void displayBeamExample(Player viewer) { }); } + @Override public void removeBeamExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(apolloPlayer -> this.beamModule.removeBeam(apolloPlayer, "spawn-beacon")); } + @Override public void resetBeamsExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(this.beamModule::resetBeams); diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/BorderExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/BorderApiExample.java similarity index 93% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/BorderExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/BorderApiExample.java index 6ecf854e..1df60349 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/BorderExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/BorderApiExample.java @@ -21,10 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.lunarclient.apollo.Apollo; import com.lunarclient.apollo.common.cuboid.Cuboid2D; +import com.lunarclient.apollo.example.common.modules.impl.BorderExample; import com.lunarclient.apollo.module.border.Border; import com.lunarclient.apollo.module.border.BorderModule; import com.lunarclient.apollo.player.ApolloPlayer; @@ -32,10 +33,11 @@ import java.util.Optional; import org.bukkit.entity.Player; -public class BorderExample { +public class BorderApiExample extends BorderExample { private final BorderModule borderModule = Apollo.getModuleManager().getModule(BorderModule.class); + @Override public void displayBorderExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); @@ -60,11 +62,13 @@ public void displayBorderExample(Player viewer) { }); } + @Override public void removeBorderExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(apolloPlayer -> this.borderModule.removeBorder(apolloPlayer, "pvp-tagged-spawn")); } + @Override public void resetBordersExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(this.borderModule::resetBorders); diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/ChatExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/ChatApiExample.java similarity index 91% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/ChatExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/ChatApiExample.java index 05cda56b..25e4a776 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/ChatExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/ChatApiExample.java @@ -21,20 +21,22 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.lunarclient.apollo.Apollo; +import com.lunarclient.apollo.example.common.modules.impl.ChatExample; import com.lunarclient.apollo.module.chat.ChatModule; import com.lunarclient.apollo.recipients.Recipients; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; -public class ChatExample { +public class ChatApiExample extends ChatExample { private final ChatModule chatModule = Apollo.getModuleManager().getModule(ChatModule.class); private int countdown = 5; + @Override public void displayLiveChatMessageExample() { this.chatModule.displayLiveChatMessage(Recipients.ofEveryone(), Component.text("Game starting in ", NamedTextColor.GREEN) @@ -47,6 +49,7 @@ public void displayLiveChatMessageExample() { } } + @Override public void removeLiveChatMessageExample() { this.chatModule.removeLiveChatMessage(Recipients.ofEveryone(), 13); } diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/ColoredFireExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/ColoredFireApiExample.java similarity index 90% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/ColoredFireExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/ColoredFireApiExample.java index 8fe7918c..bfc16dde 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/ColoredFireExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/ColoredFireApiExample.java @@ -21,9 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.lunarclient.apollo.Apollo; +import com.lunarclient.apollo.example.common.modules.impl.ColoredFireExample; import com.lunarclient.apollo.module.coloredfire.ColoredFireModule; import com.lunarclient.apollo.player.ApolloPlayer; import com.lunarclient.apollo.recipients.Recipients; @@ -32,10 +33,11 @@ import java.util.UUID; import org.bukkit.entity.Player; -public class ColoredFireExample { +public class ColoredFireApiExample extends ColoredFireExample { private final ColoredFireModule coloredFireModule = Apollo.getModuleManager().getModule(ColoredFireModule.class); + @Override public void overrideColoredFireExample(UUID burningPlayer) { this.coloredFireModule.overrideColoredFire(Recipients.ofEveryone(), burningPlayer, @@ -43,10 +45,12 @@ public void overrideColoredFireExample(UUID burningPlayer) { ); } + @Override public void resetColoredFireExample(UUID burningPlayer) { this.coloredFireModule.resetColoredFire(Recipients.ofEveryone(), burningPlayer); } + @Override public void resetColoredFiresExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(this.coloredFireModule::resetColoredFires); diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/CombatExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/CombatApiExample.java similarity index 88% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/CombatExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/CombatApiExample.java index 5f811a3a..7d48b4ca 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/CombatExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/CombatApiExample.java @@ -21,15 +21,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.lunarclient.apollo.Apollo; +import com.lunarclient.apollo.example.common.modules.impl.CombatExample; import com.lunarclient.apollo.module.combat.CombatModule; -public class CombatExample { +public class CombatApiExample extends CombatExample { private final CombatModule combatModule = Apollo.getModuleManager().getModule(CombatModule.class); + @Override public void setDisableMissPenalty(boolean value) { this.combatModule.getOptions().set(CombatModule.DISABLE_MISS_PENALTY, value); } diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/CooldownExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/CooldownApiExample.java similarity index 93% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/CooldownExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/CooldownApiExample.java index e01072a3..9c44d982 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/CooldownExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/CooldownApiExample.java @@ -21,11 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.lunarclient.apollo.Apollo; import com.lunarclient.apollo.common.icon.ItemStackIcon; import com.lunarclient.apollo.common.icon.SimpleResourceLocationIcon; +import com.lunarclient.apollo.example.common.modules.impl.CooldownExample; import com.lunarclient.apollo.module.cooldown.Cooldown; import com.lunarclient.apollo.module.cooldown.CooldownModule; import com.lunarclient.apollo.player.ApolloPlayer; @@ -33,10 +34,11 @@ import java.util.Optional; import org.bukkit.entity.Player; -public class CooldownExample { +public class CooldownApiExample extends CooldownExample { private final CooldownModule cooldownModule = Apollo.getModuleManager().getModule(CooldownModule.class); + @Override public void displayCooldownItemExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); @@ -53,6 +55,7 @@ public void displayCooldownItemExample(Player viewer) { }); } + @Override public void displayCooldownResourceExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); @@ -70,6 +73,7 @@ public void displayCooldownResourceExample(Player viewer) { }); } + @Override public void removeCooldownExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); @@ -79,6 +83,7 @@ public void removeCooldownExample(Player viewer) { }); } + @Override public void resetCooldownsExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(this.cooldownModule::resetCooldowns); diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/EntityExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/EntityApiExample.java similarity index 94% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/EntityExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/EntityApiExample.java index 3d0cece2..4b69d44b 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/EntityExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/EntityApiExample.java @@ -21,10 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.lunarclient.apollo.Apollo; import com.lunarclient.apollo.common.ApolloEntity; +import com.lunarclient.apollo.example.common.modules.impl.EntityExample; import com.lunarclient.apollo.module.entity.EntityModule; import com.lunarclient.apollo.player.ApolloPlayer; import java.util.List; @@ -34,10 +35,11 @@ import org.bukkit.entity.Player; import org.bukkit.entity.Sheep; -public class EntityExample { +public class EntityApiExample extends EntityExample { private final EntityModule entityModule = Apollo.getModuleManager().getModule(EntityModule.class); + @Override public void overrideRainbowSheepExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); @@ -51,6 +53,7 @@ public void overrideRainbowSheepExample(Player viewer) { }); } + @Override public void resetRainbowSheepExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); @@ -64,6 +67,7 @@ public void resetRainbowSheepExample(Player viewer) { }); } + @Override public void flipEntityExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); @@ -79,6 +83,7 @@ public void flipEntityExample(Player viewer) { }); } + @Override public void resetFlippedEntityExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/GlowExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/GlowApiExample.java similarity index 90% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/GlowExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/GlowApiExample.java index a3ff090e..a42af2c3 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/GlowExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/GlowApiExample.java @@ -21,9 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.lunarclient.apollo.Apollo; +import com.lunarclient.apollo.example.common.modules.impl.GlowExample; import com.lunarclient.apollo.module.glow.GlowModule; import com.lunarclient.apollo.player.ApolloPlayer; import com.lunarclient.apollo.recipients.Recipients; @@ -32,10 +33,11 @@ import java.util.UUID; import org.bukkit.entity.Player; -public class GlowExample { +public class GlowApiExample extends GlowExample { private final GlowModule glowModule = Apollo.getModuleManager().getModule(GlowModule.class); + @Override public void overrideGlowEffectExample(UUID glowingPlayer) { this.glowModule.overrideGlow(Recipients.ofEveryone(), glowingPlayer, @@ -43,10 +45,12 @@ public void overrideGlowEffectExample(UUID glowingPlayer) { ); } + @Override public void resetGlowEffectExample(UUID glowingPlayer) { this.glowModule.resetGlow(Recipients.ofEveryone(), glowingPlayer); } + @Override public void resetGlowEffectsExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(this.glowModule::resetGlow); diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/HologramExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/HologramApiExample.java similarity index 93% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/HologramExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/HologramApiExample.java index e58a15da..fd71257f 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/HologramExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/HologramApiExample.java @@ -21,11 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.google.common.collect.Lists; import com.lunarclient.apollo.Apollo; import com.lunarclient.apollo.common.location.ApolloLocation; +import com.lunarclient.apollo.example.common.modules.impl.HologramExample; import com.lunarclient.apollo.module.hologram.Hologram; import com.lunarclient.apollo.module.hologram.HologramModule; import com.lunarclient.apollo.player.ApolloPlayer; @@ -36,10 +37,11 @@ import net.kyori.adventure.text.format.TextDecoration; import org.bukkit.entity.Player; -public class HologramExample { +public class HologramApiExample extends HologramExample { private final HologramModule hologramModule = Apollo.getModuleManager().getModule(HologramModule.class); + @Override public void displayHologramExample() { this.hologramModule.displayHologram(Recipients.ofEveryone(), Hologram.builder() .id("welcome-hologram") @@ -66,10 +68,12 @@ public void displayHologramExample() { ); } + @Override public void removeHologramExample() { this.hologramModule.removeHologram(Recipients.ofEveryone(), "welcome-hologram"); } + @Override public void resetHologramsExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(this.hologramModule::resetHolograms); diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/LimbExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/LimbApiExample.java similarity index 93% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/LimbExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/LimbApiExample.java index 7f67ba80..a4704fda 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/LimbExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/LimbApiExample.java @@ -21,9 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.lunarclient.apollo.Apollo; +import com.lunarclient.apollo.example.common.modules.impl.LimbExample; import com.lunarclient.apollo.module.limb.ArmorPiece; import com.lunarclient.apollo.module.limb.BodyPart; import com.lunarclient.apollo.module.limb.LimbModule; @@ -32,10 +33,11 @@ import java.util.Optional; import org.bukkit.entity.Player; -public class LimbExample { +public class LimbApiExample extends LimbExample { private final LimbModule limbModule = Apollo.getModuleManager().getModule(LimbModule.class); + @Override public void hideArmorExample(Player viewer, Player target) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); @@ -47,6 +49,7 @@ public void hideArmorExample(Player viewer, Player target) { }); } + @Override public void resetArmorExample(Player viewer, Player target) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); @@ -58,6 +61,7 @@ public void resetArmorExample(Player viewer, Player target) { }); } + @Override public void hideBodyExample(Player viewer, Player target) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); @@ -69,6 +73,7 @@ public void hideBodyExample(Player viewer, Player target) { }); } + @Override public void resetBodyExample(Player viewer, Player target) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/ModSettingsExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/ModSettingsApiExample.java similarity index 91% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/ModSettingsExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/ModSettingsApiExample.java index 74af2611..8127ce65 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/ModSettingsExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/ModSettingsApiExample.java @@ -21,30 +21,34 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.lunarclient.apollo.Apollo; +import com.lunarclient.apollo.example.common.modules.impl.ModSettingsExample; import com.lunarclient.apollo.mods.impl.ModLighting; import com.lunarclient.apollo.module.modsetting.ModSettingModule; import com.lunarclient.apollo.player.ApolloPlayer; import java.util.Optional; import org.bukkit.entity.Player; -public class ModSettingsExample { +public class ModSettingsApiExample extends ModSettingsExample { private final ModSettingModule modSettingModule = Apollo.getModuleManager().getModule(ModSettingModule.class); + @Override public void disableLightningModExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(apolloPlayer -> this.modSettingModule.getOptions().set(apolloPlayer, ModLighting.ENABLED, false)); } + @Override public void rollbackLightningModEnabledState(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); // To rollback the server override value of the setting, simply set the value to "null" apolloPlayerOpt.ifPresent(apolloPlayer -> this.modSettingModule.getOptions().set(apolloPlayer, ModLighting.ENABLED, null)); } + @Override public void broadcastDisableLightningModExample() { this.modSettingModule.getOptions().set(ModLighting.ENABLED, false); } diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/NametagExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/NametagApiExample.java similarity index 92% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/NametagExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/NametagApiExample.java index d58940c2..b6bcd544 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/NametagExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/NametagApiExample.java @@ -21,10 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.google.common.collect.Lists; import com.lunarclient.apollo.Apollo; +import com.lunarclient.apollo.example.common.modules.impl.NametagExample; import com.lunarclient.apollo.module.nametag.Nametag; import com.lunarclient.apollo.module.nametag.NametagModule; import com.lunarclient.apollo.player.ApolloPlayer; @@ -35,10 +36,11 @@ import net.kyori.adventure.text.format.TextDecoration; import org.bukkit.entity.Player; -public class NametagExample { +public class NametagApiExample extends NametagExample { private final NametagModule nametagModule = Apollo.getModuleManager().getModule(NametagModule.class); + @Override public void overrideNametagExample(Player target) { this.nametagModule.overrideNametag(Recipients.ofEveryone(), target.getUniqueId(), Nametag.builder() .lines(Lists.newArrayList( @@ -56,10 +58,12 @@ public void overrideNametagExample(Player target) { ); } + @Override public void resetNametagExample(Player target) { this.nametagModule.resetNametag(Recipients.ofEveryone(), target.getUniqueId()); } + @Override public void resetNametagsExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(this.nametagModule::resetNametags); diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/NickHiderExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/NickHiderApiExample.java similarity index 90% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/NickHiderExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/NickHiderApiExample.java index 76d854fe..30341d00 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/NickHiderExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/NickHiderApiExample.java @@ -21,23 +21,26 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.lunarclient.apollo.Apollo; +import com.lunarclient.apollo.example.common.modules.impl.NickHiderExample; import com.lunarclient.apollo.module.nickhider.NickHiderModule; import com.lunarclient.apollo.player.ApolloPlayer; import java.util.Optional; import org.bukkit.entity.Player; -public class NickHiderExample { +public class NickHiderApiExample extends NickHiderExample { private final NickHiderModule nickHiderModule = Apollo.getModuleManager().getModule(NickHiderModule.class); + @Override public void overrideNickExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(apolloPlayer -> this.nickHiderModule.overrideNick(apolloPlayer, "Notch")); } + @Override public void resetNickExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(this.nickHiderModule::resetNick); diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/NotificationExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/NotificationApiExample.java similarity index 92% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/NotificationExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/NotificationApiExample.java index cf079f1c..60c9189e 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/NotificationExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/NotificationApiExample.java @@ -21,9 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.lunarclient.apollo.Apollo; +import com.lunarclient.apollo.example.common.modules.impl.NotificationExample; import com.lunarclient.apollo.module.notification.Notification; import com.lunarclient.apollo.module.notification.NotificationModule; import com.lunarclient.apollo.player.ApolloPlayer; @@ -33,10 +34,11 @@ import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.entity.Player; -public class NotificationExample { +public class NotificationApiExample extends NotificationExample { private final NotificationModule notificationModule = Apollo.getModuleManager().getModule(NotificationModule.class); + @Override public void displayNotificationExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); @@ -55,6 +57,7 @@ public void displayNotificationExample(Player viewer) { }); } + @Override public void resetNotificationsExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(this.notificationModule::resetNotifications); diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/RichPresenceExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/RichPresenceApiExample.java similarity index 91% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/RichPresenceExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/RichPresenceApiExample.java index a4716836..53673969 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/RichPresenceExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/RichPresenceApiExample.java @@ -21,19 +21,21 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.lunarclient.apollo.Apollo; +import com.lunarclient.apollo.example.common.modules.impl.RichPresenceExample; import com.lunarclient.apollo.module.richpresence.RichPresenceModule; import com.lunarclient.apollo.module.richpresence.ServerRichPresence; import com.lunarclient.apollo.player.ApolloPlayer; import java.util.Optional; import org.bukkit.entity.Player; -public class RichPresenceExample { +public class RichPresenceApiExample extends RichPresenceExample { private final RichPresenceModule richPresenceModule = Apollo.getModuleManager().getModule(RichPresenceModule.class); + @Override public void overrideServerRichPresenceExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); @@ -52,6 +54,7 @@ public void overrideServerRichPresenceExample(Player viewer) { }); } + @Override public void resetServerRichPresenceExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(this.richPresenceModule::resetServerRichPresence); diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/ServerRuleExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/ServerRuleApiExample.java similarity index 90% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/ServerRuleExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/ServerRuleApiExample.java index c6ed1b66..7f1e7a87 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/ServerRuleExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/ServerRuleApiExample.java @@ -21,22 +21,25 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.lunarclient.apollo.Apollo; +import com.lunarclient.apollo.example.common.modules.impl.ServerRuleExample; import com.lunarclient.apollo.module.serverrule.ServerRuleModule; import com.lunarclient.apollo.player.ApolloPlayer; import java.util.Optional; import org.bukkit.entity.Player; -public class ServerRuleExample { +public class ServerRuleApiExample extends ServerRuleExample { private final ServerRuleModule serverRuleModule = Apollo.getModuleManager().getModule(ServerRuleModule.class); + @Override public void setAntiPortalTraps(boolean value) { this.serverRuleModule.getOptions().set(ServerRuleModule.ANTI_PORTAL_TRAPS, value); } + @Override public void setOverrideNametagRenderDistance(Player viewer, boolean value) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); @@ -46,6 +49,7 @@ public void setOverrideNametagRenderDistance(Player viewer, boolean value) { }); } + @Override public void setNametagRenderDistanceExample(int value) { this.serverRuleModule.getOptions().set(ServerRuleModule.NAMETAG_RENDER_DISTANCE, value); } diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/StaffModExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/StaffModApiExample.java similarity index 91% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/StaffModExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/StaffModApiExample.java index 448084f3..67db3782 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/StaffModExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/StaffModApiExample.java @@ -21,9 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.lunarclient.apollo.Apollo; +import com.lunarclient.apollo.example.common.modules.impl.StaffModExample; import com.lunarclient.apollo.module.staffmod.StaffMod; import com.lunarclient.apollo.module.staffmod.StaffModModule; import com.lunarclient.apollo.player.ApolloPlayer; @@ -31,10 +32,11 @@ import java.util.Optional; import org.bukkit.entity.Player; -public class StaffModExample { +public class StaffModApiExample extends StaffModExample { private final StaffModModule staffModModule = Apollo.getModuleManager().getModule(StaffModModule.class); + @Override public void enableStaffModsExample(Player viewer) { if (!viewer.hasPermission("apollo.staff")) { return; @@ -44,6 +46,7 @@ public void enableStaffModsExample(Player viewer) { apolloPlayerOpt.ifPresent(apolloPlayer -> this.staffModModule.enableStaffMods(apolloPlayer, Collections.singletonList(StaffMod.XRAY))); } + @Override public void disableStaffModsExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(apolloPlayer -> this.staffModModule.disableStaffMods(apolloPlayer, Collections.singletonList(StaffMod.XRAY))); diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/StopwatchExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/StopwatchApiExample.java similarity index 90% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/StopwatchExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/StopwatchApiExample.java index 2668ce1c..1a5bd858 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/StopwatchExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/StopwatchApiExample.java @@ -21,28 +21,32 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.lunarclient.apollo.Apollo; +import com.lunarclient.apollo.example.common.modules.impl.StopwatchExample; import com.lunarclient.apollo.module.stopwatch.StopwatchModule; import com.lunarclient.apollo.player.ApolloPlayer; import java.util.Optional; import org.bukkit.entity.Player; -public class StopwatchExample { +public class StopwatchApiExample extends StopwatchExample { private final StopwatchModule stopwatchModule = Apollo.getModuleManager().getModule(StopwatchModule.class); + @Override public void startStopwatchExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(this.stopwatchModule::startStopwatch); } + @Override public void stopStopwatchExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(this.stopwatchModule::stopStopwatch); } + @Override public void resetStopwatchExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(this.stopwatchModule::resetStopwatch); diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/TeamExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/TeamApiExample.java similarity index 68% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/TeamExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/TeamApiExample.java index 0280daac..943099be 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/TeamExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/TeamApiExample.java @@ -21,13 +21,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.lunarclient.apollo.Apollo; import com.lunarclient.apollo.common.location.ApolloLocation; import com.lunarclient.apollo.example.ApolloExamplePlugin; +import com.lunarclient.apollo.example.common.modules.impl.TeamExample; import com.lunarclient.apollo.module.team.TeamMember; import com.lunarclient.apollo.module.team.TeamModule; import java.awt.Color; @@ -47,14 +48,14 @@ import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.scheduler.BukkitRunnable; -public class TeamExample implements Listener { +public class TeamApiExample extends TeamExample implements Listener { private final TeamModule teamModule = Apollo.getModuleManager().getModule(TeamModule.class); private final Map teamsByTeamId = Maps.newHashMap(); private final Map teamsByPlayerUuid = Maps.newHashMap(); - public TeamExample() { + public TeamApiExample() { new TeamUpdateTask(); Bukkit.getPluginManager().registerEvents(this, ApolloExamplePlugin.getPlugin()); @@ -106,15 +107,15 @@ public Team() { public void addMember(Player player) { this.members.add(player); - TeamExample.this.teamsByPlayerUuid.put(player.getUniqueId(), this); + TeamApiExample.this.teamsByPlayerUuid.put(player.getUniqueId(), this); } public void removeMember(Player player) { this.members.remove(player); - TeamExample.this.teamsByPlayerUuid.remove(player.getUniqueId()); + TeamApiExample.this.teamsByPlayerUuid.remove(player.getUniqueId()); Apollo.getPlayerManager().getPlayer(player.getUniqueId()) - .ifPresent(TeamExample.this.teamModule::resetTeamMembers); + .ifPresent(TeamApiExample.this.teamModule::resetTeamMembers); } private TeamMember createTeamMember(Player member) { @@ -143,7 +144,7 @@ public void refresh() { .collect(Collectors.toList()); this.members.forEach(member -> Apollo.getPlayerManager().getPlayer(member.getUniqueId()) - .ifPresent(apolloPlayer -> TeamExample.this.teamModule.updateTeamMembers(apolloPlayer, teammates))); + .ifPresent(apolloPlayer -> TeamApiExample.this.teamModule.updateTeamMembers(apolloPlayer, teammates))); } public UUID getTeamId() { @@ -183,8 +184,74 @@ public TeamUpdateTask() { @Override public void run() { - TeamExample.this.teamsByTeamId.values().forEach(Team::refresh); + TeamApiExample.this.teamsByTeamId.values().forEach(Team::refresh); } } + @Override + public void createTeam(Player player) { + Optional teamOpt = this.getByPlayerUuid(player.getUniqueId()); + + if (teamOpt.isPresent()) { + player.sendMessage("You already have a team..."); + return; + } + + Team team = this.createTeam(); + team.addMember(player); + + player.sendMessage("Creating team..."); + } + + @Override + public void deleteTeam(Player player) { + Optional teamOpt = this.getByPlayerUuid(player.getUniqueId()); + + if (teamOpt.isPresent()) { + this.deleteTeam(teamOpt.get().getTeamId()); + player.sendMessage("Deleting team..."); + return; + } + + player.sendMessage("No team found..."); + } + + @Override + public void addMember(Player player, Player target) { + Optional teamOpt = this.getByPlayerUuid(player.getUniqueId()); + Optional targetTeamOpt = this.getByPlayerUuid(target.getUniqueId()); + + if (targetTeamOpt.isPresent()) { + player.sendMessage("Player " + target.getName() + " already has a team..."); + return; + } + + if (teamOpt.isPresent()) { + teamOpt.get().addMember(target); + player.sendMessage("Added " + target.getName() + " to your team..."); + return; + } + + player.sendMessage("No team found..."); + } + + @Override + public void removeMember(Player player, Player target) { + Optional teamOpt = this.getByPlayerUuid(player.getUniqueId()); + Optional targetTeamOpt = this.getByPlayerUuid(target.getUniqueId()); + + if (!targetTeamOpt.isPresent()) { + player.sendMessage("Player " + target.getName() + " doesn't have a team..."); + return; + } + + if (teamOpt.isPresent()) { + teamOpt.get().removeMember(target); + player.sendMessage("Removed " + target.getName() + " from your team..."); + return; + } + + player.sendMessage("No team found..."); + } + } diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/TebexExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/TebexApiExample.java similarity index 91% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/TebexExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/TebexApiExample.java index eec4e15e..36829578 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/TebexExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/TebexApiExample.java @@ -21,19 +21,21 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.lunarclient.apollo.Apollo; +import com.lunarclient.apollo.example.common.modules.impl.TebexExample; import com.lunarclient.apollo.module.tebex.TebexEmbeddedCheckoutSupport; import com.lunarclient.apollo.module.tebex.TebexModule; import com.lunarclient.apollo.player.ApolloPlayer; import java.util.Optional; import org.bukkit.entity.Player; -public class TebexExample { +public class TebexApiExample extends TebexExample { private final TebexModule tebexModule = Apollo.getModuleManager().getModule(TebexModule.class); + @Override public void displayTebexEmbeddedCheckoutExample(Player viewer, String basketIdent, String locale) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(apolloPlayer -> { diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/TitleExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/TitleApiExample.java similarity index 94% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/TitleExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/TitleApiExample.java index cc933988..113b2c53 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/TitleExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/TitleApiExample.java @@ -21,9 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.lunarclient.apollo.Apollo; +import com.lunarclient.apollo.example.common.modules.impl.TitleExample; import com.lunarclient.apollo.module.title.Title; import com.lunarclient.apollo.module.title.TitleModule; import com.lunarclient.apollo.module.title.TitleType; @@ -35,7 +36,7 @@ import net.kyori.adventure.text.format.TextDecoration; import org.bukkit.entity.Player; -public class TitleExample { +public class TitleApiExample extends TitleExample { private final TitleModule titleModule = Apollo.getModuleManager().getModule(TitleModule.class); @@ -67,11 +68,13 @@ public class TitleExample { .fadeOutTime(Duration.ofMillis(300)) .build(); + @Override public void displayTitleExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(apolloPlayer -> this.titleModule.displayTitle(apolloPlayer, this.helloTitle)); } + @Override public void resetTitlesExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(this.titleModule::resetTitles); diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/TntCountdownExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/TntCountdownApiExample.java similarity index 90% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/TntCountdownExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/TntCountdownApiExample.java index 3fab40c2..9f324a3c 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/TntCountdownExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/TntCountdownApiExample.java @@ -21,10 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.lunarclient.apollo.Apollo; import com.lunarclient.apollo.common.ApolloEntity; +import com.lunarclient.apollo.example.common.modules.impl.TntCountdownExample; import com.lunarclient.apollo.module.tntcountdown.TntCountdownModule; import com.lunarclient.apollo.player.ApolloPlayer; import java.util.Optional; @@ -34,14 +35,16 @@ import org.bukkit.entity.TNTPrimed; import org.bukkit.event.Listener; -public class TntCountdownExample implements Listener { +public class TntCountdownApiExample extends TntCountdownExample implements Listener { private final TntCountdownModule tntCountdownModule = Apollo.getModuleManager().getModule(TntCountdownModule.class); + @Override public void setTntCountdownExample() { this.tntCountdownModule.getOptions().set(TntCountdownModule.TNT_TICKS, 160); } + @Override public void overrideTntCountdownExample(Player viewer) { Location location = viewer.getLocation(); World world = viewer.getWorld(); @@ -55,6 +58,7 @@ public void overrideTntCountdownExample(Player viewer) { }); } + @Override public void clearTntCountdownOptionExample() { this.tntCountdownModule.getOptions().remove(TntCountdownModule.TNT_TICKS, 160); } diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/TransferExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/TransferApiExample.java similarity index 95% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/TransferExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/TransferApiExample.java index 111fd5fa..252dc74d 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/TransferExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/TransferApiExample.java @@ -21,20 +21,22 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.google.common.collect.Lists; import com.lunarclient.apollo.Apollo; +import com.lunarclient.apollo.example.common.modules.impl.TransferExample; import com.lunarclient.apollo.module.transfer.PingResponse; import com.lunarclient.apollo.module.transfer.TransferModule; import com.lunarclient.apollo.player.ApolloPlayer; import java.util.Optional; import org.bukkit.entity.Player; -public class TransferExample { +public class TransferApiExample extends TransferExample { private final TransferModule transferModule = Apollo.getModuleManager().getModule(TransferModule.class); + @Override public void transferExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); @@ -68,6 +70,7 @@ public void transferExample(Player viewer) { }); } + @Override public void pingExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/VignetteExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/VignetteApiExample.java similarity index 91% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/VignetteExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/VignetteApiExample.java index 13c929bf..36c1edef 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/VignetteExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/VignetteApiExample.java @@ -21,19 +21,21 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.lunarclient.apollo.Apollo; +import com.lunarclient.apollo.example.common.modules.impl.VignetteExample; import com.lunarclient.apollo.module.vignette.Vignette; import com.lunarclient.apollo.module.vignette.VignetteModule; import com.lunarclient.apollo.player.ApolloPlayer; import java.util.Optional; import org.bukkit.entity.Player; -public class VignetteExample { +public class VignetteApiExample extends VignetteExample { private final VignetteModule vignetteModule = Apollo.getModuleManager().getModule(VignetteModule.class); + @Override public void displayVignetteExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); @@ -46,6 +48,7 @@ public void displayVignetteExample(Player viewer) { }); } + @Override public void resetVignetteExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(this.vignetteModule::resetVignette); diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/WaypointExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/WaypointApiExample.java similarity index 92% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/WaypointExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/WaypointApiExample.java index 03b37424..eb5b8e6a 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/WaypointExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/WaypointApiExample.java @@ -21,10 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.api.examples; import com.lunarclient.apollo.Apollo; import com.lunarclient.apollo.common.location.ApolloBlockLocation; +import com.lunarclient.apollo.example.common.modules.impl.WaypointExample; import com.lunarclient.apollo.module.waypoint.Waypoint; import com.lunarclient.apollo.module.waypoint.WaypointModule; import com.lunarclient.apollo.player.ApolloPlayer; @@ -32,10 +33,11 @@ import java.util.Optional; import org.bukkit.entity.Player; -public class WaypointExample { +public class WaypointApiExample extends WaypointExample { private final WaypointModule waypointModule = Apollo.getModuleManager().getModule(WaypointModule.class); + @Override public void displayWaypointExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); @@ -57,11 +59,13 @@ public void displayWaypointExample(Player viewer) { }); } + @Override public void removeWaypointExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(apolloPlayer -> this.waypointModule.removeWaypoint(apolloPlayer, "KoTH")); } + @Override public void resetWaypointsExample(Player viewer) { Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); apolloPlayerOpt.ifPresent(this.waypointModule::resetWaypoints); diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/listeners/GeneralListenerExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/listeners/ApolloGeneralApiListener.java similarity index 97% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/listeners/GeneralListenerExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/listeners/ApolloGeneralApiListener.java index 4b129839..afe1c0c1 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/listeners/GeneralListenerExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/listeners/ApolloGeneralApiListener.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.listeners; +package com.lunarclient.apollo.example.api.listeners; import com.lunarclient.apollo.event.ApolloListener; import com.lunarclient.apollo.event.Event; @@ -32,7 +32,7 @@ import com.lunarclient.apollo.player.ApolloPlayer; import org.bukkit.entity.Player; -public class GeneralListenerExample { +public class ApolloGeneralApiListener { // Method 1 public class GeneralExample1 implements ApolloListener { diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/listeners/PlayerListener.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/listeners/ApolloPlayerApiListener.java similarity index 76% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/listeners/PlayerListener.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/listeners/ApolloPlayerApiListener.java index 4ab8e097..47e7bf04 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/listeners/PlayerListener.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/listeners/ApolloPlayerApiListener.java @@ -21,20 +21,32 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.listeners; +package com.lunarclient.apollo.example.api.listeners; import com.lunarclient.apollo.event.ApolloListener; +import com.lunarclient.apollo.event.EventBus; import com.lunarclient.apollo.event.Listen; import com.lunarclient.apollo.event.player.ApolloRegisterPlayerEvent; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.TeamExample; +import com.lunarclient.apollo.example.api.examples.TeamApiExample; import com.lunarclient.apollo.player.ApolloPlayer; import org.bukkit.entity.Player; -public class PlayerListener implements ApolloListener { +public class ApolloPlayerApiListener implements ApolloListener { - private final ApolloExamplePlugin plugin = ApolloExamplePlugin.getPlugin(); - private final TeamExample.Team defaultTeam = this.plugin.getTeamExample().createTeam(); + private final ApolloExamplePlugin plugin; + private final TeamApiExample.Team defaultTeam; + + public ApolloPlayerApiListener(ApolloExamplePlugin plugin) { + this.plugin = plugin; + this.defaultTeam = ((TeamApiExample) this.plugin.getTeamExample()).createTeam(); + + EventBus.getBus().register(this); + } + + public void disable() { + EventBus.getBus().unregister(this); + } @Listen private void onApolloRegister(ApolloRegisterPlayerEvent event) { diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/BukkitApolloExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/utilities/BukkitApolloExample.java similarity index 98% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/BukkitApolloExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/utilities/BukkitApolloExample.java index 64024fc3..12abb7b4 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/BukkitApolloExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/utilities/BukkitApolloExample.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.utilities; +package com.lunarclient.apollo.example.api.utilities; import com.google.common.collect.Lists; import com.lunarclient.apollo.Apollo; diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/ComponentExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/utilities/ComponentExample.java similarity index 97% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/ComponentExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/utilities/ComponentExample.java index 3e3b7f95..f9bfc005 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/ComponentExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/utilities/ComponentExample.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.utilities; +package com.lunarclient.apollo.example.api.utilities; import com.google.common.collect.Lists; import net.kyori.adventure.text.Component; diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/CuboidExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/utilities/CuboidExample.java similarity index 97% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/CuboidExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/utilities/CuboidExample.java index 1af50583..241a27e6 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/CuboidExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/utilities/CuboidExample.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.utilities; +package com.lunarclient.apollo.example.api.utilities; import com.lunarclient.apollo.common.cuboid.Cuboid2D; import com.lunarclient.apollo.common.cuboid.Cuboid3D; diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/IconExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/utilities/IconExample.java similarity index 97% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/IconExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/utilities/IconExample.java index 23d90eb8..f7bfe085 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/IconExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/utilities/IconExample.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.utilities; +package com.lunarclient.apollo.example.api.utilities; import com.lunarclient.apollo.common.icon.AdvancedResourceLocationIcon; import com.lunarclient.apollo.common.icon.ItemStackIcon; diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/LocationExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/utilities/LocationExample.java similarity index 97% rename from bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/LocationExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/api/utilities/LocationExample.java index 015f2545..f8d3486d 100644 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/LocationExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/api/utilities/LocationExample.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.utilities; +package com.lunarclient.apollo.example.api.utilities; import com.lunarclient.apollo.common.location.ApolloBlockLocation; import com.lunarclient.apollo.common.location.ApolloLocation; diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/BeamCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/BeamCommand.java deleted file mode 100644 index 3611c337..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/BeamCommand.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.BeamExample; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class BeamCommand implements CommandExecutor { - - private final BeamExample beamExample = ApolloExamplePlugin.getPlugin().getBeamExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length != 1) { - player.sendMessage("Usage: /beam "); - return true; - } - - switch (args[0].toLowerCase()) { - case "display": { - this.beamExample.displayBeamExample(player); - player.sendMessage("Displaying beam...."); - break; - } - - case "remove": { - this.beamExample.removeBeamExample(player); - player.sendMessage("Removing beam...."); - break; - } - - case "reset": { - this.beamExample.resetBeamsExample(player); - player.sendMessage("Resetting beams..."); - break; - } - - default: { - player.sendMessage("Usage: /beam "); - break; - } - } - - return true; - } -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/BorderCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/BorderCommand.java deleted file mode 100644 index 56b2b43b..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/BorderCommand.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.BorderExample; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class BorderCommand implements CommandExecutor { - - private final BorderExample borderExample = ApolloExamplePlugin.getPlugin().getBorderExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length != 1) { - player.sendMessage("Usage: /border "); - return true; - } - - switch (args[0].toLowerCase()) { - case "display": { - this.borderExample.displayBorderExample(player); - player.sendMessage("Displaying border...."); - break; - } - - case "remove": { - this.borderExample.removeBorderExample(player); - player.sendMessage("Removing border...."); - break; - } - - case "reset": { - this.borderExample.resetBordersExample(player); - player.sendMessage("Resetting borders..."); - break; - } - - default: { - player.sendMessage("Usage: /border "); - break; - } - } - - return true; - } -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/ChatCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/ChatCommand.java deleted file mode 100644 index b502375f..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/ChatCommand.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.ChatExample; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class ChatCommand implements CommandExecutor { - - private final ChatExample chatExample = ApolloExamplePlugin.getPlugin().getChatExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length != 1) { - player.sendMessage("Usage: /chat "); - return true; - } - - switch (args[0].toLowerCase()) { - case "display": { - this.chatExample.displayLiveChatMessageExample(); - player.sendMessage("Displaying live message...."); - break; - } - - case "remove": { - this.chatExample.removeLiveChatMessageExample(); - player.sendMessage("Removing live message...."); - break; - } - - default: { - player.sendMessage("Usage: /chat "); - break; - } - } - - return true; - } -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/ColoredFireCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/ColoredFireCommand.java deleted file mode 100644 index ce0aa8ed..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/ColoredFireCommand.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.ColoredFireExample; -import org.bukkit.Bukkit; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class ColoredFireCommand implements CommandExecutor { - - private final ColoredFireExample coloredFireExample = ApolloExamplePlugin.getPlugin().getColoredFireExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length == 1 && args[0].equalsIgnoreCase("clear")) { - this.coloredFireExample.resetColoredFiresExample(player); - player.sendMessage("Resetting colored fires..."); - return true; - } - - if (args.length != 2) { - player.sendMessage("Usage: /coloredfire "); - return true; - } - - Player target = Bukkit.getPlayer(args[1]); - - if (target == null) { - player.sendMessage("Player '" + args[1] + "' not found!"); - return true; - } - - switch (args[0].toLowerCase()) { - case "override": { - this.coloredFireExample.overrideColoredFireExample(target.getUniqueId()); - player.sendMessage("Displaying colored fire...."); - break; - } - - case "reset": { - this.coloredFireExample.resetColoredFireExample(target.getUniqueId()); - player.sendMessage("Resetting colored fire...."); - break; - } - - default: { - player.sendMessage("Usage: /coloredfire "); - break; - } - } - - return true; - } -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/CombatCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/CombatCommand.java deleted file mode 100644 index a06198f2..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/CombatCommand.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.CombatExample; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class CombatCommand implements CommandExecutor { - - private final CombatExample combatExample = ApolloExamplePlugin.getPlugin().getCombatExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length != 2) { - player.sendMessage("Usage: /combat "); - return true; - } - - if (args[0].equalsIgnoreCase("disablemisspenalty")) { - boolean value = Boolean.parseBoolean(args[1]); - this.combatExample.setDisableMissPenalty(value); - - player.sendMessage("Disable miss penalty rule has been set to " + value); - } else { - player.sendMessage("Usage: /combat "); - } - - return true; - } -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/CooldownCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/CooldownCommand.java deleted file mode 100644 index 003ce99b..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/CooldownCommand.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.CooldownExample; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class CooldownCommand implements CommandExecutor { - - private final CooldownExample cooldownExample = ApolloExamplePlugin.getPlugin().getCooldownExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length != 1) { - player.sendMessage("Usage: /cooldown "); - return true; - } - - switch (args[0].toLowerCase()) { - case "displayitem": { - this.cooldownExample.displayCooldownItemExample(player); - player.sendMessage("Displaying cooldown item...."); - break; - } - - case "displayresource": { - this.cooldownExample.displayCooldownResourceExample(player); - player.sendMessage("Displaying cooldown resource...."); - break; - } - - case "remove": { - this.cooldownExample.removeCooldownExample(player); - player.sendMessage("Removing cooldown...."); - break; - } - - case "reset": { - this.cooldownExample.resetCooldownsExample(player); - player.sendMessage("Resetting cooldowns..."); - break; - } - - default: { - player.sendMessage("Usage: /cooldown "); - break; - } - } - - return true; - } -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/EntityCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/EntityCommand.java deleted file mode 100644 index f8492bed..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/EntityCommand.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.EntityExample; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class EntityCommand implements CommandExecutor { - - private final EntityExample entityExample = ApolloExamplePlugin.getPlugin().getEntityExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length != 1) { - player.sendMessage("Usage: /entity "); - return true; - } - - switch (args[0].toLowerCase()) { - case "overridesheep": { - this.entityExample.overrideRainbowSheepExample(player); - player.sendMessage("Overriding rainbow sheep...."); - break; - } - - case "resetsheep": { - this.entityExample.resetRainbowSheepExample(player); - player.sendMessage("Resetting rainbow sheep...."); - break; - } - - case "flipentities": { - this.entityExample.flipEntityExample(player); - player.sendMessage("Flipping entities...."); - break; - } - - case "resetflippedentities": { - this.entityExample.resetFlippedEntityExample(player); - player.sendMessage("Resetting flipped entities...."); - break; - } - - default: { - player.sendMessage("Usage: /entity "); - break; - } - } - - return true; - } -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/GlowCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/GlowCommand.java deleted file mode 100644 index c5eb2d79..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/GlowCommand.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.GlowExample; -import org.bukkit.Bukkit; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class GlowCommand implements CommandExecutor { - - private final GlowExample glowExample = ApolloExamplePlugin.getPlugin().getGlowExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length == 1 && args[0].equalsIgnoreCase("clear")) { - this.glowExample.resetGlowEffectsExample(player); - player.sendMessage("Resetting glow effects..."); - return true; - } - - if (args.length != 2) { - player.sendMessage("Usage: /glow "); - return true; - } - - Player target = Bukkit.getPlayer(args[1]); - - if (target == null) { - player.sendMessage("Player '" + args[1] + "' not found!"); - return true; - } - - switch (args[0].toLowerCase()) { - case "override": { - this.glowExample.overrideGlowEffectExample(target.getUniqueId()); - player.sendMessage("Displaying glow effect...."); - break; - } - - case "reset": { - this.glowExample.resetGlowEffectExample(target.getUniqueId()); - player.sendMessage("Resetting glow effect...."); - break; - } - - default: { - player.sendMessage("Usage: /glow "); - break; - } - } - - return true; - } -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/HologramCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/HologramCommand.java deleted file mode 100644 index 86967315..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/HologramCommand.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.HologramExample; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class HologramCommand implements CommandExecutor { - - private final HologramExample hologramExample = ApolloExamplePlugin.getPlugin().getHologramExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length != 1) { - player.sendMessage("Usage: /hologram "); - return true; - } - - switch (args[0].toLowerCase()) { - case "display": { - this.hologramExample.displayHologramExample(); - player.sendMessage("Displaying hologram...."); - break; - } - - case "remove": { - this.hologramExample.removeHologramExample(); - player.sendMessage("Removing hologram...."); - break; - } - - case "reset": { - this.hologramExample.resetHologramsExample(player); - player.sendMessage("Resetting holograms..."); - break; - } - - default: { - player.sendMessage("Usage: /hologram "); - break; - } - } - - return true; - } -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/LimbCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/LimbCommand.java deleted file mode 100644 index 5e90b52f..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/LimbCommand.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.LimbExample; -import org.bukkit.Bukkit; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class LimbCommand implements CommandExecutor { - - private final LimbExample limbExample = ApolloExamplePlugin.getPlugin().getLimbExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length != 2) { - player.sendMessage("Usage: /limb "); - return true; - } - - Player target = Bukkit.getPlayer(args[1]); - - if (target == null) { - player.sendMessage("Player '" + args[1] + "' not found!"); - return true; - } - - switch (args[0].toLowerCase()) { - case "hidearmor": { - this.limbExample.hideArmorExample(player, target); - player.sendMessage("Hiding armor...."); - break; - } - - case "resetarmor": { - this.limbExample.resetArmorExample(player, target); - player.sendMessage("Resetting armor...."); - break; - } - - case "hidebody": { - this.limbExample.hideBodyExample(player, target); - player.sendMessage("Hiding body...."); - break; - } - - case "resetbody": { - this.limbExample.resetBodyExample(player, target); - player.sendMessage("Resetting body...."); - break; - } - - default: { - player.sendMessage("Usage: /limb "); - break; - } - } - - return true; - } -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/ModSettingsCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/ModSettingsCommand.java deleted file mode 100644 index f8d44fe2..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/ModSettingsCommand.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.ModSettingsExample; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class ModSettingsCommand implements CommandExecutor { - - private final ModSettingsExample modSettingsExample = ApolloExamplePlugin.getPlugin().getModSettingsExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length != 1) { - player.sendMessage("Usage: /modsettings "); - return true; - } - - switch (args[0].toLowerCase()) { - case "disable": { - this.modSettingsExample.disableLightningModExample(player); - player.sendMessage("Disabling lightning mod...."); - break; - } - - case "reset": { - this.modSettingsExample.rollbackLightningModEnabledState(player); - player.sendMessage("Rollbacking lightning mod enabled state...."); - break; - } - - case "broadcast": { - this.modSettingsExample.broadcastDisableLightningModExample(); - player.sendMessage("Broadcasting disable lightning mod...."); - break; - } - - default: { - player.sendMessage("Usage: /modsettings "); - break; - } - } - - return true; - } -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/NametagCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/NametagCommand.java deleted file mode 100644 index d346a36f..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/NametagCommand.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.NametagExample; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class NametagCommand implements CommandExecutor { - - private final NametagExample nametagExample = ApolloExamplePlugin.getPlugin().getNametagExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length != 1) { - player.sendMessage("Usage: /nametag "); - return true; - } - - switch (args[0].toLowerCase()) { - case "override": { - this.nametagExample.overrideNametagExample(player); - player.sendMessage("Overriding nametag...."); - break; - } - - case "reset": { - this.nametagExample.resetNametagExample(player); - player.sendMessage("Resetting nametag...."); - break; - } - - case "clear": { - this.nametagExample.resetNametagsExample(player); - player.sendMessage("Clearing nametags..."); - break; - } - - default: { - player.sendMessage("Usage: /nametag "); - break; - } - } - - return true; - } -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/NickHiderCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/NickHiderCommand.java deleted file mode 100644 index 368e8e8d..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/NickHiderCommand.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.NickHiderExample; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class NickHiderCommand implements CommandExecutor { - - private final NickHiderExample nickHiderExample = ApolloExamplePlugin.getPlugin().getNickHiderExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length != 1) { - player.sendMessage("Usage: /nickhider "); - return true; - } - - switch (args[0].toLowerCase()) { - case "override": { - this.nickHiderExample.overrideNickExample(player); - player.sendMessage("Overriding nick...."); - break; - } - - case "reset": { - this.nickHiderExample.resetNickExample(player); - player.sendMessage("Resetting nick..."); - break; - } - - default: { - player.sendMessage("Usage: /nickhider "); - break; - } - } - - return true; - } -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/NotificationCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/NotificationCommand.java deleted file mode 100644 index 289307bd..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/NotificationCommand.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.NotificationExample; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class NotificationCommand implements CommandExecutor { - - private final NotificationExample notificationExample = ApolloExamplePlugin.getPlugin().getNotificationExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length != 1) { - player.sendMessage("Usage: /notification "); - return true; - } - - switch (args[0].toLowerCase()) { - case "display": { - this.notificationExample.displayNotificationExample(player); - player.sendMessage("Displaying notification...."); - break; - } - - case "reset": { - this.notificationExample.resetNotificationsExample(player); - player.sendMessage("Resetting notifications..."); - break; - } - - default: { - player.sendMessage("Usage: /notification "); - break; - } - } - - return true; - } -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/RichPresenceCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/RichPresenceCommand.java deleted file mode 100644 index 9f6e49c6..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/RichPresenceCommand.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.RichPresenceExample; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class RichPresenceCommand implements CommandExecutor { - - private final RichPresenceExample richPresenceExample = ApolloExamplePlugin.getPlugin().getRichPresenceExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length != 1) { - player.sendMessage("Usage: /richpresence "); - return true; - } - - switch (args[0].toLowerCase()) { - case "override": { - this.richPresenceExample.overrideServerRichPresenceExample(player); - player.sendMessage("Overriding rich presence...."); - break; - } - - case "reset": { - this.richPresenceExample.resetServerRichPresenceExample(player); - player.sendMessage("Resetting rich presence..."); - break; - } - - default: { - player.sendMessage("Usage: /richpresence "); - break; - } - } - - return true; - } -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/ServerRuleCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/ServerRuleCommand.java deleted file mode 100644 index a5b67af2..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/ServerRuleCommand.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.ServerRuleExample; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class ServerRuleCommand implements CommandExecutor { - - private final ServerRuleExample serverRuleExample = ApolloExamplePlugin.getPlugin().getServerRuleExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length != 2) { - player.sendMessage("Usage: /serverrule "); - return true; - } - - switch (args[0].toLowerCase()) { - case "antiportaltraps": { - boolean value = Boolean.parseBoolean(args[1]); - this.serverRuleExample.setAntiPortalTraps(value); - - player.sendMessage("Anti portal traps rule has been set to " + value); - break; - } - - case "overridenametagrenderdistance": { - boolean value = Boolean.parseBoolean(args[1]); - this.serverRuleExample.setOverrideNametagRenderDistance(player, value); - - player.sendMessage("Override nametag render distance rule has been set to " + value); - break; - } - - case "nametagrenderdistance": { - int value; - - try { - value = Integer.parseInt(args[1]); - } catch (NumberFormatException e) { - player.sendMessage("Input must be a number for this rule."); - return true; - } - - this.serverRuleExample.setNametagRenderDistanceExample(value); - player.sendMessage("Nametag render distance has been set to " + value); - break; - } - - default: { - player.sendMessage("Usage: /serverrule "); - break; - } - } - - return true; - } -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/StaffModCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/StaffModCommand.java deleted file mode 100644 index 54b07b46..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/StaffModCommand.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.StaffModExample; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class StaffModCommand implements CommandExecutor { - - private final StaffModExample staffModExample = ApolloExamplePlugin.getPlugin().getStaffModExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length != 1) { - player.sendMessage("Usage: /staffmod "); - return true; - } - - switch (args[0].toLowerCase()) { - case "enable": { - this.staffModExample.enableStaffModsExample(player); - player.sendMessage("Enabling staff mods...."); - break; - } - - case "disable": { - this.staffModExample.disableStaffModsExample(player); - player.sendMessage("Disabling staff mods...."); - break; - } - - default: { - player.sendMessage("Usage: /staffmod "); - break; - } - } - - return true; - } -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/StopwatchCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/StopwatchCommand.java deleted file mode 100644 index 17dd34d7..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/StopwatchCommand.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.StopwatchExample; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class StopwatchCommand implements CommandExecutor { - - private final StopwatchExample stopwatchExample = ApolloExamplePlugin.getPlugin().getStopwatchExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length != 1) { - player.sendMessage("Usage: /stopwatch "); - return true; - } - - switch (args[0].toLowerCase()) { - case "start": { - this.stopwatchExample.startStopwatchExample(player); - player.sendMessage("Starting stopwatch...."); - break; - } - - case "stop": { - this.stopwatchExample.stopStopwatchExample(player); - player.sendMessage("Stopping stopwatch...."); - break; - } - - case "reset": { - this.stopwatchExample.resetStopwatchExample(player); - player.sendMessage("Resetting stopwatch...."); - break; - } - - default: { - player.sendMessage("Usage: /stopwatch "); - break; - } - } - - return true; - } -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/TeamCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/TeamCommand.java deleted file mode 100644 index cd1eb101..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/TeamCommand.java +++ /dev/null @@ -1,148 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.TeamExample; -import java.util.Optional; -import org.bukkit.Bukkit; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class TeamCommand implements CommandExecutor { - - private final TeamExample teamExample = ApolloExamplePlugin.getPlugin().getTeamExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length == 1) { - switch (args[0].toLowerCase()) { - case "create": { - Optional teamOpt = this.teamExample.getByPlayerUuid(player.getUniqueId()); - - if (teamOpt.isPresent()) { - player.sendMessage("You already have a team..."); - break; - } - - TeamExample.Team team = this.teamExample.createTeam(); - team.addMember(player); - - player.sendMessage("Creating team..."); - break; - } - - case "delete": { - Optional teamOpt = this.teamExample.getByPlayerUuid(player.getUniqueId()); - - if (teamOpt.isPresent()) { - this.teamExample.deleteTeam(teamOpt.get().getTeamId()); - player.sendMessage("Deleting team..."); - break; - } - - player.sendMessage("No team found..."); - break; - } - - default: { - player.sendMessage("Usage: /team "); - player.sendMessage("Usage: /team "); - break; - } - } - - return true; - } - - if (args.length == 2) { - Player target = Bukkit.getPlayer(args[1]); - - if (target == null) { - player.sendMessage("Player '" + args[1] + "' not found!"); - return true; - } - - Optional teamOpt = this.teamExample.getByPlayerUuid(player.getUniqueId()); - Optional targetTeamOpt = this.teamExample.getByPlayerUuid(target.getUniqueId()); - - switch (args[0].toLowerCase()) { - case "addmember": { - if (targetTeamOpt.isPresent()) { - player.sendMessage("Player " + target.getName() + " already has a team..."); - break; - } - - if (teamOpt.isPresent()) { - teamOpt.get().addMember(target); - player.sendMessage("Added " + target.getName() + " to your team..."); - break; - } - - player.sendMessage("No team found..."); - break; - } - - case "removemember": { - if (!targetTeamOpt.isPresent()) { - player.sendMessage("Player " + target.getName() + " doesn't have a team..."); - break; - } - - if (teamOpt.isPresent()) { - teamOpt.get().removeMember(target); - player.sendMessage("Removed " + target.getName() + " from your team..."); - break; - } - - player.sendMessage("No team found..."); - break; - } - - default: { - player.sendMessage("Usage: /team "); - player.sendMessage("Usage: /team "); - break; - } - } - - return true; - } - - player.sendMessage("Usage: /team "); - player.sendMessage("Usage: /team "); - - return true; - } -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/TebexCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/TebexCommand.java deleted file mode 100644 index 99fc5fd2..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/TebexCommand.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.TebexExample; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class TebexCommand implements CommandExecutor { - - private final TebexExample tebexExample = ApolloExamplePlugin.getPlugin().getTebexExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length < 2) { - player.sendMessage("Usage: /tebex [locale]"); - return true; - } - - String locale = args.length == 3 ? args[2] : null; - - switch (args[0].toLowerCase()) { - case "display": { - this.tebexExample.displayTebexEmbeddedCheckoutExample(player, args[1], locale); - player.sendMessage("Displaying checkout...."); - break; - } - - default: { - player.sendMessage("Usage: /tebex [locale]"); - break; - } - } - - return true; - } - -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/TitleCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/TitleCommand.java deleted file mode 100644 index 338bc5b4..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/TitleCommand.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.TitleExample; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class TitleCommand implements CommandExecutor { - - private final TitleExample titleExample = ApolloExamplePlugin.getPlugin().getTitleExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length != 1) { - player.sendMessage("Usage: /title "); - return true; - } - - switch (args[0].toLowerCase()) { - case "display": { - this.titleExample.displayTitleExample(player); - player.sendMessage("Displaying title...."); - break; - } - - case "reset": { - this.titleExample.resetTitlesExample(player); - player.sendMessage("Resetting titles...."); - break; - } - - default: { - player.sendMessage("Usage: /title "); - break; - } - } - - return true; - } -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/TntCountdownCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/TntCountdownCommand.java deleted file mode 100644 index 78f64908..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/TntCountdownCommand.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.TntCountdownExample; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class TntCountdownCommand implements CommandExecutor { - - private final TntCountdownExample tntCountdownExample = ApolloExamplePlugin.getPlugin().getTntCountdownExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length != 1) { - player.sendMessage("Usage: /tntcountdown "); - return true; - } - - switch (args[0].toLowerCase()) { - case "override": { - this.tntCountdownExample.overrideTntCountdownExample(player); - player.sendMessage("Overriding custom tnt countdown option..."); - break; - } - - case "set": { - this.tntCountdownExample.setTntCountdownExample(); - player.sendMessage("Setting custom tnt countdown option...."); - break; - } - - case "clear": { - this.tntCountdownExample.clearTntCountdownOptionExample(); - player.sendMessage("Removing custom tnt countdown option...."); - break; - } - - default: { - player.sendMessage("Usage: /tntcountdown "); - break; - } - } - - return true; - } - -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/TransferCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/TransferCommand.java deleted file mode 100644 index d5c08aec..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/TransferCommand.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.TransferExample; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class TransferCommand implements CommandExecutor { - - private final TransferExample transferExample = ApolloExamplePlugin.getPlugin().getTransferExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length != 1) { - player.sendMessage("Usage: /transfer "); - return true; - } - - switch (args[0].toLowerCase()) { - case "transfer": { - this.transferExample.transferExample(player); - player.sendMessage("Transferring player..."); - break; - } - - case "ping": { - this.transferExample.pingExample(player); - player.sendMessage("Pinging...."); - break; - } - - default: { - player.sendMessage("Usage: /transfer "); - break; - } - } - - return true; - } - -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/VignetteCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/VignetteCommand.java deleted file mode 100644 index 61e133f4..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/VignetteCommand.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.VignetteExample; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class VignetteCommand implements CommandExecutor { - - private final VignetteExample vignetteExample = ApolloExamplePlugin.getPlugin().getVignetteExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length != 1) { - player.sendMessage("Usage: /vignette "); - return true; - } - - switch (args[0].toLowerCase()) { - case "display": { - this.vignetteExample.displayVignetteExample(player); - player.sendMessage("Displaying vignette...."); - break; - } - - case "reset": { - this.vignetteExample.resetVignetteExample(player); - player.sendMessage("Resetting vignette...."); - break; - } - - default: { - player.sendMessage("Usage: /vignette "); - break; - } - } - - return true; - } -} diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/WaypointCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/WaypointCommand.java deleted file mode 100644 index 28bd0b4e..00000000 --- a/bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/WaypointCommand.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example.commands; - -import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.WaypointExample; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class WaypointCommand implements CommandExecutor { - - private final WaypointExample waypointExample = ApolloExamplePlugin.getPlugin().getWaypointExample(); - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Player only!"); - return true; - } - - Player player = (Player) sender; - - if (args.length != 1) { - player.sendMessage("Usage: /waypoint "); - return true; - } - - switch (args[0].toLowerCase()) { - case "display": { - this.waypointExample.displayWaypointExample(player); - player.sendMessage("Displaying waypoint...."); - break; - } - - case "remove": { - this.waypointExample.removeWaypointExample(player); - player.sendMessage("Removing waypoint...."); - break; - } - case "reset": { - this.waypointExample.resetWaypointsExample(player); - player.sendMessage("Resetting waypoints..."); - break; - } - - default: { - player.sendMessage("Usage: /waypoint "); - break; - } - } - - return true; - } -} diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/SwitchCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/SwitchCommand.java similarity index 78% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/SwitchCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/SwitchCommand.java index f7801130..2a960e15 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/SwitchCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/SwitchCommand.java @@ -21,14 +21,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands; +package com.lunarclient.apollo.example.common.commands; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.ApolloExampleType; +import com.lunarclient.apollo.example.common.modules.ApolloExampleType; import java.util.NoSuchElementException; +import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; +import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; public class SwitchCommand implements CommandExecutor { @@ -54,6 +56,17 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command return true; } + Plugin plugin = Bukkit.getPluginManager().getPlugin("Apollo-Bukkit"); + if (type == ApolloExampleType.API && plugin == null) { + sender.sendMessage("Can't switch implementation to API, the Apollo-Bukkit plugin must be running."); + return true; + } + + if (type != ApolloExampleType.API && plugin != null) { + sender.sendMessage("Can't switch implementation to " + ApolloExamplePlugin.TYPE.name() + ", the Apollo-Bukkit must be deleted."); + return true; + } + ApolloExamplePlugin.getPlugin().changeImplementationType(type); sender.sendMessage("Successfully switched example implementation to " + type.name() + "!"); sender.sendMessage("Re-join the server to apply the changes!"); diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/BeamCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/BeamCommand.java similarity index 95% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/BeamCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/BeamCommand.java index 7718acdc..d070d7e2 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/BeamCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/BeamCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.BeamExample; +import com.lunarclient.apollo.example.common.modules.impl.BeamExample; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/BorderCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/BorderCommand.java similarity index 95% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/BorderCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/BorderCommand.java index e7e32654..da532482 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/BorderCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/BorderCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.BorderExample; +import com.lunarclient.apollo.example.common.modules.impl.BorderExample; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/ChatCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/ChatCommand.java similarity index 95% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/ChatCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/ChatCommand.java index 792587c9..6c0dff5d 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/ChatCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/ChatCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.ChatExample; +import com.lunarclient.apollo.example.common.modules.impl.ChatExample; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/ColoredFireCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/ColoredFireCommand.java similarity index 95% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/ColoredFireCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/ColoredFireCommand.java index 8c553274..cd61c305 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/ColoredFireCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/ColoredFireCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.ColoredFireExample; +import com.lunarclient.apollo.example.common.modules.impl.ColoredFireExample; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/CombatCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/CombatCommand.java similarity index 94% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/CombatCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/CombatCommand.java index f349cdca..b6f9e839 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/CombatCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/CombatCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.CombatExample; +import com.lunarclient.apollo.example.common.modules.impl.CombatExample; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/CooldownCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/CooldownCommand.java similarity index 95% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/CooldownCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/CooldownCommand.java index 065629e0..36535ee0 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/CooldownCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/CooldownCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.CooldownExample; +import com.lunarclient.apollo.example.common.modules.impl.CooldownExample; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/EntityCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/EntityCommand.java similarity index 95% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/EntityCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/EntityCommand.java index 041f318f..64c0db1a 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/EntityCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/EntityCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.EntityExample; +import com.lunarclient.apollo.example.common.modules.impl.EntityExample; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/GlowCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/GlowCommand.java similarity index 95% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/GlowCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/GlowCommand.java index 5921e22e..abff7295 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/GlowCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/GlowCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.GlowExample; +import com.lunarclient.apollo.example.common.modules.impl.GlowExample; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/HologramCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/HologramCommand.java similarity index 95% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/HologramCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/HologramCommand.java index 2957ed9e..62c9dea6 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/HologramCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/HologramCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.HologramExample; +import com.lunarclient.apollo.example.common.modules.impl.HologramExample; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/LimbCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/LimbCommand.java similarity index 96% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/LimbCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/LimbCommand.java index 6475e30a..19df9cd8 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/LimbCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/LimbCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.LimbExample; +import com.lunarclient.apollo.example.common.modules.impl.LimbExample; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/ModSettingsCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/ModSettingsCommand.java similarity index 95% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/ModSettingsCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/ModSettingsCommand.java index dc65f6c4..374eefd8 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/ModSettingsCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/ModSettingsCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.ModSettingsExample; +import com.lunarclient.apollo.example.common.modules.impl.ModSettingsExample; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/NametagCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/NametagCommand.java similarity index 95% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/NametagCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/NametagCommand.java index 8e8971fa..a1443cd2 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/NametagCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/NametagCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.NametagExample; +import com.lunarclient.apollo.example.common.modules.impl.NametagExample; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/NickHiderCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/NickHiderCommand.java similarity index 94% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/NickHiderCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/NickHiderCommand.java index 20e9309a..5e42f6a8 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/NickHiderCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/NickHiderCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.NickHiderExample; +import com.lunarclient.apollo.example.common.modules.impl.NickHiderExample; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/NotificationCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/NotificationCommand.java similarity index 94% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/NotificationCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/NotificationCommand.java index a46105c5..bb4eb8f4 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/NotificationCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/NotificationCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.NotificationExample; +import com.lunarclient.apollo.example.common.modules.impl.NotificationExample; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/RichPresenceCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/RichPresenceCommand.java similarity index 95% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/RichPresenceCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/RichPresenceCommand.java index 5ef3ed38..30b547e2 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/RichPresenceCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/RichPresenceCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.RichPresenceExample; +import com.lunarclient.apollo.example.common.modules.impl.RichPresenceExample; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/ServerRuleCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/ServerRuleCommand.java similarity index 96% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/ServerRuleCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/ServerRuleCommand.java index 927c2fc0..beac095e 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/ServerRuleCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/ServerRuleCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.ServerRuleExample; +import com.lunarclient.apollo.example.common.modules.impl.ServerRuleExample; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/StaffModCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/StaffModCommand.java similarity index 95% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/StaffModCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/StaffModCommand.java index c9afad66..2ffaf2bc 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/StaffModCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/StaffModCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.StaffModExample; +import com.lunarclient.apollo.example.common.modules.impl.StaffModExample; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/StopwatchCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/StopwatchCommand.java similarity index 95% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/StopwatchCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/StopwatchCommand.java index 6fb4b9d6..86cb2c50 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/StopwatchCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/StopwatchCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.StopwatchExample; +import com.lunarclient.apollo.example.common.modules.impl.StopwatchExample; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/TeamCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/TeamCommand.java similarity index 96% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/TeamCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/TeamCommand.java index a87cd285..d62ad942 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/TeamCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/TeamCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.TeamExample; +import com.lunarclient.apollo.example.common.modules.impl.TeamExample; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/TebexCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/TebexCommand.java similarity index 94% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/TebexCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/TebexCommand.java index c518c417..c26d2d34 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/TebexCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/TebexCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.TebexExample; +import com.lunarclient.apollo.example.common.modules.impl.TebexExample; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/TitleCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/TitleCommand.java similarity index 95% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/TitleCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/TitleCommand.java index 8ce3662d..017d0722 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/TitleCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/TitleCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.TitleExample; +import com.lunarclient.apollo.example.common.modules.impl.TitleExample; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/TntCountdownCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/TntCountdownCommand.java similarity index 95% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/TntCountdownCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/TntCountdownCommand.java index c76a3681..67871040 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/TntCountdownCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/TntCountdownCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.TntCountdownExample; +import com.lunarclient.apollo.example.common.modules.impl.TntCountdownExample; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/TransferCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/TransferCommand.java similarity index 94% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/TransferCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/TransferCommand.java index c9250481..1e316472 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/TransferCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/TransferCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.TransferExample; +import com.lunarclient.apollo.example.common.modules.impl.TransferExample; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/VignetteCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/VignetteCommand.java similarity index 95% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/VignetteCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/VignetteCommand.java index 224ad5bb..b25fe357 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/VignetteCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/VignetteCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.VignetteExample; +import com.lunarclient.apollo.example.common.modules.impl.VignetteExample; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/WaypointCommand.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/WaypointCommand.java similarity index 95% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/WaypointCommand.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/WaypointCommand.java index cbbf2ca3..af4942d6 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/commands/feature/WaypointCommand.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/WaypointCommand.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.commands.feature; +package com.lunarclient.apollo.example.common.commands.module; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.WaypointExample; +import com.lunarclient.apollo.example.common.modules.impl.WaypointExample; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/ApolloExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/ApolloExample.java similarity index 96% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/ApolloExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/ApolloExample.java index e1d7b589..f69f6a5a 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/ApolloExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/ApolloExample.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.common.modules; import com.lunarclient.apollo.example.ApolloExamplePlugin; import org.bukkit.ChatColor; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/ApolloExampleType.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/ApolloExampleType.java similarity index 95% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/ApolloExampleType.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/ApolloExampleType.java index 9f87b704..9eedd2e3 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/ApolloExampleType.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/ApolloExampleType.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules; +package com.lunarclient.apollo.example.common.modules; public enum ApolloExampleType { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/BeamExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/BeamExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/BeamExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/BeamExample.java index bf62cda0..7dd40427 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/BeamExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/BeamExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; import org.bukkit.entity.Player; public abstract class BeamExample extends ApolloExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/BorderExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/BorderExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/BorderExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/BorderExample.java index ddd1923e..d24c606c 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/BorderExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/BorderExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; import org.bukkit.entity.Player; public abstract class BorderExample extends ApolloExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/ChatExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/ChatExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/ChatExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/ChatExample.java index f8c38417..9108a1d5 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/ChatExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/ChatExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; public abstract class ChatExample extends ApolloExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/ColoredFireExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/ColoredFireExample.java similarity index 92% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/ColoredFireExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/ColoredFireExample.java index c3adae08..88d2a92b 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/ColoredFireExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/ColoredFireExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; import java.util.UUID; import org.bukkit.entity.Player; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/CombatExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/CombatExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/CombatExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/CombatExample.java index 86b65692..4d3bfc50 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/CombatExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/CombatExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; public abstract class CombatExample extends ApolloExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/CooldownExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/CooldownExample.java similarity index 92% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/CooldownExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/CooldownExample.java index 9616b67e..b68190ef 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/CooldownExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/CooldownExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; import org.bukkit.entity.Player; public abstract class CooldownExample extends ApolloExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/EntityExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/EntityExample.java similarity index 92% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/EntityExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/EntityExample.java index 7e9499ce..bfd12ce1 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/EntityExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/EntityExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; import org.bukkit.entity.Player; public abstract class EntityExample extends ApolloExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/GlowExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/GlowExample.java similarity index 92% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/GlowExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/GlowExample.java index 96b49c8a..d94bf83e 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/GlowExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/GlowExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; import java.util.UUID; import org.bukkit.entity.Player; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/HologramExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/HologramExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/HologramExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/HologramExample.java index c66946bc..47514208 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/HologramExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/HologramExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; import org.bukkit.entity.Player; public abstract class HologramExample extends ApolloExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/LimbExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/LimbExample.java similarity index 92% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/LimbExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/LimbExample.java index dca6665d..a7b1af2c 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/LimbExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/LimbExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; import org.bukkit.entity.Player; public abstract class LimbExample extends ApolloExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/ModSettingsExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/ModSettingsExample.java similarity index 92% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/ModSettingsExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/ModSettingsExample.java index 83813be2..27c9b9ad 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/ModSettingsExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/ModSettingsExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; import org.bukkit.entity.Player; public abstract class ModSettingsExample extends ApolloExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/NametagExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/NametagExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/NametagExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/NametagExample.java index 57905715..a1887109 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/NametagExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/NametagExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; import org.bukkit.entity.Player; public abstract class NametagExample extends ApolloExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/NickHiderExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/NickHiderExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/NickHiderExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/NickHiderExample.java index f9f2f401..1a5dbdb5 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/NickHiderExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/NickHiderExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; import org.bukkit.entity.Player; public abstract class NickHiderExample extends ApolloExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/NotificationExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/NotificationExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/NotificationExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/NotificationExample.java index e671dbb8..3cdb8937 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/NotificationExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/NotificationExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; import org.bukkit.entity.Player; public abstract class NotificationExample extends ApolloExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/RichPresenceExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/RichPresenceExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/RichPresenceExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/RichPresenceExample.java index cf389397..221b2a58 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/RichPresenceExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/RichPresenceExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; import org.bukkit.entity.Player; public abstract class RichPresenceExample extends ApolloExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/ServerRuleExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/ServerRuleExample.java similarity index 92% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/ServerRuleExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/ServerRuleExample.java index 06356e44..a7ea8776 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/ServerRuleExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/ServerRuleExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; import org.bukkit.entity.Player; public abstract class ServerRuleExample extends ApolloExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/StaffModExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/StaffModExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/StaffModExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/StaffModExample.java index aa0d42ea..05c20f55 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/StaffModExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/StaffModExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; import org.bukkit.entity.Player; public abstract class StaffModExample extends ApolloExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/StopwatchExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/StopwatchExample.java similarity index 92% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/StopwatchExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/StopwatchExample.java index 0025143b..92417caa 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/StopwatchExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/StopwatchExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; import org.bukkit.entity.Player; public abstract class StopwatchExample extends ApolloExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/TeamExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/TeamExample.java similarity index 92% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/TeamExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/TeamExample.java index 5f08cec3..3da27f9e 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/TeamExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/TeamExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; import org.bukkit.entity.Player; public abstract class TeamExample extends ApolloExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/TebexExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/TebexExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/TebexExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/TebexExample.java index 389a72b3..ba23761e 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/TebexExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/TebexExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; import org.bukkit.entity.Player; public abstract class TebexExample extends ApolloExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/TitleExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/TitleExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/TitleExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/TitleExample.java index e5ea20d8..3b955be6 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/TitleExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/TitleExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; import org.bukkit.entity.Player; public abstract class TitleExample extends ApolloExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/TntCountdownExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/TntCountdownExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/TntCountdownExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/TntCountdownExample.java index 2a1c9eef..46796516 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/TntCountdownExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/TntCountdownExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; import org.bukkit.entity.Player; public abstract class TntCountdownExample extends ApolloExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/TransferExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/TransferExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/TransferExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/TransferExample.java index c77bca3f..5bdf38d1 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/TransferExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/TransferExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; import org.bukkit.entity.Player; public abstract class TransferExample extends ApolloExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/VignetteExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/VignetteExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/VignetteExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/VignetteExample.java index 5f2db442..fc6b8520 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/VignetteExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/VignetteExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; import org.bukkit.entity.Player; public abstract class VignetteExample extends ApolloExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/WaypointExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/WaypointExample.java similarity index 92% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/WaypointExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/WaypointExample.java index 36be9f07..9859b498 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/WaypointExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/WaypointExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl; +package com.lunarclient.apollo.example.common.modules.impl; -import com.lunarclient.apollo.example.modules.ApolloExample; +import com.lunarclient.apollo.example.common.modules.ApolloExample; import org.bukkit.entity.Player; public abstract class WaypointExample extends ApolloExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/AdventureUtil.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/AdventureUtil.java similarity index 96% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/AdventureUtil.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/AdventureUtil.java index 1de401c2..91e172d2 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/AdventureUtil.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/AdventureUtil.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.utilities; +package com.lunarclient.apollo.example.json; import lombok.NonNull; import net.kyori.adventure.text.Component; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/JsonPacketUtil.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/JsonPacketUtil.java similarity index 98% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/JsonPacketUtil.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/JsonPacketUtil.java index f695d5e1..cc8b7501 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/JsonPacketUtil.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/JsonPacketUtil.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.utilities; +package com.lunarclient.apollo.example.json; import com.google.common.collect.Table; import com.google.gson.JsonArray; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/JsonUtil.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/JsonUtil.java similarity index 99% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/JsonUtil.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/JsonUtil.java index c8cd94fa..d3956117 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/JsonUtil.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/JsonUtil.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.utilities; +package com.lunarclient.apollo.example.json; import com.google.gson.JsonArray; import com.google.gson.JsonElement; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/BeamJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/BeamJsonExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/BeamJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/BeamJsonExample.java index fbbeb477..2446e73c 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/BeamJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/BeamJsonExample.java @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.gson.JsonObject; -import com.lunarclient.apollo.example.modules.impl.BeamExample; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; -import com.lunarclient.apollo.example.utilities.JsonUtil; +import com.lunarclient.apollo.example.common.modules.impl.BeamExample; +import com.lunarclient.apollo.example.json.JsonPacketUtil; +import com.lunarclient.apollo.example.json.JsonUtil; import java.awt.Color; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/BorderJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/BorderJsonExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/BorderJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/BorderJsonExample.java index 9a771a03..317f2856 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/BorderJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/BorderJsonExample.java @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.gson.JsonObject; -import com.lunarclient.apollo.example.modules.impl.BorderExample; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; -import com.lunarclient.apollo.example.utilities.JsonUtil; +import com.lunarclient.apollo.example.common.modules.impl.BorderExample; +import com.lunarclient.apollo.example.json.JsonPacketUtil; +import com.lunarclient.apollo.example.json.JsonUtil; import java.awt.Color; import org.bukkit.entity.Player; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/ChatJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/ChatJsonExample.java similarity index 90% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/ChatJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/ChatJsonExample.java index f8f68335..092285e6 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/ChatJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/ChatJsonExample.java @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.gson.JsonObject; -import com.lunarclient.apollo.example.modules.impl.ChatExample; -import com.lunarclient.apollo.example.utilities.AdventureUtil; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; +import com.lunarclient.apollo.example.common.modules.impl.ChatExample; +import com.lunarclient.apollo.example.json.AdventureUtil; +import com.lunarclient.apollo.example.json.JsonPacketUtil; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/ColoredFireJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/ColoredFireJsonExample.java similarity index 90% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/ColoredFireJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/ColoredFireJsonExample.java index 601255e9..662335b0 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/ColoredFireJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/ColoredFireJsonExample.java @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.gson.JsonObject; -import com.lunarclient.apollo.example.modules.impl.ColoredFireExample; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; -import com.lunarclient.apollo.example.utilities.JsonUtil; +import com.lunarclient.apollo.example.common.modules.impl.ColoredFireExample; +import com.lunarclient.apollo.example.json.JsonPacketUtil; +import com.lunarclient.apollo.example.json.JsonUtil; import java.awt.Color; import java.util.UUID; import org.bukkit.entity.Player; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/CombatJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/CombatJsonExample.java similarity index 87% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/CombatJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/CombatJsonExample.java index 63079509..94e32230 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/CombatJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/CombatJsonExample.java @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.gson.JsonObject; -import com.lunarclient.apollo.example.modules.impl.CombatExample; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; -import com.lunarclient.apollo.example.utilities.JsonUtil; +import com.lunarclient.apollo.example.common.modules.impl.CombatExample; +import com.lunarclient.apollo.example.json.JsonPacketUtil; +import com.lunarclient.apollo.example.json.JsonUtil; import java.util.HashMap; import java.util.Map; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/CooldownJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/CooldownJsonExample.java similarity index 92% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/CooldownJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/CooldownJsonExample.java index 3dbedab4..2bf52d19 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/CooldownJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/CooldownJsonExample.java @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.gson.JsonObject; -import com.lunarclient.apollo.example.modules.impl.CooldownExample; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; -import com.lunarclient.apollo.example.utilities.JsonUtil; +import com.lunarclient.apollo.example.common.modules.impl.CooldownExample; +import com.lunarclient.apollo.example.json.JsonPacketUtil; +import com.lunarclient.apollo.example.json.JsonUtil; import java.time.Duration; import org.bukkit.entity.Player; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/EntityJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/EntityJsonExample.java similarity index 93% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/EntityJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/EntityJsonExample.java index 72881f57..9094fc3b 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/EntityJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/EntityJsonExample.java @@ -21,13 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import com.lunarclient.apollo.example.modules.impl.EntityExample; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; -import com.lunarclient.apollo.example.utilities.JsonUtil; +import com.lunarclient.apollo.example.common.modules.impl.EntityExample; +import com.lunarclient.apollo.example.json.JsonPacketUtil; +import com.lunarclient.apollo.example.json.JsonUtil; import org.bukkit.entity.Cow; import org.bukkit.entity.Player; import org.bukkit.entity.Sheep; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/GlowJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/GlowJsonExample.java similarity index 90% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/GlowJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/GlowJsonExample.java index ce45539c..fef33533 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/GlowJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/GlowJsonExample.java @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.gson.JsonObject; -import com.lunarclient.apollo.example.modules.impl.GlowExample; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; -import com.lunarclient.apollo.example.utilities.JsonUtil; +import com.lunarclient.apollo.example.common.modules.impl.GlowExample; +import com.lunarclient.apollo.example.json.JsonPacketUtil; +import com.lunarclient.apollo.example.json.JsonUtil; import java.awt.Color; import java.util.UUID; import org.bukkit.entity.Player; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/HologramJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/HologramJsonExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/HologramJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/HologramJsonExample.java index 4ffdd7db..01689ca2 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/HologramJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/HologramJsonExample.java @@ -21,15 +21,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.common.collect.Lists; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import com.lunarclient.apollo.example.modules.impl.HologramExample; -import com.lunarclient.apollo.example.utilities.AdventureUtil; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; -import com.lunarclient.apollo.example.utilities.JsonUtil; +import com.lunarclient.apollo.example.common.modules.impl.HologramExample; +import com.lunarclient.apollo.example.json.AdventureUtil; +import com.lunarclient.apollo.example.json.JsonPacketUtil; +import com.lunarclient.apollo.example.json.JsonUtil; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.TextDecoration; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/LimbJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/LimbJsonExample.java similarity index 94% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/LimbJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/LimbJsonExample.java index 7045d738..60c2f91a 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/LimbJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/LimbJsonExample.java @@ -21,14 +21,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.common.collect.Lists; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import com.lunarclient.apollo.example.modules.impl.LimbExample; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; -import com.lunarclient.apollo.example.utilities.JsonUtil; +import com.lunarclient.apollo.example.common.modules.impl.LimbExample; +import com.lunarclient.apollo.example.json.JsonPacketUtil; +import com.lunarclient.apollo.example.json.JsonUtil; import org.bukkit.entity.Player; public class LimbJsonExample extends LimbExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/ModSettingsJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/ModSettingsJsonExample.java similarity index 90% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/ModSettingsJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/ModSettingsJsonExample.java index 19e31289..9100f302 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/ModSettingsJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/ModSettingsJsonExample.java @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.gson.JsonObject; -import com.lunarclient.apollo.example.modules.impl.ModSettingsExample; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; -import com.lunarclient.apollo.example.utilities.JsonUtil; +import com.lunarclient.apollo.example.common.modules.impl.ModSettingsExample; +import com.lunarclient.apollo.example.json.JsonPacketUtil; +import com.lunarclient.apollo.example.json.JsonUtil; import java.util.HashMap; import java.util.Map; import org.bukkit.entity.Player; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/NametagJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/NametagJsonExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/NametagJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/NametagJsonExample.java index d807903b..d6132d60 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/NametagJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/NametagJsonExample.java @@ -21,15 +21,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.common.collect.Lists; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import com.lunarclient.apollo.example.modules.impl.NametagExample; -import com.lunarclient.apollo.example.utilities.AdventureUtil; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; -import com.lunarclient.apollo.example.utilities.JsonUtil; +import com.lunarclient.apollo.example.common.modules.impl.NametagExample; +import com.lunarclient.apollo.example.json.AdventureUtil; +import com.lunarclient.apollo.example.json.JsonPacketUtil; +import com.lunarclient.apollo.example.json.JsonUtil; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.TextDecoration; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/NickHiderJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/NickHiderJsonExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/NickHiderJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/NickHiderJsonExample.java index 0487a6fd..c93cca16 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/NickHiderJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/NickHiderJsonExample.java @@ -21,11 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.gson.JsonObject; -import com.lunarclient.apollo.example.modules.impl.NickHiderExample; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; +import com.lunarclient.apollo.example.common.modules.impl.NickHiderExample; +import com.lunarclient.apollo.example.json.JsonPacketUtil; import org.bukkit.entity.Player; public class NickHiderJsonExample extends NickHiderExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/NotificationJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/NotificationJsonExample.java similarity index 89% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/NotificationJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/NotificationJsonExample.java index fe5feda2..e891d7d0 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/NotificationJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/NotificationJsonExample.java @@ -21,13 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.gson.JsonObject; -import com.lunarclient.apollo.example.modules.impl.NotificationExample; -import com.lunarclient.apollo.example.utilities.AdventureUtil; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; -import com.lunarclient.apollo.example.utilities.JsonUtil; +import com.lunarclient.apollo.example.common.modules.impl.NotificationExample; +import com.lunarclient.apollo.example.json.AdventureUtil; +import com.lunarclient.apollo.example.json.JsonPacketUtil; +import com.lunarclient.apollo.example.json.JsonUtil; import java.time.Duration; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/RichPresenceJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/RichPresenceJsonExample.java similarity index 92% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/RichPresenceJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/RichPresenceJsonExample.java index 07ccf8fc..855f6283 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/RichPresenceJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/RichPresenceJsonExample.java @@ -21,11 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.gson.JsonObject; -import com.lunarclient.apollo.example.modules.impl.RichPresenceExample; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; +import com.lunarclient.apollo.example.common.modules.impl.RichPresenceExample; +import com.lunarclient.apollo.example.json.JsonPacketUtil; import org.bukkit.entity.Player; public class RichPresenceJsonExample extends RichPresenceExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/ServerRuleJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/ServerRuleJsonExample.java similarity index 90% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/ServerRuleJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/ServerRuleJsonExample.java index 058f89d8..ea6ab10d 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/ServerRuleJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/ServerRuleJsonExample.java @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.gson.JsonObject; -import com.lunarclient.apollo.example.modules.impl.ServerRuleExample; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; -import com.lunarclient.apollo.example.utilities.JsonUtil; +import com.lunarclient.apollo.example.common.modules.impl.ServerRuleExample; +import com.lunarclient.apollo.example.json.JsonPacketUtil; +import com.lunarclient.apollo.example.json.JsonUtil; import java.util.HashMap; import java.util.Map; import org.bukkit.entity.Player; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/StaffModJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/StaffModJsonExample.java similarity index 92% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/StaffModJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/StaffModJsonExample.java index 77ef4166..e307f6a8 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/StaffModJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/StaffModJsonExample.java @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import com.lunarclient.apollo.example.modules.impl.StaffModExample; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; +import com.lunarclient.apollo.example.common.modules.impl.StaffModExample; +import com.lunarclient.apollo.example.json.JsonPacketUtil; import java.util.stream.Stream; import org.bukkit.entity.Player; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/StopwatchJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/StopwatchJsonExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/StopwatchJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/StopwatchJsonExample.java index 82f5c1ba..3d64539c 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/StopwatchJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/StopwatchJsonExample.java @@ -21,11 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.gson.JsonObject; -import com.lunarclient.apollo.example.modules.impl.StopwatchExample; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; +import com.lunarclient.apollo.example.common.modules.impl.StopwatchExample; +import com.lunarclient.apollo.example.json.JsonPacketUtil; import org.bukkit.entity.Player; public class StopwatchJsonExample extends StopwatchExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/TeamJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/TeamJsonExample.java similarity index 89% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/TeamJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/TeamJsonExample.java index ec320754..61d933e0 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/TeamJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/TeamJsonExample.java @@ -21,17 +21,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.TeamExample; -import com.lunarclient.apollo.example.utilities.AdventureUtil; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; -import com.lunarclient.apollo.example.utilities.JsonUtil; +import com.lunarclient.apollo.example.common.modules.impl.TeamExample; +import com.lunarclient.apollo.example.json.AdventureUtil; +import com.lunarclient.apollo.example.json.JsonPacketUtil; +import com.lunarclient.apollo.example.json.JsonUtil; import java.awt.Color; import java.util.Map; import java.util.Optional; @@ -48,11 +48,11 @@ public class TeamJsonExample extends TeamExample implements Listener { - private final Map teamsByTeamId = Maps.newHashMap(); - private final Map teamsByPlayerUuid = Maps.newHashMap(); + private final Map teamsByTeamId = Maps.newHashMap(); + private final Map teamsByPlayerUuid = Maps.newHashMap(); public TeamJsonExample() { - new TeamJsonExample.TeamUpdateTask(); + new TeamUpdateTask(); Bukkit.getPluginManager().registerEvents(this, ApolloExamplePlugin.getPlugin()); } @@ -68,23 +68,23 @@ private void onPlayerQuit(PlayerQuitEvent event) { }); } - public Optional getByPlayerUuid(UUID playerUuid) { + public Optional getByPlayerUuid(UUID playerUuid) { return Optional.ofNullable(this.teamsByPlayerUuid.get(playerUuid)); } - public Optional getByTeamId(UUID teamId) { + public Optional getByTeamId(UUID teamId) { return Optional.ofNullable(this.teamsByTeamId.get(teamId)); } - public TeamJsonExample.Team createTeam() { - TeamJsonExample.Team team = new TeamJsonExample.Team(); + public Team createTeam() { + Team team = new Team(); this.teamsByTeamId.put(team.getTeamId(), team); return team; } public void deleteTeam(UUID teamId) { - TeamJsonExample.Team team = this.teamsByTeamId.remove(teamId); + Team team = this.teamsByTeamId.remove(teamId); if (team != null) { team.getMembers().forEach(team::removeMember); @@ -163,7 +163,7 @@ public boolean equals(Object other) { return false; } - TeamJsonExample.Team team = (TeamJsonExample.Team) other; + Team team = (Team) other; return this.teamId.equals(team.getTeamId()); } @@ -182,7 +182,7 @@ public TeamUpdateTask() { @Override public void run() { - TeamJsonExample.this.teamsByTeamId.values().forEach(TeamJsonExample.Team::refresh); + TeamJsonExample.this.teamsByTeamId.values().forEach(Team::refresh); } } diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/TebexJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/TebexJsonExample.java similarity index 90% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/TebexJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/TebexJsonExample.java index cfb78c86..ff740125 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/TebexJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/TebexJsonExample.java @@ -21,11 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.gson.JsonObject; -import com.lunarclient.apollo.example.modules.impl.TebexExample; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; +import com.lunarclient.apollo.example.common.modules.impl.TebexExample; +import com.lunarclient.apollo.example.json.JsonPacketUtil; import org.bukkit.entity.Player; public class TebexJsonExample extends TebexExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/TitleJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/TitleJsonExample.java similarity index 90% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/TitleJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/TitleJsonExample.java index ee101ea1..019683cb 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/TitleJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/TitleJsonExample.java @@ -21,13 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.gson.JsonObject; -import com.lunarclient.apollo.example.modules.impl.TitleExample; -import com.lunarclient.apollo.example.utilities.AdventureUtil; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; -import com.lunarclient.apollo.example.utilities.JsonUtil; +import com.lunarclient.apollo.example.common.modules.impl.TitleExample; +import com.lunarclient.apollo.example.json.AdventureUtil; +import com.lunarclient.apollo.example.json.JsonPacketUtil; +import com.lunarclient.apollo.example.json.JsonUtil; import java.time.Duration; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/TntCountdownJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/TntCountdownJsonExample.java similarity index 95% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/TntCountdownJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/TntCountdownJsonExample.java index e1112424..6abac834 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/TntCountdownJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/TntCountdownJsonExample.java @@ -21,13 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.gson.JsonObject; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.TntCountdownExample; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; -import com.lunarclient.apollo.example.utilities.JsonUtil; +import com.lunarclient.apollo.example.common.modules.impl.TntCountdownExample; +import com.lunarclient.apollo.example.json.JsonPacketUtil; +import com.lunarclient.apollo.example.json.JsonUtil; import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/TransferJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/TransferJsonExample.java similarity index 92% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/TransferJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/TransferJsonExample.java index 50d1136f..8fdc2719 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/TransferJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/TransferJsonExample.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; -import com.lunarclient.apollo.example.modules.impl.TransferExample; +import com.lunarclient.apollo.example.common.modules.impl.TransferExample; import org.bukkit.entity.Player; public class TransferJsonExample extends TransferExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/VignetteJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/VignetteJsonExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/VignetteJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/VignetteJsonExample.java index 59c5cc7b..8a227562 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/VignetteJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/VignetteJsonExample.java @@ -21,11 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.gson.JsonObject; -import com.lunarclient.apollo.example.modules.impl.VignetteExample; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; +import com.lunarclient.apollo.example.common.modules.impl.VignetteExample; +import com.lunarclient.apollo.example.json.JsonPacketUtil; import org.bukkit.entity.Player; public class VignetteJsonExample extends VignetteExample { diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/WaypointJsonExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/WaypointJsonExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/WaypointJsonExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/WaypointJsonExample.java index 6f4ba63c..1d206699 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/json/WaypointJsonExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/WaypointJsonExample.java @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.json; +package com.lunarclient.apollo.example.json.examples; import com.google.gson.JsonObject; -import com.lunarclient.apollo.example.modules.impl.WaypointExample; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; -import com.lunarclient.apollo.example.utilities.JsonUtil; +import com.lunarclient.apollo.example.common.modules.impl.WaypointExample; +import com.lunarclient.apollo.example.json.JsonPacketUtil; +import com.lunarclient.apollo.example.json.JsonUtil; import java.awt.Color; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/listeners/json/ApolloPlayerJsonListener.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/listeners/ApolloPlayerJsonListener.java similarity index 97% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/listeners/json/ApolloPlayerJsonListener.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/json/listeners/ApolloPlayerJsonListener.java index c03f5b13..515eb5e5 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/listeners/json/ApolloPlayerJsonListener.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/json/listeners/ApolloPlayerJsonListener.java @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.listeners.json; +package com.lunarclient.apollo.example.json.listeners; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.utilities.JsonPacketUtil; +import com.lunarclient.apollo.example.json.JsonPacketUtil; import java.util.Arrays; import java.util.HashSet; import java.util.List; diff --git a/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/AdventureUtil.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/AdventureUtil.java new file mode 100644 index 00000000..aaab531d --- /dev/null +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/AdventureUtil.java @@ -0,0 +1,39 @@ +/* + * This file is part of Apollo, licensed under the MIT License. + * + * Copyright (c) 2023 Moonsworth + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package com.lunarclient.apollo.example.proto; + +import lombok.NonNull; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; + +public final class AdventureUtil { + + public static String toJson(@NonNull Component component) { + return GsonComponentSerializer.gson().serialize(component); + } + + private AdventureUtil() { + } + +} diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/ProtobufPacketUtil.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/ProtobufPacketUtil.java similarity index 98% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/ProtobufPacketUtil.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/ProtobufPacketUtil.java index 16e1bfbd..db641943 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/ProtobufPacketUtil.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/ProtobufPacketUtil.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.utilities; +package com.lunarclient.apollo.example.proto; import com.google.common.collect.Table; import com.google.protobuf.Any; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/ProtobufUtil.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/ProtobufUtil.java similarity index 99% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/ProtobufUtil.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/ProtobufUtil.java index 6d04b372..1f50408f 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/utilities/ProtobufUtil.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/ProtobufUtil.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.utilities; +package com.lunarclient.apollo.example.proto; import com.google.protobuf.Timestamp; import com.lunarclient.apollo.common.v1.AdvancedResourceLocationIcon; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/BeamProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/BeamProtoExample.java similarity index 90% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/BeamProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/BeamProtoExample.java index c219ad07..0eba19f7 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/BeamProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/BeamProtoExample.java @@ -21,14 +21,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; import com.lunarclient.apollo.beam.v1.DisplayBeaconBeamMessage; import com.lunarclient.apollo.beam.v1.RemoveBeaconBeamMessage; import com.lunarclient.apollo.beam.v1.ResetBeaconBeamsMessage; -import com.lunarclient.apollo.example.modules.impl.BeamExample; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; -import com.lunarclient.apollo.example.utilities.ProtobufUtil; +import com.lunarclient.apollo.example.common.modules.impl.BeamExample; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; +import com.lunarclient.apollo.example.proto.ProtobufUtil; import java.awt.Color; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/BorderProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/BorderProtoExample.java similarity index 90% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/BorderProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/BorderProtoExample.java index af035b40..03f1d934 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/BorderProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/BorderProtoExample.java @@ -21,14 +21,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; import com.lunarclient.apollo.border.v1.DisplayBorderMessage; import com.lunarclient.apollo.border.v1.RemoveBorderMessage; import com.lunarclient.apollo.border.v1.ResetBordersMessage; -import com.lunarclient.apollo.example.modules.impl.BorderExample; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; -import com.lunarclient.apollo.example.utilities.ProtobufUtil; +import com.lunarclient.apollo.example.common.modules.impl.BorderExample; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; +import com.lunarclient.apollo.example.proto.ProtobufUtil; import java.awt.Color; import org.bukkit.entity.Player; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/ChatProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/ChatProtoExample.java similarity index 90% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/ChatProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/ChatProtoExample.java index ff8f351c..adda6d26 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/ChatProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/ChatProtoExample.java @@ -21,13 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; import com.lunarclient.apollo.chat.v1.DisplayLiveChatMessageMessage; import com.lunarclient.apollo.chat.v1.RemoveLiveChatMessageMessage; -import com.lunarclient.apollo.example.modules.impl.ChatExample; -import com.lunarclient.apollo.example.utilities.AdventureUtil; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; +import com.lunarclient.apollo.example.common.modules.impl.ChatExample; +import com.lunarclient.apollo.example.proto.AdventureUtil; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/ColoredFireProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/ColoredFireProtoExample.java similarity index 90% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/ColoredFireProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/ColoredFireProtoExample.java index 5a10e679..7c201692 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/ColoredFireProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/ColoredFireProtoExample.java @@ -21,14 +21,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; import com.lunarclient.apollo.coloredfire.v1.OverrideColoredFireMessage; import com.lunarclient.apollo.coloredfire.v1.ResetColoredFireMessage; import com.lunarclient.apollo.coloredfire.v1.ResetColoredFiresMessage; -import com.lunarclient.apollo.example.modules.impl.ColoredFireExample; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; -import com.lunarclient.apollo.example.utilities.ProtobufUtil; +import com.lunarclient.apollo.example.common.modules.impl.ColoredFireExample; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; +import com.lunarclient.apollo.example.proto.ProtobufUtil; import java.awt.Color; import java.util.UUID; import org.bukkit.entity.Player; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/CombatProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/CombatProtoExample.java similarity index 90% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/CombatProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/CombatProtoExample.java index 9f2ecf7b..69d5b67f 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/CombatProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/CombatProtoExample.java @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; import com.google.protobuf.Value; import com.lunarclient.apollo.configurable.v1.ConfigurableSettings; -import com.lunarclient.apollo.example.modules.impl.CombatExample; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; +import com.lunarclient.apollo.example.common.modules.impl.CombatExample; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; import java.util.HashMap; import java.util.Map; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/CooldownProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/CooldownProtoExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/CooldownProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/CooldownProtoExample.java index 9000d513..9746ec35 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/CooldownProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/CooldownProtoExample.java @@ -21,14 +21,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; import com.lunarclient.apollo.cooldown.v1.DisplayCooldownMessage; import com.lunarclient.apollo.cooldown.v1.RemoveCooldownMessage; import com.lunarclient.apollo.cooldown.v1.ResetCooldownsMessage; -import com.lunarclient.apollo.example.modules.impl.CooldownExample; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; -import com.lunarclient.apollo.example.utilities.ProtobufUtil; +import com.lunarclient.apollo.example.common.modules.impl.CooldownExample; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; +import com.lunarclient.apollo.example.proto.ProtobufUtil; import java.time.Duration; import org.bukkit.entity.Player; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/EntityProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/EntityProtoExample.java similarity index 93% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/EntityProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/EntityProtoExample.java index d4ac7ee2..80c450c9 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/EntityProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/EntityProtoExample.java @@ -21,16 +21,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; import com.lunarclient.apollo.common.v1.EntityId; import com.lunarclient.apollo.entity.v1.FlipEntityMessage; import com.lunarclient.apollo.entity.v1.OverrideRainbowSheepMessage; import com.lunarclient.apollo.entity.v1.ResetFlipedEntityMessage; import com.lunarclient.apollo.entity.v1.ResetRainbowSheepMessage; -import com.lunarclient.apollo.example.modules.impl.EntityExample; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; -import com.lunarclient.apollo.example.utilities.ProtobufUtil; +import com.lunarclient.apollo.example.common.modules.impl.EntityExample; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; +import com.lunarclient.apollo.example.proto.ProtobufUtil; import java.util.Set; import java.util.stream.Collectors; import org.bukkit.entity.Cow; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/GlowProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/GlowProtoExample.java similarity index 90% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/GlowProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/GlowProtoExample.java index 0bfeb82a..94546c5a 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/GlowProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/GlowProtoExample.java @@ -21,11 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; -import com.lunarclient.apollo.example.modules.impl.GlowExample; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; -import com.lunarclient.apollo.example.utilities.ProtobufUtil; +import com.lunarclient.apollo.example.common.modules.impl.GlowExample; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; +import com.lunarclient.apollo.example.proto.ProtobufUtil; import com.lunarclient.apollo.glow.v1.OverrideGlowEffectMessage; import com.lunarclient.apollo.glow.v1.ResetGlowEffectMessage; import com.lunarclient.apollo.glow.v1.ResetGlowEffectsMessage; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/HologramProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/HologramProtoExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/HologramProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/HologramProtoExample.java index 2df615a0..2756b97b 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/HologramProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/HologramProtoExample.java @@ -21,13 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; import com.google.common.collect.Lists; -import com.lunarclient.apollo.example.modules.impl.HologramExample; -import com.lunarclient.apollo.example.utilities.AdventureUtil; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; -import com.lunarclient.apollo.example.utilities.ProtobufUtil; +import com.lunarclient.apollo.example.common.modules.impl.HologramExample; +import com.lunarclient.apollo.example.proto.AdventureUtil; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; +import com.lunarclient.apollo.example.proto.ProtobufUtil; import com.lunarclient.apollo.hologram.v1.DisplayHologramMessage; import com.lunarclient.apollo.hologram.v1.RemoveHologramMessage; import com.lunarclient.apollo.hologram.v1.ResetHologramsMessage; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/LimbProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/LimbProtoExample.java similarity index 92% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/LimbProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/LimbProtoExample.java index 3785d49a..ee22585d 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/LimbProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/LimbProtoExample.java @@ -21,11 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; -import com.lunarclient.apollo.example.modules.impl.LimbExample; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; -import com.lunarclient.apollo.example.utilities.ProtobufUtil; +import com.lunarclient.apollo.example.common.modules.impl.LimbExample; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; +import com.lunarclient.apollo.example.proto.ProtobufUtil; import com.lunarclient.apollo.limb.v1.ArmorPiece; import com.lunarclient.apollo.limb.v1.BodyPart; import com.lunarclient.apollo.limb.v1.HideArmorPiecesMessage; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/ModSettingsProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/ModSettingsProtoExample.java similarity index 93% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/ModSettingsProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/ModSettingsProtoExample.java index d8b932e1..4e500881 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/ModSettingsProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/ModSettingsProtoExample.java @@ -21,13 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; import com.google.protobuf.NullValue; import com.google.protobuf.Value; import com.lunarclient.apollo.configurable.v1.ConfigurableSettings; -import com.lunarclient.apollo.example.modules.impl.ModSettingsExample; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; +import com.lunarclient.apollo.example.common.modules.impl.ModSettingsExample; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; import java.util.HashMap; import java.util.Map; import org.bukkit.entity.Player; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/NametagProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/NametagProtoExample.java similarity index 90% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/NametagProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/NametagProtoExample.java index a0bf482d..8bafd5f8 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/NametagProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/NametagProtoExample.java @@ -21,13 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; import com.google.common.collect.Lists; -import com.lunarclient.apollo.example.modules.impl.NametagExample; -import com.lunarclient.apollo.example.utilities.AdventureUtil; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; -import com.lunarclient.apollo.example.utilities.ProtobufUtil; +import com.lunarclient.apollo.example.common.modules.impl.NametagExample; +import com.lunarclient.apollo.example.proto.AdventureUtil; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; +import com.lunarclient.apollo.example.proto.ProtobufUtil; import com.lunarclient.apollo.nametag.v1.OverrideNametagMessage; import com.lunarclient.apollo.nametag.v1.ResetNametagMessage; import com.lunarclient.apollo.nametag.v1.ResetNametagsMessage; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/NickHiderProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/NickHiderProtoExample.java similarity index 90% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/NickHiderProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/NickHiderProtoExample.java index 970762b0..9fb7dc47 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/NickHiderProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/NickHiderProtoExample.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; -import com.lunarclient.apollo.example.modules.impl.NickHiderExample; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; +import com.lunarclient.apollo.example.common.modules.impl.NickHiderExample; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; import com.lunarclient.apollo.nickhider.v1.OverrideNickHiderMessage; import com.lunarclient.apollo.nickhider.v1.ResetNickHiderMessage; import org.bukkit.entity.Player; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/NotificationProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/NotificationProtoExample.java similarity index 89% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/NotificationProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/NotificationProtoExample.java index 7a870f51..ccd8ea00 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/NotificationProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/NotificationProtoExample.java @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; -import com.lunarclient.apollo.example.modules.impl.NotificationExample; -import com.lunarclient.apollo.example.utilities.AdventureUtil; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; -import com.lunarclient.apollo.example.utilities.ProtobufUtil; +import com.lunarclient.apollo.example.common.modules.impl.NotificationExample; +import com.lunarclient.apollo.example.proto.AdventureUtil; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; +import com.lunarclient.apollo.example.proto.ProtobufUtil; import com.lunarclient.apollo.notification.v1.DisplayNotificationMessage; import com.lunarclient.apollo.notification.v1.ResetNotificationsMessage; import java.time.Duration; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/RichPresenceProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/RichPresenceProtoExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/RichPresenceProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/RichPresenceProtoExample.java index 78a7d9b1..d407941a 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/RichPresenceProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/RichPresenceProtoExample.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; -import com.lunarclient.apollo.example.modules.impl.RichPresenceExample; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; +import com.lunarclient.apollo.example.common.modules.impl.RichPresenceExample; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; import com.lunarclient.apollo.richpresence.v1.OverrideServerRichPresenceMessage; import com.lunarclient.apollo.richpresence.v1.ResetServerRichPresenceMessage; import org.bukkit.entity.Player; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/ServerRuleProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/ServerRuleProtoExample.java similarity index 93% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/ServerRuleProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/ServerRuleProtoExample.java index 979be601..32f8c9a4 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/ServerRuleProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/ServerRuleProtoExample.java @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; import com.google.protobuf.Value; import com.lunarclient.apollo.configurable.v1.ConfigurableSettings; -import com.lunarclient.apollo.example.modules.impl.ServerRuleExample; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; +import com.lunarclient.apollo.example.common.modules.impl.ServerRuleExample; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; import java.util.HashMap; import java.util.Map; import org.bukkit.entity.Player; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/StaffModProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/StaffModProtoExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/StaffModProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/StaffModProtoExample.java index 1e0ade34..9e6a8299 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/StaffModProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/StaffModProtoExample.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; -import com.lunarclient.apollo.example.modules.impl.StaffModExample; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; +import com.lunarclient.apollo.example.common.modules.impl.StaffModExample; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; import com.lunarclient.apollo.staffmod.v1.DisableStaffModsMessage; import com.lunarclient.apollo.staffmod.v1.EnableStaffModsMessage; import com.lunarclient.apollo.staffmod.v1.StaffMod; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/StopwatchProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/StopwatchProtoExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/StopwatchProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/StopwatchProtoExample.java index 074112bb..67ea1840 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/StopwatchProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/StopwatchProtoExample.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; -import com.lunarclient.apollo.example.modules.impl.StopwatchExample; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; +import com.lunarclient.apollo.example.common.modules.impl.StopwatchExample; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; import com.lunarclient.apollo.stopwatch.v1.ResetStopwatchMessage; import com.lunarclient.apollo.stopwatch.v1.StartStopwatchMessage; import com.lunarclient.apollo.stopwatch.v1.StopStopwatchMessage; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/TeamProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/TeamProtoExample.java similarity index 96% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/TeamProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/TeamProtoExample.java index b68614dc..5837c985 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/TeamProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/TeamProtoExample.java @@ -21,15 +21,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.TeamExample; -import com.lunarclient.apollo.example.utilities.AdventureUtil; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; -import com.lunarclient.apollo.example.utilities.ProtobufUtil; +import com.lunarclient.apollo.example.common.modules.impl.TeamExample; +import com.lunarclient.apollo.example.proto.AdventureUtil; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; +import com.lunarclient.apollo.example.proto.ProtobufUtil; import com.lunarclient.apollo.team.v1.ResetTeamMembersMessage; import com.lunarclient.apollo.team.v1.TeamMember; import com.lunarclient.apollo.team.v1.UpdateTeamMembersMessage; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/TebexProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/TebexProtoExample.java similarity index 90% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/TebexProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/TebexProtoExample.java index ec1658f9..d547ead0 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/TebexProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/TebexProtoExample.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; -import com.lunarclient.apollo.example.modules.impl.TebexExample; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; +import com.lunarclient.apollo.example.common.modules.impl.TebexExample; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; import com.lunarclient.apollo.tebex.v1.OpenTebexEmbeddedCheckoutMessage; import org.bukkit.entity.Player; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/TitleProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/TitleProtoExample.java similarity index 91% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/TitleProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/TitleProtoExample.java index 278d2314..f176e28a 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/TitleProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/TitleProtoExample.java @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; -import com.lunarclient.apollo.example.modules.impl.json.TitleJsonExample; -import com.lunarclient.apollo.example.utilities.AdventureUtil; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; -import com.lunarclient.apollo.example.utilities.ProtobufUtil; +import com.lunarclient.apollo.example.json.examples.TitleJsonExample; +import com.lunarclient.apollo.example.proto.AdventureUtil; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; +import com.lunarclient.apollo.example.proto.ProtobufUtil; import com.lunarclient.apollo.title.v1.DisplayTitleMessage; import com.lunarclient.apollo.title.v1.ResetTitlesMessage; import com.lunarclient.apollo.title.v1.TitleType; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/TntCountdownProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/TntCountdownProtoExample.java similarity index 95% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/TntCountdownProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/TntCountdownProtoExample.java index c14a8ea7..16ef01c3 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/TntCountdownProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/TntCountdownProtoExample.java @@ -21,14 +21,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; import com.google.protobuf.Value; import com.lunarclient.apollo.configurable.v1.ConfigurableSettings; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.modules.impl.TntCountdownExample; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; -import com.lunarclient.apollo.example.utilities.ProtobufUtil; +import com.lunarclient.apollo.example.common.modules.impl.TntCountdownExample; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; +import com.lunarclient.apollo.example.proto.ProtobufUtil; import com.lunarclient.apollo.tntcountdown.v1.SetTntCountdownMessage; import java.lang.reflect.Method; import java.util.HashMap; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/TransferProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/TransferProtoExample.java similarity index 95% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/TransferProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/TransferProtoExample.java index 827a78f7..d62b043f 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/TransferProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/TransferProtoExample.java @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; import com.google.common.collect.Lists; import com.google.protobuf.ByteString; -import com.lunarclient.apollo.example.listeners.proto.ApolloRoundtripProtoListener; -import com.lunarclient.apollo.example.modules.impl.TransferExample; +import com.lunarclient.apollo.example.common.modules.impl.TransferExample; +import com.lunarclient.apollo.example.proto.listeners.ApolloRoundtripProtoListener; import com.lunarclient.apollo.transfer.v1.PingData; import com.lunarclient.apollo.transfer.v1.PingRequest; import com.lunarclient.apollo.transfer.v1.PingResponse; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/VignetteProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/VignetteProtoExample.java similarity index 90% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/VignetteProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/VignetteProtoExample.java index acce1167..3cb665c9 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/VignetteProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/VignetteProtoExample.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; -import com.lunarclient.apollo.example.modules.impl.VignetteExample; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; +import com.lunarclient.apollo.example.common.modules.impl.VignetteExample; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; import com.lunarclient.apollo.vignette.v1.DisplayVignetteMessage; import com.lunarclient.apollo.vignette.v1.ResetVignetteMessage; import org.bukkit.entity.Player; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/WaypointProtoExample.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/WaypointProtoExample.java similarity index 90% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/WaypointProtoExample.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/WaypointProtoExample.java index 151d04a3..df457fa9 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/modules/impl/proto/WaypointProtoExample.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/WaypointProtoExample.java @@ -21,11 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.modules.impl.proto; +package com.lunarclient.apollo.example.proto.examples; -import com.lunarclient.apollo.example.modules.impl.WaypointExample; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; -import com.lunarclient.apollo.example.utilities.ProtobufUtil; +import com.lunarclient.apollo.example.common.modules.impl.WaypointExample; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; +import com.lunarclient.apollo.example.proto.ProtobufUtil; import com.lunarclient.apollo.waypoint.v1.DisplayWaypointMessage; import com.lunarclient.apollo.waypoint.v1.RemoveWaypointMessage; import com.lunarclient.apollo.waypoint.v1.ResetWaypointsMessage; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/listeners/proto/ApolloPacketReceiveProtoListener.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/listeners/ApolloPacketReceiveProtoListener.java similarity index 97% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/listeners/proto/ApolloPacketReceiveProtoListener.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/listeners/ApolloPacketReceiveProtoListener.java index 9f5b2726..2a3d7a74 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/listeners/proto/ApolloPacketReceiveProtoListener.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/listeners/ApolloPacketReceiveProtoListener.java @@ -21,13 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.listeners.proto; +package com.lunarclient.apollo.example.proto.listeners; import com.google.protobuf.Any; import com.google.protobuf.InvalidProtocolBufferException; import com.lunarclient.apollo.common.v1.LunarClientVersion; import com.lunarclient.apollo.common.v1.MinecraftVersion; -import com.lunarclient.apollo.example.utilities.ProtobufUtil; +import com.lunarclient.apollo.example.proto.ProtobufUtil; import com.lunarclient.apollo.packetenrichment.v1.PlayerAttackMessage; import com.lunarclient.apollo.packetenrichment.v1.PlayerChatCloseMessage; import com.lunarclient.apollo.packetenrichment.v1.PlayerChatOpenMessage; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/listeners/proto/ApolloPlayerProtoListener.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/listeners/ApolloPlayerProtoListener.java similarity index 98% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/listeners/proto/ApolloPlayerProtoListener.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/listeners/ApolloPlayerProtoListener.java index 5f88fbb6..d396c11f 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/listeners/proto/ApolloPlayerProtoListener.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/listeners/ApolloPlayerProtoListener.java @@ -21,14 +21,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.listeners.proto; +package com.lunarclient.apollo.example.proto.listeners; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; import com.google.protobuf.ListValue; import com.google.protobuf.Value; import com.lunarclient.apollo.example.ApolloExamplePlugin; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; import java.util.Arrays; import java.util.HashSet; import java.util.List; diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/listeners/proto/ApolloRoundtripProtoListener.java b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/listeners/ApolloRoundtripProtoListener.java similarity index 96% rename from lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/listeners/proto/ApolloRoundtripProtoListener.java rename to bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/listeners/ApolloRoundtripProtoListener.java index f88b1f3f..bda03243 100644 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/listeners/proto/ApolloRoundtripProtoListener.java +++ b/bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/listeners/ApolloRoundtripProtoListener.java @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.lunarclient.apollo.example.listeners.proto; +package com.lunarclient.apollo.example.proto.listeners; import com.google.protobuf.Any; import com.google.protobuf.GeneratedMessageV3; import com.google.protobuf.InvalidProtocolBufferException; -import com.lunarclient.apollo.example.utilities.ProtobufPacketUtil; +import com.lunarclient.apollo.example.proto.ProtobufPacketUtil; import com.lunarclient.apollo.transfer.v1.PingResponse; import com.lunarclient.apollo.transfer.v1.TransferResponse; import java.util.HashMap; diff --git a/bukkit-example/src/main/resources/plugin.yml b/bukkit-example/src/main/resources/plugin.yml index 8fb428b2..f9239664 100644 --- a/bukkit-example/src/main/resources/plugin.yml +++ b/bukkit-example/src/main/resources/plugin.yml @@ -2,10 +2,11 @@ name: Apollo-Example main: com.lunarclient.apollo.example.ApolloExamplePlugin version: 1.1.5 author: Moonsworth -depend: [ Apollo-Bukkit ] api-version: 1.13 commands: + switch: + description: "Switch the implementation type!" beam: description: "Beams!" border: diff --git a/deploy.sh b/deploy.sh index 844afa5a..90bb88d7 100755 --- a/deploy.sh +++ b/deploy.sh @@ -2,6 +2,6 @@ set -e ./gradlew clean build # scp bukkit/build/libs/apollo-bukkit-1.1.6-SNAPSHOT.jar ubuntu@147.135.8.94:/home/ubuntu/apollo/plugins/ -scp lightweight-bukkit-example/build/libs/apollo-lightweight-bukkit-example-1.1.6-SNAPSHOT.jar ubuntu@147.135.8.94:/home/ubuntu/apollo/plugins/ +scp bukkit-example/build/libs/apollo-bukkit-example-1.1.6-SNAPSHOT.jar ubuntu@147.135.8.94:/home/ubuntu/apollo/plugins/ # scp bukkit/build/libs/apollo-bukkit-1.1.6-SNAPSHOT.jar ubuntu@147.135.8.94:/home/ubuntu/lctest/plugins/ -# scp lightweight-bukkit-example/build/libs/apollo-bukkit-example-1.1.6-SNAPSHOT.jar ubuntu@147.135.8.94:/home/ubuntu/lctest/plugins/ +# scp bukkit-example/build/libs/apollo-bukkit-example-1.1.6-SNAPSHOT.jar ubuntu@147.135.8.94:/home/ubuntu/lctest/plugins/ diff --git a/lightweight-bukkit-example/build.gradle.kts b/lightweight-bukkit-example/build.gradle.kts deleted file mode 100644 index d4b7305c..00000000 --- a/lightweight-bukkit-example/build.gradle.kts +++ /dev/null @@ -1,18 +0,0 @@ -plugins { - id("apollo.base-conventions") - id("apollo.shadow-conventions") -} - -dependencies { - compileOnly(libs.bukkit.api) - - api(libs.protobuf) - api(libs.protobuf.java.util) - - api(libs.bundles.adventure) { - exclude("org.checkerframework") - exclude("net.kyori", "adventure-api") - exclude("net.kyori", "adventure-bom") - exclude("com.google.code.gson", "gson") - } -} diff --git a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/ApolloExamplePlugin.java b/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/ApolloExamplePlugin.java deleted file mode 100644 index 20a5d030..00000000 --- a/lightweight-bukkit-example/src/main/java/com/lunarclient/apollo/example/ApolloExamplePlugin.java +++ /dev/null @@ -1,314 +0,0 @@ -/* - * This file is part of Apollo, licensed under the MIT License. - * - * Copyright (c) 2023 Moonsworth - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.lunarclient.apollo.example; - -import com.lunarclient.apollo.example.commands.SwitchCommand; -import com.lunarclient.apollo.example.commands.feature.BeamCommand; -import com.lunarclient.apollo.example.commands.feature.BorderCommand; -import com.lunarclient.apollo.example.commands.feature.ChatCommand; -import com.lunarclient.apollo.example.commands.feature.ColoredFireCommand; -import com.lunarclient.apollo.example.commands.feature.CombatCommand; -import com.lunarclient.apollo.example.commands.feature.CooldownCommand; -import com.lunarclient.apollo.example.commands.feature.EntityCommand; -import com.lunarclient.apollo.example.commands.feature.GlowCommand; -import com.lunarclient.apollo.example.commands.feature.HologramCommand; -import com.lunarclient.apollo.example.commands.feature.LimbCommand; -import com.lunarclient.apollo.example.commands.feature.ModSettingsCommand; -import com.lunarclient.apollo.example.commands.feature.NametagCommand; -import com.lunarclient.apollo.example.commands.feature.NickHiderCommand; -import com.lunarclient.apollo.example.commands.feature.NotificationCommand; -import com.lunarclient.apollo.example.commands.feature.RichPresenceCommand; -import com.lunarclient.apollo.example.commands.feature.ServerRuleCommand; -import com.lunarclient.apollo.example.commands.feature.StaffModCommand; -import com.lunarclient.apollo.example.commands.feature.StopwatchCommand; -import com.lunarclient.apollo.example.commands.feature.TeamCommand; -import com.lunarclient.apollo.example.commands.feature.TebexCommand; -import com.lunarclient.apollo.example.commands.feature.TitleCommand; -import com.lunarclient.apollo.example.commands.feature.TntCountdownCommand; -import com.lunarclient.apollo.example.commands.feature.TransferCommand; -import com.lunarclient.apollo.example.commands.feature.VignetteCommand; -import com.lunarclient.apollo.example.commands.feature.WaypointCommand; -import com.lunarclient.apollo.example.listeners.json.ApolloPlayerJsonListener; -import com.lunarclient.apollo.example.listeners.proto.ApolloPlayerProtoListener; -import com.lunarclient.apollo.example.modules.ApolloExampleType; -import com.lunarclient.apollo.example.modules.impl.BeamExample; -import com.lunarclient.apollo.example.modules.impl.BorderExample; -import com.lunarclient.apollo.example.modules.impl.ChatExample; -import com.lunarclient.apollo.example.modules.impl.ColoredFireExample; -import com.lunarclient.apollo.example.modules.impl.CombatExample; -import com.lunarclient.apollo.example.modules.impl.CooldownExample; -import com.lunarclient.apollo.example.modules.impl.EntityExample; -import com.lunarclient.apollo.example.modules.impl.GlowExample; -import com.lunarclient.apollo.example.modules.impl.HologramExample; -import com.lunarclient.apollo.example.modules.impl.LimbExample; -import com.lunarclient.apollo.example.modules.impl.ModSettingsExample; -import com.lunarclient.apollo.example.modules.impl.NametagExample; -import com.lunarclient.apollo.example.modules.impl.NickHiderExample; -import com.lunarclient.apollo.example.modules.impl.NotificationExample; -import com.lunarclient.apollo.example.modules.impl.RichPresenceExample; -import com.lunarclient.apollo.example.modules.impl.ServerRuleExample; -import com.lunarclient.apollo.example.modules.impl.StaffModExample; -import com.lunarclient.apollo.example.modules.impl.StopwatchExample; -import com.lunarclient.apollo.example.modules.impl.TeamExample; -import com.lunarclient.apollo.example.modules.impl.TebexExample; -import com.lunarclient.apollo.example.modules.impl.TitleExample; -import com.lunarclient.apollo.example.modules.impl.TntCountdownExample; -import com.lunarclient.apollo.example.modules.impl.TransferExample; -import com.lunarclient.apollo.example.modules.impl.VignetteExample; -import com.lunarclient.apollo.example.modules.impl.WaypointExample; -import com.lunarclient.apollo.example.modules.impl.json.BeamJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.BorderJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.ChatJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.ColoredFireJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.CombatJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.CooldownJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.EntityJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.GlowJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.HologramJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.LimbJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.ModSettingsJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.NametagJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.NickHiderJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.NotificationJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.RichPresenceJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.ServerRuleJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.StaffModJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.StopwatchJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.TeamJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.TebexJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.TitleJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.TntCountdownJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.TransferJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.VignetteJsonExample; -import com.lunarclient.apollo.example.modules.impl.json.WaypointJsonExample; -import com.lunarclient.apollo.example.modules.impl.proto.BeamProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.BorderProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.ChatProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.ColoredFireProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.CombatProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.CooldownProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.EntityProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.GlowProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.HologramProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.LimbProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.ModSettingsProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.NametagProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.NickHiderProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.NotificationProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.RichPresenceProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.ServerRuleProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.StaffModProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.StopwatchProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.TeamProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.TebexProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.TitleProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.TntCountdownProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.TransferProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.VignetteProtoExample; -import com.lunarclient.apollo.example.modules.impl.proto.WaypointProtoExample; -import lombok.Getter; -import org.bukkit.plugin.java.JavaPlugin; - -@Getter -public class ApolloExamplePlugin extends JavaPlugin { - - @Getter - private static ApolloExamplePlugin plugin; - - public static ApolloExampleType TYPE; - - private ApolloPlayerProtoListener playerProtoListener; - private ApolloPlayerJsonListener playerJsonListener; - - private BeamExample beamExample; - private BorderExample borderExample; - private ChatExample chatExample; - private ColoredFireExample coloredFireExample; - private CombatExample combatExample; - private CooldownExample cooldownExample; - private EntityExample entityExample; - private GlowExample glowExample; - private HologramExample hologramExample; - private LimbExample limbExample; - private ModSettingsExample modSettingsExample; - private NametagExample nametagExample; - private NickHiderExample nickHiderExample; - private NotificationExample notificationExample; - private RichPresenceExample richPresenceExample; - private ServerRuleExample serverRuleExample; - private StaffModExample staffModExample; - private StopwatchExample stopwatchExample; - private TeamExample teamExample; - private TebexExample tebexExample; - private TitleExample titleExample; - private TntCountdownExample tntCountdownExample; - private TransferExample transferExample; - private VignetteExample vignetteExample; - private WaypointExample waypointExample; - - @Override - public void onEnable() { - plugin = this; - - this.changeImplementationType(ApolloExampleType.JSON); - this.registerCommands(); - } - - @Override - public void onDisable() { - - } - - private void registerCommands() { - this.getCommand("switch").setExecutor(new SwitchCommand()); - - this.getCommand("beam").setExecutor(new BeamCommand()); - this.getCommand("border").setExecutor(new BorderCommand()); - this.getCommand("chat").setExecutor(new ChatCommand()); - this.getCommand("coloredfire").setExecutor(new ColoredFireCommand()); - this.getCommand("combat").setExecutor(new CombatCommand()); - this.getCommand("cooldown").setExecutor(new CooldownCommand()); - this.getCommand("entity").setExecutor(new EntityCommand()); - this.getCommand("glow").setExecutor(new GlowCommand()); - this.getCommand("hologram").setExecutor(new HologramCommand()); - this.getCommand("limb").setExecutor(new LimbCommand()); - this.getCommand("modsettings").setExecutor(new ModSettingsCommand()); - this.getCommand("nametag").setExecutor(new NametagCommand()); - this.getCommand("nickhider").setExecutor(new NickHiderCommand()); - this.getCommand("notification").setExecutor(new NotificationCommand()); - this.getCommand("richpresence").setExecutor(new RichPresenceCommand()); - this.getCommand("serverrule").setExecutor(new ServerRuleCommand()); - this.getCommand("staffmod").setExecutor(new StaffModCommand()); - this.getCommand("stopwatch").setExecutor(new StopwatchCommand()); - this.getCommand("team").setExecutor(new TeamCommand()); - this.getCommand("tebex").setExecutor(new TebexCommand()); - this.getCommand("title").setExecutor(new TitleCommand()); - this.getCommand("tntcountdown").setExecutor(new TntCountdownCommand()); - this.getCommand("transfer").setExecutor(new TransferCommand()); - this.getCommand("vignette").setExecutor(new VignetteCommand()); - this.getCommand("waypoint").setExecutor(new WaypointCommand()); - } - - public void changeImplementationType(ApolloExampleType type) { - TYPE = type; - - if (this.playerProtoListener != null) { - this.playerProtoListener.disable(); - this.playerProtoListener = null; - } - - if (this.playerJsonListener != null) { - this.playerJsonListener.disable(); - this.playerJsonListener = null; - } - - this.registerModuleExamples(); - this.registerListeners(); - } - - private void registerModuleExamples() { - switch (TYPE) { - case API: { - break; - } - - case JSON: { - this.beamExample = new BeamJsonExample(); - this.borderExample = new BorderJsonExample(); - this.chatExample = new ChatJsonExample(); - this.coloredFireExample = new ColoredFireJsonExample(); - this.combatExample = new CombatJsonExample(); - this.cooldownExample = new CooldownJsonExample(); - this.entityExample = new EntityJsonExample(); - this.glowExample = new GlowJsonExample(); - this.hologramExample = new HologramJsonExample(); - this.limbExample = new LimbJsonExample(); - this.modSettingsExample = new ModSettingsJsonExample(); - this.nametagExample = new NametagJsonExample(); - this.nickHiderExample = new NickHiderJsonExample(); - this.notificationExample = new NotificationJsonExample(); - this.richPresenceExample = new RichPresenceJsonExample(); - this.serverRuleExample = new ServerRuleJsonExample(); - this.staffModExample = new StaffModJsonExample(); - this.stopwatchExample = new StopwatchJsonExample(); - this.teamExample = new TeamJsonExample(); - this.tebexExample = new TebexJsonExample(); - this.titleExample = new TitleJsonExample(); - this.tntCountdownExample = new TntCountdownJsonExample(); - this.transferExample = new TransferJsonExample(); - this.vignetteExample = new VignetteJsonExample(); - this.waypointExample = new WaypointJsonExample(); - break; - } - - case PROTO: { - this.beamExample = new BeamProtoExample(); - this.borderExample = new BorderProtoExample(); - this.chatExample = new ChatProtoExample(); - this.coloredFireExample = new ColoredFireProtoExample(); - this.combatExample = new CombatProtoExample(); - this.cooldownExample = new CooldownProtoExample(); - this.entityExample = new EntityProtoExample(); - this.glowExample = new GlowProtoExample(); - this.hologramExample = new HologramProtoExample(); - this.limbExample = new LimbProtoExample(); - this.modSettingsExample = new ModSettingsProtoExample(); - this.nametagExample = new NametagProtoExample(); - this.nickHiderExample = new NickHiderProtoExample(); - this.notificationExample = new NotificationProtoExample(); - this.richPresenceExample = new RichPresenceProtoExample(); - this.serverRuleExample = new ServerRuleProtoExample(); - this.staffModExample = new StaffModProtoExample(); - this.stopwatchExample = new StopwatchProtoExample(); - this.teamExample = new TeamProtoExample(); - this.tebexExample = new TebexProtoExample(); - this.titleExample = new TitleProtoExample(); - this.tntCountdownExample = new TntCountdownProtoExample(); - this.transferExample = new TransferProtoExample(); - this.vignetteExample = new VignetteProtoExample(); - this.waypointExample = new WaypointProtoExample(); - break; - } - } - } - - private void registerListeners() { - switch (TYPE) { - case API: { - break; - } - - case JSON: { - this.playerJsonListener = new ApolloPlayerJsonListener(this); - break; - } - - case PROTO: { - this.playerProtoListener = new ApolloPlayerProtoListener(this); - break; - } - } - } - -} diff --git a/lightweight-bukkit-example/src/main/resources/plugin.yml b/lightweight-bukkit-example/src/main/resources/plugin.yml deleted file mode 100644 index cf1c2157..00000000 --- a/lightweight-bukkit-example/src/main/resources/plugin.yml +++ /dev/null @@ -1,59 +0,0 @@ -name: Apollo-Example -main: com.lunarclient.apollo.example.ApolloExamplePlugin -version: 1.1.4 -author: Moonsworth -api-version: 1.13 - -commands: - switch: - description: "Switch the implementation type!" - beam: - description: "Beams!" - border: - description: "Borders!" - chat: - description: "Chat!" - coloredfire: - description: "Colored Fires!" - combat: - description: "Combat!" - cooldown: - description: "Cooldowns!" - entity: - description: "Entity!" - glow: - description: "Glow!" - hologram: - description: "Holograms!" - limb: - description: "Limb!" - modsettings: - description: "ModSettings!" - nametag: - description: "Nametags!" - nickhider: - description: "Nick Hider!" - notification: - description: "Notifications!" - richpresence: - description: "Rich Presence!" - serverrule: - description: "Server Rule!" - staffmod: - description: "Staff Mods!" - stopwatch: - description: "Stopwatch!" - team: - description: "Teams!" - tebex: - description: "Tebex!" - title: - description: "Titles!" - tntcountdown: - description: "TNT Countdown!" - transfer: - description: "Transfer!" - vignette: - description: "Vignette!" - waypoint: - description: "Waypoints!" diff --git a/settings.gradle.kts b/settings.gradle.kts index 0c429f68..ecb0d4e8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -37,7 +37,6 @@ listOfNotNull( "common", "bukkit", "bukkit-example", - "lightweight-bukkit-example", if (loadAllVersions) "bungee" else null, if (loadAllVersions) "velocity" else null ).forEach {