some refactoring, make classes more well-sorted

This commit is contained in:
Govindas 2020-10-29 10:01:36 +02:00
parent 114e4ed7cb
commit 3373e86248
12 changed files with 35 additions and 35 deletions

View File

@ -1,3 +1,3 @@
Manifest-Version: 1.0 Manifest-Version: 1.0
Main-Class: net.limework.core.RediSkript Main-Class: net.limework.rediskript.RediSkript

View File

@ -1,7 +1,7 @@
package net.limework.core; package net.limework.rediskript;
import net.limework.core.commands.ReloadRedis; import net.limework.rediskript.commands.CommandReloadRedis;
import net.limework.core.hooks.SkriptHook; import net.limework.rediskript.skript.SkriptHook;
import net.limework.core.managers.RedisManager; import net.limework.rediskript.managers.RedisManager;
import org.bukkit.command.PluginCommand; import org.bukkit.command.PluginCommand;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
@ -25,7 +25,7 @@ public class RediSkript extends JavaPlugin {
PluginCommand command = getServer().getPluginCommand("reloadredis"); PluginCommand command = getServer().getPluginCommand("reloadredis");
assert command != null; assert command != null;
command.setExecutor(new ReloadRedis(this)); command.setExecutor(new CommandReloadRedis(this));
new SkriptHook(this); new SkriptHook(this);
} else { } else {

View File

@ -1,6 +1,6 @@
package net.limework.core.commands; package net.limework.rediskript.commands;
import net.limework.core.RediSkript; import net.limework.rediskript.RediSkript;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.Command; import org.bukkit.command.Command;
@ -8,9 +8,9 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class ReloadRedis implements CommandExecutor { public class CommandReloadRedis implements CommandExecutor {
private RediSkript plugin; private RediSkript plugin;
public ReloadRedis(RediSkript plugin) { public CommandReloadRedis(RediSkript plugin) {
this.plugin = plugin; this.plugin = plugin;
} }
@Override @Override

View File

@ -1,4 +1,4 @@
package net.limework.data; package net.limework.rediskript.data;
import org.bukkit.configuration.Configuration; import org.bukkit.configuration.Configuration;
import org.cryptomator.siv.SivMode; import org.cryptomator.siv.SivMode;

View File

@ -1,4 +1,4 @@
package net.limework.core.events; package net.limework.rediskript.events;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;

View File

@ -1,8 +1,8 @@
package net.limework.core.managers; package net.limework.rediskript.managers;
import net.limework.core.RediSkript; import net.limework.rediskript.RediSkript;
import net.limework.core.events.RedisMessageEvent; import net.limework.rediskript.events.RedisMessageEvent;
import net.limework.data.Encryption; import net.limework.rediskript.data.Encryption;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.configuration.Configuration; import org.bukkit.configuration.Configuration;

View File

@ -1,4 +1,4 @@
package net.limework.core.hooks; package net.limework.rediskript.skript;
import ch.njol.skript.Skript; import ch.njol.skript.Skript;
import ch.njol.skript.SkriptAddon; import ch.njol.skript.SkriptAddon;
@ -6,12 +6,12 @@ import ch.njol.skript.lang.ExpressionType;
import ch.njol.skript.registrations.EventValues; import ch.njol.skript.registrations.EventValues;
import ch.njol.skript.util.Date; import ch.njol.skript.util.Date;
import ch.njol.skript.util.Getter; import ch.njol.skript.util.Getter;
import net.limework.core.RediSkript; import net.limework.rediskript.RediSkript;
import net.limework.core.events.RedisMessageEvent; import net.limework.rediskript.events.RedisMessageEvent;
import net.limework.core.skript.elements.EvtRedis; import net.limework.rediskript.skript.elements.EvtRedis;
import net.limework.core.skript.elements.ExprChannel; import net.limework.rediskript.skript.elements.ExprChannel;
import net.limework.core.skript.elements.ExprMessage; import net.limework.rediskript.skript.elements.ExprMessage;
import net.limework.core.skript.elements.ExprMessageDate; import net.limework.rediskript.skript.elements.ExprMessageDate;
import java.io.IOException; import java.io.IOException;

View File

@ -1,12 +1,12 @@
package net.limework.core.skript.elements; package net.limework.rediskript.skript.elements;
import ch.njol.skript.Skript; import ch.njol.skript.Skript;
import ch.njol.skript.lang.Effect; import ch.njol.skript.lang.Effect;
import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.Expression;
import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.lang.SkriptParser;
import ch.njol.util.Kleenean; import ch.njol.util.Kleenean;
import net.limework.core.RediSkript; import net.limework.rediskript.RediSkript;
import net.limework.core.managers.RedisManager; import net.limework.rediskript.managers.RedisManager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.event.Event; import org.bukkit.event.Event;

View File

@ -1,14 +1,14 @@
package net.limework.core.skript.elements; package net.limework.rediskript.skript.elements;
import ch.njol.skript.lang.Literal; import ch.njol.skript.lang.Literal;
import ch.njol.skript.lang.SkriptEvent; import ch.njol.skript.lang.SkriptEvent;
import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.lang.SkriptParser;
import net.limework.core.events.RedisMessageEvent; import net.limework.rediskript.events.RedisMessageEvent;
import org.bukkit.event.Event; import org.bukkit.event.Event;
public class EvtRedis extends SkriptEvent { public class EvtRedis extends SkriptEvent {
@Override @Override
public boolean init(Literal<?>[] literals, int i, SkriptParser.ParseResult parseResult) { public boolean init(final Literal<?>[] literals, final int i, final SkriptParser.ParseResult parseResult) {
return true; return true;
} }

View File

@ -1,4 +1,4 @@
package net.limework.core.skript.elements; package net.limework.rediskript.skript.elements;
import ch.njol.skript.ScriptLoader; import ch.njol.skript.ScriptLoader;
@ -8,7 +8,7 @@ import ch.njol.skript.lang.SkriptParser;
import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.skript.lang.util.SimpleExpression;
import ch.njol.skript.log.ErrorQuality; import ch.njol.skript.log.ErrorQuality;
import ch.njol.util.Kleenean; import ch.njol.util.Kleenean;
import net.limework.core.events.RedisMessageEvent; import net.limework.rediskript.events.RedisMessageEvent;
import org.bukkit.event.Event; import org.bukkit.event.Event;
public class ExprChannel extends SimpleExpression<String> { public class ExprChannel extends SimpleExpression<String> {

View File

@ -1,4 +1,4 @@
package net.limework.core.skript.elements; package net.limework.rediskript.skript.elements;
import ch.njol.skript.ScriptLoader; import ch.njol.skript.ScriptLoader;
@ -8,7 +8,7 @@ import ch.njol.skript.lang.SkriptParser;
import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.skript.lang.util.SimpleExpression;
import ch.njol.skript.log.ErrorQuality; import ch.njol.skript.log.ErrorQuality;
import ch.njol.util.Kleenean; import ch.njol.util.Kleenean;
import net.limework.core.events.RedisMessageEvent; import net.limework.rediskript.events.RedisMessageEvent;
import org.bukkit.event.Event; import org.bukkit.event.Event;
public class ExprMessage extends SimpleExpression<String> { public class ExprMessage extends SimpleExpression<String> {

View File

@ -1,4 +1,4 @@
package net.limework.core.skript.elements; package net.limework.rediskript.skript.elements;
import ch.njol.skript.ScriptLoader; import ch.njol.skript.ScriptLoader;
@ -9,7 +9,7 @@ import ch.njol.skript.lang.util.SimpleExpression;
import ch.njol.skript.log.ErrorQuality; import ch.njol.skript.log.ErrorQuality;
import ch.njol.skript.util.Date; import ch.njol.skript.util.Date;
import ch.njol.util.Kleenean; import ch.njol.util.Kleenean;
import net.limework.core.events.RedisMessageEvent; import net.limework.rediskript.events.RedisMessageEvent;
import org.bukkit.event.Event; import org.bukkit.event.Event;
public class ExprMessageDate extends SimpleExpression<Date> { public class ExprMessageDate extends SimpleExpression<Date> {