Skip to content

Use correct Skript class in some registry constructors #8831

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

Open
APickledWalrus wants to merge 2 commits into
base: dev/feature
Choose a base branch
from
Open

Use correct Skript class in some registry constructors #8831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af54f7b
Use correct Skript class in some registry constructors
APickledWalrus Aug 12, 2026
4a00c3d
Update EventValueRegistryTest.java
APickledWalrus Aug 12, 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
4 changes: 2 additions & 2 deletions src/main/java/ch/njol/skript/Skript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,10 +472,10 @@ public void onEnable() {
experimentRegistry = new ExperimentRegistry(this);
Feature.registerAll(getAddonInstance(), experimentRegistry);

skript.storeRegistry(PropertyRegistry.class, new PropertyRegistry(this));
skript.storeRegistry(PropertyRegistry.class, new PropertyRegistry(skript));
Property.registerDefaultProperties();

EventValueRegistry eventValueRegistry = EventValueRegistry.empty(this);
EventValueRegistry eventValueRegistry = EventValueRegistry.empty(skript);
skript.storeRegistry(EventValueRegistry.class, eventValueRegistry);
//noinspection removal
EventValues.setEventValueRegistry(eventValueRegistry);
Expand Down
10 changes: 9 additions & 1 deletion src/main/java/org/skriptlang/skript/bukkit/lang/eventvalue/EventValueRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.skriptlang.skript.bukkit.lang.eventvalue;

import ch.njol.skript.Skript;
import ch.njol.skript.SkriptAPIException;
import org.bukkit.event.Event;
import org.jetbrains.annotations.Unmodifiable;
import org.skriptlang.skript.Skript;
import org.skriptlang.skript.util.Registry;
import org.skriptlang.skript.util.ViewProvider;

Expand Down Expand Up @@ -32,6 +32,14 @@ static EventValueRegistry empty(Skript skript) {
return new EventValueRegistryImpl(skript);
}

/**
* @deprecated Use {@link #empty(Skript)}.
*/
@Deprecated(since = "INSERT VERSION", forRemoval = true)
static EventValueRegistry empty(ch.njol.skript.Skript ignored) {
return empty(ch.njol.skript.Skript.instance());
}

/**
* Registers a new {@link EventValue}.
*
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/skriptlang/skript/bukkit/lang/eventvalue/EventValueRegistryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.skriptlang.skript.bukkit.lang.eventvalue;

import ch.njol.skript.Skript;
import ch.njol.skript.SkriptAPIException;
import com.google.common.base.Preconditions;
import org.bukkit.event.Event;
import org.jetbrains.annotations.Unmodifiable;
import org.skriptlang.skript.Skript;
import org.skriptlang.skript.lang.converter.Converter;
import org.skriptlang.skript.lang.converter.Converters;
import org.skriptlang.skript.util.ClassUtils;
Expand Down Expand Up @@ -32,7 +32,7 @@ public <E extends Event> void register(EventValue<E, ?> eventValue) {
if (eventValue instanceof ConvertedEventValue)
throw new SkriptAPIException("Cannot register a converted event value: " + eventValue);
if (isRegistered(eventValue)) {
Skript.warning(eventValue + " is already registered.");
ch.njol.skript.Skript.warning(eventValue + " is already registered.");
return;
}
List<EventValue<?, ?>> eventValues = eventValues(eventValue.time());
Expand Down
18 changes: 13 additions & 5 deletions src/main/java/org/skriptlang/skript/lang/properties/PropertyRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.skriptlang.skript.lang.properties;

import ch.njol.skript.Skript;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Unmodifiable;
import org.skriptlang.skript.Skript;
import org.skriptlang.skript.util.Registry;

import java.util.*;
Expand All @@ -25,14 +25,22 @@ public PropertyRegistry(Skript skript) {
this.properties = new HashMap<>();
}

/**
* @deprecated Use {@link #PropertyRegistry(Skript)}.
*/
@Deprecated(since = "INSERT VERSION", forRemoval = true)
public PropertyRegistry(ch.njol.skript.Skript ignored) {
this(ch.njol.skript.Skript.instance());
}

public boolean register(@NotNull Property<?> property) {
String name = property.name();
if (properties.containsKey(name)) {
Skript.error("Property '" + name + "' is already registered by " + properties.get(name).provider().name() + ".");
ch.njol.skript.Skript.error("Property '" + name + "' is already registered by " + properties.get(name).provider().name() + ".");
return false; // Property already registered
}
properties.put(name, property);
Skript.debug("Registered property '" + name + "' provided by " + property.provider().name() + ".");
ch.njol.skript.Skript.debug("Registered property '" + name + "' provided by " + property.provider().name() + ".");
return true;
}

Expand All @@ -44,11 +52,11 @@ public boolean unregister(@NotNull Property<?> property) {
public boolean unregister(String name) {
name = name.toLowerCase(Locale.ENGLISH);
if (!properties.containsKey(name)) {
Skript.error("Property '" + name + "' is not registered and cannot be unregistered.");
ch.njol.skript.Skript.error("Property '" + name + "' is not registered and cannot be unregistered.");
return false; // Property not registered
}
properties.remove(name);
Skript.debug("Unregistered property '" + name + "'.");
ch.njol.skript.Skript.debug("Unregistered property '" + name + "'.");
return true;
}

Expand Down
3 changes: 2 additions & 1 deletion src/test/java/org/skriptlang/skript/bukkit/lang/eventvalue/EventValueRegistryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Test;
import org.skriptlang.skript.Skript;
import org.skriptlang.skript.lang.converter.Converters;

import static org.junit.Assert.*;
Expand All @@ -15,7 +16,7 @@ public class EventValueRegistryTest {

@Before
public void setUp() {
registry = EventValueRegistry.empty(null);
registry = EventValueRegistry.empty(Skript.of(EventValueRegistryTest.class, "EventValueRegistryTest"));
}

private static class TestEvent extends Event {
Expand Down
Loading