Altitude/Essentia
5
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor to make use of the new user bean.

Browse Source
This commit is contained in:
Len
2024-06-16 21:30:07 +02:00
parent 41c5725ea8
commit 767d248ac8
25 changed files with 98 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugin/src/main/java/com/alttd/essentia/request/Request.java → plugin/src/main/java/com/alttd/essentia/request/EssentiaRequest.java
+3 -4
View File
@@ -2,7 +2,6 @@ package com.alttd.essentia.request;
import com.alttd.essentia.EssentiaPlugin;
import com.alttd.essentia.configuration.Config;
import com.alttd.essentia.configuration.PlayerConfig;
import com.alttd.essentia.tasks.RequestTimeout;
import com.alttd.essentia.tasks.TeleportSounds;
import lombok.Getter;
@@ -10,7 +9,7 @@ import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import org.bukkit.entity.Player;
public abstract class Request {
public abstract class EssentiaRequest implements Request {
private final EssentiaPlugin plugin;
@Getter private final Player requester;
@@ -19,7 +18,7 @@ public abstract class Request {
TagResolver placeholders;
public Request(EssentiaPlugin plugin, Player requester, Player target) {
public EssentiaRequest(EssentiaPlugin plugin, Player requester, Player target) {
this.plugin = plugin;
this.requester = requester;
this.target = target;
@@ -65,7 +64,7 @@ public abstract class Request {
public void cancel() {
try {
timeoutTask.cancel();
PlayerConfig.getConfig(target).request(null);
plugin.userManager().getUser(target).request(null);
} catch (IllegalStateException ignore) {
}
}
plugin/src/main/java/com/alttd/essentia/request/TeleportRequest.java → plugin/src/main/java/com/alttd/essentia/request/TeleportEssentiaRequest.java
+2 -2
View File
@@ -4,9 +4,9 @@ import com.alttd.essentia.EssentiaPlugin;
import com.alttd.essentia.configuration.Config;
import org.bukkit.entity.Player;
public class TeleportRequest extends Request {
public class TeleportEssentiaRequest extends EssentiaRequest {
public TeleportRequest(EssentiaPlugin plugin, Player requester, Player target) {
public TeleportEssentiaRequest(EssentiaPlugin plugin, Player requester, Player target) {
super(plugin, requester, target);
target.sendRichMessage(Config.TELEPORT_REQUESTHERE_TARGET, placeholders);
plugin/src/main/java/com/alttd/essentia/request/TeleportHereRequest.java → plugin/src/main/java/com/alttd/essentia/request/TeleportHereEssentiaRequest.java
+2 -2
View File
@@ -4,9 +4,9 @@ import com.alttd.essentia.EssentiaPlugin;
import com.alttd.essentia.configuration.Config;
import org.bukkit.entity.Player;
public class TeleportHereRequest extends Request {
public class TeleportHereEssentiaRequest extends EssentiaRequest {
public TeleportHereRequest(EssentiaPlugin plugin, Player requester, Player target) {
public TeleportHereEssentiaRequest(EssentiaPlugin plugin, Player requester, Player target) {
super(plugin, requester, target);
target.sendRichMessage(Config.TELEPORT_REQUEST_TARGET, placeholders);