Skip to content

Fix AttributeModifier serialization, download exception handling, selector nullability, and relocation package naming #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
srnyx merged 7 commits into from
Aug 1, 2026
Merged

Fix AttributeModifier serialization, download exception handling, selector nullability, and relocation package naming #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b244a09
feat: add reflected getAmount method to RefAttributeModifier
Spagles Aug 1, 2026
fac4d2b
fix: serialize attribute modifier amount property
Spagles Aug 1, 2026
7bb5264
fix: invoke fallback platform when dependency file download fails
Spagles Aug 1, 2026
d38ec9c
fix: prevent passing null raw input to selector fallback functions
Spagles Aug 1, 2026
cb37b46
fix: handle standard package names correctly in getRelocation
Spagles Aug 1, 2026
fcbd974
Refactor getRelocation method for clarity
srnyx Aug 1, 2026
cde8da9
Merge branch 'main' into main
srnyx Aug 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/main/java/xyz/srnyx/annoyingapi/AnnoyingPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,13 @@ public Relocation getRelocation(@NotNull String from, @NotNull String name) {
*/
@NotNull
public Relocation getRelocation(@NotNull String from) {
return getRelocation(from, from.substring(from.lastIndexOf("{}") + 2).toLowerCase().replaceAll("[^a-z0-9._{}]", ""));
String name = from;
if (name.contains("{}")) {
name = name.substring(name.lastIndexOf("{}") + 2);
} else if (name.contains(".")) {
name = name.substring(name.lastIndexOf(".") + 1);
}
return getRelocation(from, name.toLowerCase().replaceAll("[^a-z0-9._{}]", ""));
}

/**
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/xyz/srnyx/annoyingapi/command/selector/SelectorOptional.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ public SelectorOptional<T> mapRaw(@NotNull Function<String, String> mapper) {
*/
@Nullable @Unmodifiable
public List<T> orElse(@NotNull Function<String, List<T>> other) {
if (raw == null) return null;
if (selector == null) return other.apply(raw);
final List<T> expanded = selector.expand(sender);
if (expanded == null) sender.invalidArgument(raw);
Expand All @@ -102,6 +103,7 @@ public List<T> orElse(@NotNull Function<String, List<T>> other) {
*/
@Nullable @Unmodifiable
public List<T> orElseSingle(@NotNull Function<String, T> other) {
if (raw == null) return null;
if (selector == null) return Collections.singletonList(other.apply(raw));
final List<T> expanded = selector.expand(sender);
if (expanded == null) sender.invalidArgument(raw);
Expand All @@ -117,6 +119,7 @@ public List<T> orElseSingle(@NotNull Function<String, T> other) {
*/
@Nullable @Unmodifiable
public List<T> orElseFlat(@NotNull Function<String, Optional<List<T>>> other) {
if (raw == null) return null;
if (selector == null) {
final Optional<List<T>> result = other.apply(raw);
if (result.isEmpty()) sender.invalidArgument(raw);
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/xyz/srnyx/annoyingapi/dependency/AnnoyingDownload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,9 @@ private void downloadFile(@NotNull AnnoyingDependency dependency, @NotNull Plugi
final byte[] buffer = new byte[1024];
int numRead;
while ((numRead = in.read(buffer)) != -1) out.write(buffer, 0, numRead);
} catch (final IOException ignored) {
//ignored
} catch (final IOException e) {
fail(dependency, platform);
return;
}

// Send success message
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/xyz/srnyx/annoyingapi/file/okaeri/serdes/AttributeModifierSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import xyz.srnyx.annoyingapi.reflection.org.bukkit.attribute.RefAttributeModifier;

import static xyz.srnyx.annoyingapi.reflection.org.bukkit.attribute.RefAttributeModifier.ATTRIBUTE_MODIFIER_CLASS;
import static xyz.srnyx.annoyingapi.reflection.org.bukkit.attribute.RefAttributeModifier.ATTRIBUTE_MODIFIER_GET_AMOUNT_METHOD;
import static xyz.srnyx.annoyingapi.reflection.org.bukkit.attribute.RefAttributeModifier.ATTRIBUTE_MODIFIER_GET_NAME_METHOD;
import static xyz.srnyx.annoyingapi.reflection.org.bukkit.attribute.RefAttributeModifier.ATTRIBUTE_MODIFIER_GET_OPERATION_METHOD;
import static xyz.srnyx.annoyingapi.reflection.org.bukkit.attribute.RefAttributeModifier.ATTRIBUTE_MODIFIER_GET_SLOT_GROUP_METHOD;
Expand Down Expand Up @@ -43,6 +44,13 @@ public void serialize(@NotNull Object object, @NotNull SerializationData data, @
e.printStackTrace();
}

// amount
if (ATTRIBUTE_MODIFIER_GET_AMOUNT_METHOD != null) try {
data.set("amount", ATTRIBUTE_MODIFIER_GET_AMOUNT_METHOD.invoke(object));
} catch (final Exception e) {
e.printStackTrace();
}

// operation
try {
data.set("operation", ATTRIBUTE_MODIFIER_GET_OPERATION_METHOD.invoke(object));
Expand Down
5 changes: 5 additions & 0 deletions ...main/java/xyz/srnyx/annoyingapi/reflection/org/bukkit/attribute/RefAttributeModifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ public class RefAttributeModifier {
*/
@Nullable public static final Method ATTRIBUTE_MODIFIER_GET_NAME_METHOD = ReflectionUtility.getMethod(1, 13, 2, ATTRIBUTE_MODIFIER_CLASS, "getName");

/**
* 1.13.2+ org.bukkit.attribute.AttributeModifier#getAmount()
*/
@Nullable public static final Method ATTRIBUTE_MODIFIER_GET_AMOUNT_METHOD = ReflectionUtility.getMethod(1, 13, 2, ATTRIBUTE_MODIFIER_CLASS, "getAmount");

/**
* 1.13.2+ org.bukkit.attribute.AttributeModifier#getOperation()
*/
Expand Down