Rename basic module class and package

GlowingInk · Aug 26, 2023 · f9a2fd0 · f9a2fd0
1 parent 7432d35
commit f9a2fd0
Show file tree

Hide file tree

Showing 154 changed files with 218 additions and 212 deletions.
diff --git a/reactions/src/main/java/fun/reactions/PersistentVariablesManager.java b/reactions/src/main/java/fun/reactions/PersistentVariablesManager.java
@@ -22,7 +22,7 @@
 
 package fun.reactions;
 
-import fun.reactions.module.basics.ContextManager;
+import fun.reactions.module.basic.ContextManager;
 import fun.reactions.util.FileUtils;
 import fun.reactions.util.Utils;
 import fun.reactions.util.collections.CaseInsensitiveMap;

diff --git a/reactions/src/main/java/fun/reactions/ReActionsPlugin.java b/reactions/src/main/java/fun/reactions/ReActionsPlugin.java
@@ -35,7 +35,7 @@
 import fun.reactions.model.activators.type.ActivatorTypesRegistry;
 import fun.reactions.model.activity.ActivitiesRegistry;
 import fun.reactions.module.ModulesRegistry;
-import fun.reactions.module.basics.ReActionsModule;
+import fun.reactions.module.basic.BasicModule;
 import fun.reactions.module.papi.PapiModule;
 import fun.reactions.module.vault.VaultModule;
 import fun.reactions.module.worldedit.WorldEditModule;
@@ -101,7 +101,7 @@ public void onLoad() {
         this.userCommandsManager = new UserCommandsManager(this);
         ReActions.setPlatform(this);
 
-        modulesRegistry.registerModule(new ReActionsModule());
+        modulesRegistry.registerModule(new BasicModule());
         modulesRegistry.registerModule(new VaultModule());
         modulesRegistry.registerModule(new PapiModule());
         modulesRegistry.registerModule(new WorldEditModule());

diff --git a/reactions/src/main/java/fun/reactions/commands/CmdExec.java b/reactions/src/main/java/fun/reactions/commands/CmdExec.java
@@ -1,6 +1,6 @@
 package fun.reactions.commands;
 
-import fun.reactions.module.basics.ContextManager;
+import fun.reactions.module.basic.ContextManager;
 import fun.reactions.util.message.Msg;
 import fun.reactions.util.parameter.Parameters;
 import org.bukkit.command.CommandSender;
@@ -9,7 +9,6 @@
         subCommands = {}, allowConsole = true,
         shortDescription = "&3/exec <activator> [player:<PlayerSelector>] [delay:<Time>]")
 public class CmdExec extends Cmd {
-
     @Override
     public boolean execute(CommandSender sender, String[] args) {
         if (args.length == 0) return false;
@@ -20,5 +19,4 @@ public boolean execute(CommandSender sender, String[] args) {
         } else Msg.printMSG(sender, "cmd_runplayerfail", 'c', '6', commandLine);
         return true;
     }
-
 }
diff --git a/reactions/src/main/java/fun/reactions/commands/CmdRun.java b/reactions/src/main/java/fun/reactions/commands/CmdRun.java
@@ -1,6 +1,6 @@
 package fun.reactions.commands;
 
-import fun.reactions.module.basics.ContextManager;
+import fun.reactions.module.basic.ContextManager;
 import fun.reactions.util.message.Msg;
 import org.bukkit.command.CommandSender;
 

diff --git a/reactions/src/main/java/fun/reactions/commands/user/UserCommandsManager.java b/reactions/src/main/java/fun/reactions/commands/user/UserCommandsManager.java
@@ -3,7 +3,7 @@
 import fun.reactions.ReActions;
 import fun.reactions.model.Logic;
 import fun.reactions.model.activators.Activator;
-import fun.reactions.module.basics.activators.CommandActivator;
+import fun.reactions.module.basic.activators.CommandActivator;
 import fun.reactions.util.FileUtils;
 import fun.reactions.util.Utils;
 import org.bukkit.Bukkit;

diff --git a/reactions/src/main/java/fun/reactions/events/listeners/BukkitListener.java b/reactions/src/main/java/fun/reactions/events/listeners/BukkitListener.java
@@ -8,15 +8,15 @@
 import fun.reactions.model.activators.ActivationContext;
 import fun.reactions.model.activators.Activator;
 import fun.reactions.model.environment.Variables;
-import fun.reactions.module.basics.activators.BlockBreakActivator;
-import fun.reactions.module.basics.activators.DamageActivator;
-import fun.reactions.module.basics.activators.DropActivator;
-import fun.reactions.module.basics.activators.InventoryClickActivator;
-import fun.reactions.module.basics.activators.MessageActivator;
-import fun.reactions.module.basics.activators.MobDamageActivator;
-import fun.reactions.module.basics.activators.QuitActivator;
-import fun.reactions.module.basics.activators.SignActivator;
-import fun.reactions.module.basics.activators.TeleportActivator;
+import fun.reactions.module.basic.activators.BlockBreakActivator;
+import fun.reactions.module.basic.activators.DamageActivator;
+import fun.reactions.module.basic.activators.DropActivator;
+import fun.reactions.module.basic.activators.InventoryClickActivator;
+import fun.reactions.module.basic.activators.MessageActivator;
+import fun.reactions.module.basic.activators.MobDamageActivator;
+import fun.reactions.module.basic.activators.QuitActivator;
+import fun.reactions.module.basic.activators.SignActivator;
+import fun.reactions.module.basic.activators.TeleportActivator;
 import fun.reactions.module.vault.external.RaVault;
 import fun.reactions.util.BlockUtils;
 import fun.reactions.util.NumberUtils;
@@ -61,9 +61,9 @@
 import java.util.List;
 import java.util.Optional;
 
-import static fun.reactions.module.basics.ContextManager.*;
-import static fun.reactions.module.basics.ItemContextManager.triggerItemHold;
-import static fun.reactions.module.basics.ItemContextManager.triggerItemWear;
+import static fun.reactions.module.basic.ContextManager.*;
+import static fun.reactions.module.basic.ItemContextManager.triggerItemHold;
+import static fun.reactions.module.basic.ItemContextManager.triggerItemWear;
 
 public class BukkitListener implements Listener {
     @EventHandler(ignoreCancelled = true)

diff --git a/reactions/src/main/java/fun/reactions/events/listeners/GodModeListener.java b/reactions/src/main/java/fun/reactions/events/listeners/GodModeListener.java
@@ -2,7 +2,7 @@
 
 import fun.reactions.Cfg;
 import fun.reactions.ReActions;
-import fun.reactions.module.basics.ContextManager;
+import fun.reactions.module.basic.ContextManager;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;

diff --git a/reactions/src/main/java/fun/reactions/events/listeners/LogHandler.java b/reactions/src/main/java/fun/reactions/events/listeners/LogHandler.java
@@ -22,8 +22,8 @@
 
 package fun.reactions.events.listeners;
 
-import fun.reactions.module.basics.ContextManager;
-import fun.reactions.module.basics.activators.MessageActivator;
+import fun.reactions.module.basic.ContextManager;
+import fun.reactions.module.basic.activators.MessageActivator;
 
 import java.util.logging.LogRecord;
 import java.util.logging.StreamHandler;

diff --git a/reactions/src/main/java/fun/reactions/events/listeners/MoveListener.java b/reactions/src/main/java/fun/reactions/events/listeners/MoveListener.java
@@ -59,8 +59,9 @@ public static void init() {
 
     private static void processMove(Player player, Location from, Location to) {
         PushBack.rememberLocations(player, from, to);
-        PlayerEvent event = LocationUtils.equalsPositionally(from, to) ?
-                new PlayerStayEvent(player, to) : new PlayerMoveByBlockEvent(player, to, from);
+        PlayerEvent event = LocationUtils.equalsPositionally(from, to)
+                ? new PlayerStayEvent(player, to)
+                : new PlayerMoveByBlockEvent(player, to, from);
         Bukkit.getPluginManager().callEvent(event);
     }
 

diff --git a/reactions/src/main/java/fun/reactions/events/listeners/RaListener.java b/reactions/src/main/java/fun/reactions/events/listeners/RaListener.java
@@ -5,9 +5,9 @@
 import fun.reactions.events.PlayerStayEvent;
 import fun.reactions.model.activators.ActivationContext;
 import fun.reactions.model.environment.Variables;
-import fun.reactions.module.basics.ContextManager;
-import fun.reactions.module.basics.ItemContextManager;
-import fun.reactions.module.basics.activators.DropActivator;
+import fun.reactions.module.basic.ContextManager;
+import fun.reactions.module.basic.ItemContextManager;
+import fun.reactions.module.basic.activators.DropActivator;
 import fun.reactions.util.NumberUtils;
 import fun.reactions.util.item.VirtualItem;
 import org.bukkit.event.EventHandler;

diff --git a/reactions/src/main/java/fun/reactions/holders/PlayerRespawner.java b/reactions/src/main/java/fun/reactions/holders/PlayerRespawner.java
@@ -23,7 +23,7 @@
 package fun.reactions.holders;
 
 import fun.reactions.ReActions;
-import fun.reactions.module.basics.activators.RespawnActivator;
+import fun.reactions.module.basic.activators.RespawnActivator;
 import fun.reactions.util.enums.DeathCause;
 import fun.reactions.util.mob.EntityUtils;
 import org.bukkit.Location;

diff --git a/reactions/src/main/java/fun/reactions/menu/InventoryMenu.java b/reactions/src/main/java/fun/reactions/menu/InventoryMenu.java
@@ -2,7 +2,7 @@
 
 import fun.reactions.ReActions;
 import fun.reactions.model.environment.Variables;
-import fun.reactions.module.basics.ContextManager;
+import fun.reactions.module.basic.ContextManager;
 import fun.reactions.util.FileUtils;
 import fun.reactions.util.item.ItemUtils;
 import fun.reactions.util.item.VirtualItem;

diff --git a/...ctions/module/basics/ReActionsModule.java → ...n/reactions/module/basic/BasicModule.java b/...ctions/module/basics/ReActionsModule.java → ...n/reactions/module/basic/BasicModule.java
@@ -1,37 +1,38 @@
-package fun.reactions.module.basics;
+package fun.reactions.module.basic;
 
 import fun.reactions.ReActions;
 import fun.reactions.model.activators.type.ActivatorType;
 import fun.reactions.model.activity.actions.Action;
 import fun.reactions.model.activity.flags.Flag;
 import fun.reactions.module.Module;
-import fun.reactions.module.basics.actions.*;
-import fun.reactions.module.basics.activators.*;
-import fun.reactions.module.basics.external.RaProtocolLib;
-import fun.reactions.module.basics.flags.*;
-import fun.reactions.module.basics.placeholders.ActivatorNamePlaceholder;
-import fun.reactions.module.basics.placeholders.CalcPlaceholder;
-import fun.reactions.module.basics.placeholders.LocalVarPlaceholder;
-import fun.reactions.module.basics.placeholders.PersistentVarPlaceholders;
-import fun.reactions.module.basics.placeholders.PlayerInvPlaceholder;
-import fun.reactions.module.basics.placeholders.PlayerPlaceholders;
-import fun.reactions.module.basics.placeholders.RandomPlaceholder;
-import fun.reactions.module.basics.placeholders.TimePlaceholders;
-import fun.reactions.module.basics.placeholders.TimestampPlaceholder;
-import fun.reactions.module.basics.selectors.LocSelector;
-import fun.reactions.module.basics.selectors.PermSelector;
-import fun.reactions.module.basics.selectors.PlayerSelector;
-import fun.reactions.module.basics.selectors.WorldSelector;
+import fun.reactions.module.basic.actions.*;
+import fun.reactions.module.basic.activators.*;
+import fun.reactions.module.basic.external.RaProtocolLib;
+import fun.reactions.module.basic.flags.*;
+import fun.reactions.module.basic.placeholders.ActivatorNamePlaceholder;
+import fun.reactions.module.basic.placeholders.CalcPlaceholder;
+import fun.reactions.module.basic.placeholders.LocalVarPlaceholder;
+import fun.reactions.module.basic.placeholders.PersistentVarPlaceholders;
+import fun.reactions.module.basic.placeholders.PlayerInvPlaceholder;
+import fun.reactions.module.basic.placeholders.PlayerPlaceholders;
+import fun.reactions.module.basic.placeholders.RandomPlaceholder;
+import fun.reactions.module.basic.placeholders.TimePlaceholders;
+import fun.reactions.module.basic.placeholders.TimestampPlaceholder;
+import fun.reactions.module.basic.selectors.LocSelector;
+import fun.reactions.module.basic.selectors.PermSelector;
+import fun.reactions.module.basic.selectors.PlayerSelector;
+import fun.reactions.module.basic.selectors.WorldSelector;
 import fun.reactions.placeholders.Placeholder;
 import fun.reactions.selectors.Selector;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
 import static fun.reactions.model.activators.type.ActivatorTypesRegistry.typeOf;
 
-public class ReActionsModule implements Module {
+public class BasicModule implements Module {
     @Override
     public void preRegister(@NotNull ReActions.Platform platform) {
         RaProtocolLib.init();
@@ -49,7 +50,7 @@ public void preRegister(@NotNull ReActions.Platform platform) {
 
     @Override
     public @NotNull Collection<ActivatorType> getActivatorTypes() {
-        return List.of(
+        return Arrays.asList(
                 typeOf(FunctionActivator.class, "FUNCTION", FunctionActivator::create, FunctionActivator::create),
                 typeOf(ButtonActivator.class, "BUTTON", ButtonActivator::create, ButtonActivator::load, true),
                 typeOf(PlateActivator.class, "PLATE", PlateActivator::create, PlateActivator::load, true),
@@ -94,7 +95,7 @@ public void preRegister(@NotNull ReActions.Platform platform) {
     @Override
     public @NotNull Collection<Action> getActions() {
         RunFunctionAction functAction = new RunFunctionAction();
-        return List.of(
+        return Arrays.asList(
                 functAction,
                 new ExecuteAction(functAction),
                 new TeleportAction(),
@@ -166,7 +167,7 @@ public void preRegister(@NotNull ReActions.Platform platform) {
 
     @Override
     public @NotNull Collection<Flag> getFlags() {
-        return List.of(
+        return Arrays.asList(
                 new PermissionFlag(),
                 new WorldTimeFlag(),
                 new ItemFlags(ItemFlags.Type.HAND),
@@ -222,7 +223,7 @@ public void preRegister(@NotNull ReActions.Platform platform) {
 
     @Override
     public @NotNull Collection<Placeholder> getPlaceholders() {
-        return List.of(
+        return Arrays.asList(
                 new PlayerPlaceholders(),
                 new PlayerInvPlaceholder(),
                 new RandomPlaceholder(),
@@ -237,7 +238,7 @@ public void preRegister(@NotNull ReActions.Platform platform) {
 
     @Override
     public @NotNull Collection<Selector> getSelectors() {
-        return List.of(
+        return Arrays.asList(
                 new PlayerSelector(),
                 new WorldSelector(),
                 new LocSelector(),

diff --git a/...actions/module/basics/ContextManager.java → ...eactions/module/basic/ContextManager.java b/...actions/module/basics/ContextManager.java → ...eactions/module/basic/ContextManager.java
@@ -20,14 +20,14 @@
  *
  */
 
-package fun.reactions.module.basics;
+package fun.reactions.module.basic;
 
 import fun.reactions.Cfg;
 import fun.reactions.ReActions;
 import fun.reactions.model.activators.ActivationContext;
 import fun.reactions.model.activators.Activator;
 import fun.reactions.model.environment.Variables;
-import fun.reactions.module.basics.activators.*;
+import fun.reactions.module.basic.activators.*;
 import fun.reactions.module.worldguard.activators.RegionActivator;
 import fun.reactions.module.worldguard.activators.RegionEnterActivator;
 import fun.reactions.module.worldguard.activators.RegionLeaveActivator;

diff --git a/...ons/module/basics/ItemContextManager.java → ...ions/module/basic/ItemContextManager.java b/...ons/module/basics/ItemContextManager.java → ...ions/module/basic/ItemContextManager.java
@@ -1,10 +1,10 @@
-package fun.reactions.module.basics;
+package fun.reactions.module.basic;
 
 import fun.reactions.Cfg;
 import fun.reactions.ReActions;
 import fun.reactions.model.activators.Activator;
-import fun.reactions.module.basics.activators.ItemHoldActivator;
-import fun.reactions.module.basics.activators.ItemWearActivator;
+import fun.reactions.module.basic.activators.ItemHoldActivator;
+import fun.reactions.module.basic.activators.ItemWearActivator;
 import fun.reactions.util.item.VirtualItem;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;

diff --git a/...ons/module/basics/actions/BackAction.java → ...ions/module/basic/actions/BackAction.java b/...ons/module/basics/actions/BackAction.java → ...ions/module/basic/actions/BackAction.java
@@ -20,7 +20,7 @@
  *
  */
 
-package fun.reactions.module.basics.actions;
+package fun.reactions.module.basic.actions;
 
 import fun.reactions.holders.PushBack;
 import fun.reactions.model.activity.Activity;

diff --git a/...module/basics/actions/BlockSetAction.java → .../module/basic/actions/BlockSetAction.java b/...module/basics/actions/BlockSetAction.java → .../module/basic/actions/BlockSetAction.java
@@ -20,7 +20,7 @@
  *
  */
 
-package fun.reactions.module.basics.actions;
+package fun.reactions.module.basic.actions;
 
 import fun.reactions.model.activity.actions.Action;
 import fun.reactions.model.environment.Environment;

diff --git a/...odule/basics/actions/BroadcastAction.java → ...module/basic/actions/BroadcastAction.java b/...odule/basics/actions/BroadcastAction.java → ...module/basic/actions/BroadcastAction.java
@@ -20,7 +20,7 @@
  *
  */
 
-package fun.reactions.module.basics.actions;
+package fun.reactions.module.basic.actions;
 
 import fun.reactions.model.activity.actions.Action;
 import fun.reactions.model.environment.Environment;

diff --git a/...ule/basics/actions/CancelEventAction.java → ...dule/basic/actions/CancelEventAction.java b/...ule/basics/actions/CancelEventAction.java → ...dule/basic/actions/CancelEventAction.java
@@ -20,7 +20,7 @@
  *
  */
 
-package fun.reactions.module.basics.actions;
+package fun.reactions.module.basic.actions;
 
 import fun.reactions.model.activators.ActivationContext;
 import fun.reactions.model.activity.actions.Action;

diff --git a/...ule/basics/actions/ClearRadiusAction.java → ...dule/basic/actions/ClearRadiusAction.java b/...ule/basics/actions/ClearRadiusAction.java → ...dule/basic/actions/ClearRadiusAction.java
@@ -1,4 +1,4 @@
-package fun.reactions.module.basics.actions;
+package fun.reactions.module.basic.actions;
 
 import fun.reactions.model.activity.actions.Action;
 import fun.reactions.model.environment.Environment;

diff --git a/...module/basics/actions/CommandActions.java → .../module/basic/actions/CommandActions.java b/...module/basics/actions/CommandActions.java → .../module/basic/actions/CommandActions.java
@@ -20,7 +20,7 @@
  *
  */
 
-package fun.reactions.module.basics.actions;
+package fun.reactions.module.basic.actions;
 
 import fun.reactions.Cfg;
 import fun.reactions.ReActions;

diff --git a/...odule/basics/actions/CooldownActions.java → ...module/basic/actions/CooldownActions.java b/...odule/basics/actions/CooldownActions.java → ...module/basic/actions/CooldownActions.java
@@ -20,7 +20,7 @@
  *
  */
 
-package fun.reactions.module.basics.actions;
+package fun.reactions.module.basic.actions;
 
 import fun.reactions.model.activity.actions.Action;
 import fun.reactions.model.environment.Environment;

diff --git a/...s/module/basics/actions/DamageAction.java → ...ns/module/basic/actions/DamageAction.java b/...s/module/basics/actions/DamageAction.java → ...ns/module/basic/actions/DamageAction.java
@@ -20,7 +20,7 @@
  *
  */
 
-package fun.reactions.module.basics.actions;
+package fun.reactions.module.basic.actions;
 
 import fun.reactions.model.activity.actions.Action;
 import fun.reactions.model.environment.Environment;

diff --git a/.../module/basics/actions/ExecuteAction.java → ...s/module/basic/actions/ExecuteAction.java b/.../module/basics/actions/ExecuteAction.java → ...s/module/basic/actions/ExecuteAction.java
@@ -20,7 +20,7 @@
  *
  */
 
-package fun.reactions.module.basics.actions;
+package fun.reactions.module.basic.actions;
 
 import fun.reactions.ReActions;
 import fun.reactions.model.activity.actions.Action;

diff --git a/...ons/module/basics/actions/FileAction.java → ...ions/module/basic/actions/FileAction.java b/...ons/module/basics/actions/FileAction.java → ...ions/module/basic/actions/FileAction.java
@@ -1,4 +1,4 @@
-package fun.reactions.module.basics.actions;
+package fun.reactions.module.basic.actions;
 
 import fun.reactions.model.activity.actions.Action;
 import fun.reactions.model.environment.Environment;

diff --git a/...ions/module/basics/actions/FlyAction.java → ...tions/module/basic/actions/FlyAction.java b/...ions/module/basics/actions/FlyAction.java → ...tions/module/basic/actions/FlyAction.java
@@ -1,4 +1,4 @@
-package fun.reactions.module.basics.actions;
+package fun.reactions.module.basic.actions;
 
 import fun.reactions.model.activity.actions.Action;
 import fun.reactions.model.environment.Environment;

diff --git a/...module/basics/actions/FlySpeedAction.java → .../module/basic/actions/FlySpeedAction.java b/...module/basics/actions/FlySpeedAction.java → .../module/basic/actions/FlySpeedAction.java
@@ -1,4 +1,4 @@
-package fun.reactions.module.basics.actions;
+package fun.reactions.module.basic.actions;
 
 import fun.reactions.model.activity.actions.Action;
 import fun.reactions.model.environment.Environment;