Skip to content

Make visual effects serializable #7114

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

Closed
Romitou wants to merge 4 commits into from
Closed

Make visual effects serializable #7114

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f35179
Make serializable
TPGamesNL Jun 27, 2021
b48df84
Suppress unchecked warning
Romitou Sep 26, 2024
f1e29be
Apply suggestions from code review
Romitou Sep 26, 2024
b2c231e
Remove licence headers
Romitou Sep 26, 2024
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
51 changes: 50 additions & 1 deletion src/main/java/ch/njol/skript/util/visual/VisualEffectType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,65 @@
import ch.njol.skript.localization.Noun;
import ch.njol.skript.log.BlockingLogHandler;
import ch.njol.skript.log.SkriptLogger;
import ch.njol.skript.variables.Variables;
import ch.njol.yggdrasil.Fields;
import ch.njol.yggdrasil.YggdrasilSerializable;
import ch.njol.yggdrasil.YggdrasilSerializer;
import org.bukkit.Effect;
import org.bukkit.EntityEffect;
import org.bukkit.Location;
import org.bukkit.Particle;
import org.jetbrains.annotations.Nullable;

import java.io.NotSerializableException;
import java.io.StreamCorruptedException;
import java.util.Objects;
import java.util.function.BiFunction;

public class VisualEffectType {
public class VisualEffectType implements YggdrasilSerializable {

static {
Variables.yggdrasil.registerClassResolver(new YggdrasilSerializer<VisualEffectType>() {
@Nullable
@Override
public Class<? extends VisualEffectType> getClass(String id) {
return id.equals("VisualEffectType") ? VisualEffectType.class : null;
}

@Override
public Fields serialize(VisualEffectType o) {
Fields f = new Fields();
f.putObject("id", o.getId());
return f;
}

@Nullable
@Override
public <E extends VisualEffectType> E newInstance(Class<E> c) {
return null;
}

@Override
public boolean canBeInstantiated(Class<? extends VisualEffectType> c) {
return false;
}

@Override
public void deserialize(VisualEffectType o, Fields fields) { }

@SuppressWarnings("unchecked")
@Override
public <E extends VisualEffectType> E deserialize(Class<E> c, Fields fields) throws StreamCorruptedException, NotSerializableException {
return (E) VisualEffects.get(fields.getObject("id", String.class));
}

@Nullable
@Override
public String getID(Class<?> c) {
return c.equals(VisualEffectType.class) ? "VisualEffectType" : null;
}
});
}

private static final String LANGUAGE_NODE = "visual effects";

Expand Down
10 changes: 9 additions & 1 deletion src/main/java/ch/njol/skript/util/visual/VisualEffects.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ public class VisualEffects {
private static VisualEffectType[] visualEffectTypes;

static {
Variables.yggdrasil.registerSingleClass(VisualEffectType.class, "VisualEffect.NewType");
Variables.yggdrasil.registerSingleClass(Effect.class, "Bukkit_Effect");
Variables.yggdrasil.registerSingleClass(EntityEffect.class, "Bukkit_EntityEffect");
}
Expand All @@ -77,6 +76,15 @@ public static VisualEffectType get(int i) {
return visualEffectTypes[i];
}

@Nullable
public static VisualEffectType get(String id) {
for (VisualEffectType type : visualEffectTypes) {
if (id.equals(type.getId()))
return type;
}
return null;
}

public static String getAllNames() {
List<Noun> names = new ArrayList<>();
for (VisualEffectType visualEffectType : visualEffectTypes) {
Expand Down