Upstream/Advanced-Portals
1
0
Fork 0
mirror of https://github.com/sekwah41/Advanced-Portals.git synced 2025-02-08 08:21:39 +01:00
Code Issues Projects Releases Wiki Activity

chore: pre-commit changes [skip ci]

Browse Source
This commit is contained in:
github-actions[bot] 2024-12-31 19:46:06 +00:00
parent 38a0d149d6
commit 09f4bcd68c
3 changed files with 166 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spigot/src/main/java/com/sekwah/advancedportals/spigot/AdvancedPortalsPlugin.java
View File

@ -129,8 +129,10 @@ public class AdvancedPortalsPlugin extends JavaPlugin {
}
public void registerPlaceholderAPI() {
if (this.getServer().getPluginManager().getPlugin("PlaceholderAPI") != null) {
AdvancedPortalsCore.getInstance().getTagRegistry().registerTag(new ConditionsTag());
if (this.getServer().getPluginManager().getPlugin("PlaceholderAPI")
!= null) {
AdvancedPortalsCore.getInstance().getTagRegistry().registerTag(
new ConditionsTag());
}
}
}

52
spigot/src/main/java/com/sekwah/advancedportals/spigot/tags/ConditionsTag.java
View File

@ -12,16 +12,17 @@ import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
public class ConditionsTag implements Tag.Activation, Tag.Split, Tag.Creation {
@Inject
private InfoLogger infoLogger;
@Override
public boolean preActivated(TagTarget target, PlayerContainer player, ActivationData activeData, String[] argData) {
public boolean preActivated(TagTarget target, PlayerContainer player,
ActivationData activeData, String[] argData) {
for (String condition : argData) {
if (!checkConditions(condition, Bukkit.getPlayer(player.getUUID()))) {
player.sendMessage(Lang.getNegativePrefix() + Lang.translate("tag.conditions.fail"));
if (!checkConditions(condition,
Bukkit.getPlayer(player.getUUID()))) {
player.sendMessage(Lang.getNegativePrefix()
+ Lang.translate("tag.conditions.fail"));
return false;
}
}
@ -30,18 +31,19 @@ public class ConditionsTag implements Tag.Activation, Tag.Split, Tag.Creation {
}
@Override
public void postActivated(TagTarget target, PlayerContainer player, ActivationData activationData, String[] argData) {
public void postActivated(TagTarget target, PlayerContainer player,
ActivationData activationData, String[] argData) {
}
@Override
public boolean activated(TagTarget target, PlayerContainer player, ActivationData activationData, String[] argData) {
public boolean activated(TagTarget target, PlayerContainer player,
ActivationData activationData, String[] argData) {
return false;
}
@Override
public TagType[] getTagTypes() {
return new TagType[] { TagType.PORTAL };
return new TagType[] {TagType.PORTAL};
}
@Override
@ -65,7 +67,8 @@ public class ConditionsTag implements Tag.Activation, Tag.Split, Tag.Creation {
// Check if the condition contains a valid operator
if (!trimmedCondition.matches(".*(<=|>=|<|>|==).*")) {
// Log a warning or handle the case where the condition format is invalid
// Log a warning or handle the case where the condition format is
// invalid
infoLogger.warning("Invalid operator: " + condition);
return false;
}
@ -76,21 +79,28 @@ public class ConditionsTag implements Tag.Activation, Tag.Split, Tag.Creation {
if (parts.length == 2) {
// Trim to remove any leading/trailing whitespaces
String placeholder = parts[0].trim();
String actualValue = PlaceholderAPI.setPlaceholders(player, placeholder);
String actualValue =
PlaceholderAPI.setPlaceholders(player, placeholder);
String restOfCondition = parts[1].trim();
// Preserve the operator
String operator = condition.substring(placeholder.length(), condition.length() - restOfCondition.length()).trim();
String operator =
condition
.substring(placeholder.length(),
condition.length() - restOfCondition.length())
.trim();
return performComparison(actualValue, operator, restOfCondition);
} else {
// Log a warning or handle the case where the condition format is invalid
// Log a warning or handle the case where the condition format is
// invalid
infoLogger.warning("Invalid condition format: " + condition);
return false;
}
}
private boolean performComparison(String actualValue, String operator, String expectedValue) {
private boolean performComparison(String actualValue, String operator,
String expectedValue) {
if (isNumeric(actualValue) && isNumeric(expectedValue)) {
// Numeric comparison
double actualNumeric = Double.parseDouble(actualValue);
@ -132,8 +142,12 @@ public class ConditionsTag implements Tag.Activation, Tag.Split, Tag.Creation {
@Override
public boolean created(TagTarget target, PlayerContainer player, String[] argData) {
for (String condition : argData) {
if (!checkConditions(condition, Bukkit.getPlayer(player.getUUID()))) {
player.sendMessage(Lang.getNegativePrefix() + Lang.translate("tag.conditions.invalid"));
if (!checkConditions(
condition,
Bukkit.getPlayer(player.getUUID()))) {
player.sendMessage(
Lang.getNegativePrefix()
+ Lang.translate("tag.conditions.invalid"));
return false;
}
}
@ -141,7 +155,7 @@ public class ConditionsTag implements Tag.Activation, Tag.Split, Tag.Creation {
}
@Override
public void destroyed(TagTarget target, PlayerContainer player, String[] argData) {
public void destroyed(TagTarget target, PlayerContainer player,
String[] argData) {
}
}
}

2
spigot/src/main/templates/plugin.yml
View File

@ -4,7 +4,7 @@ version: ${pluginVersion}
author: sekwah41
description: An advanced portals plugin for bukkit.
api-version: 1.13
softdepend: ["PlaceholderAPI"]
softdepend: [PlaceholderAPI]
commands:
portal:
description: The main command for the advanced portals