Skip to content

Commit 15a1600

Browse files
committed
Requested Changes
1 parent 8ec01b8 commit 15a1600

89 files changed

Lines changed: 122 additions & 187 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/main/java/ch/njol/skript/Skript.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
import org.skriptlang.skript.bukkit.SkriptMetrics;
6666
import org.skriptlang.skript.bukkit.log.runtime.BukkitRuntimeErrorConsumer;
6767
import org.skriptlang.skript.bukkit.registration.BukkitSyntaxInfos;
68-
import org.skriptlang.skript.bukkit.tags.TagModule;
6968
import org.skriptlang.skript.common.CommonModule;
7069
import org.skriptlang.skript.docs.Origin;
7170
import org.skriptlang.skript.lang.comparator.Comparator;

src/main/java/org/skriptlang/skript/addon/AddonModule.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.skriptlang.skript.registration.SyntaxRegistry;
88

99
import java.util.SequencedCollection;
10+
import java.util.stream.Collectors;
1011

1112
/**
1213
* A module is a component of a {@link SkriptAddon} used for registering syntax and other {@link Skript} components.
@@ -63,9 +64,9 @@ sealed interface ModuleOrigin extends AddonOrigin permits AddonModuleImpl.Module
6364
*/
6465
@Deprecated(since="INSERT VERSION", forRemoval = true)
6566
default String moduleName() {
66-
return String.join(", ", modules().stream()
67+
return modules().stream()
6768
.map(AddonModule::name)
68-
.toArray(String[]::new));
69+
.collect(Collectors.joining(", "));
6970
}
7071

7172
}
@@ -125,7 +126,7 @@ default SyntaxRegistry moduleRegistry(SkriptAddon addon) {
125126
default void register(SkriptAddon addon, Registrar... registrationMethods) {
126127
SyntaxRegistry registry = moduleRegistry(addon);
127128
for (var func : registrationMethods) {
128-
func.accept(registry);
129+
func.register(registry);
129130
}
130131
}
131132

@@ -134,7 +135,7 @@ default void register(SkriptAddon addon, Registrar... registrationMethods) {
134135
*/
135136
@FunctionalInterface
136137
interface Registrar {
137-
void accept(SyntaxRegistry registry);
138+
void register(SyntaxRegistry registry);
138139
}
139140

140141
}

src/main/java/org/skriptlang/skript/addon/AddonModuleImpl.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,16 @@
88

99
class AddonModuleImpl {
1010

11-
public static final class ModuleOriginImpl implements ModuleOrigin {
11+
public record ModuleOriginImpl(SkriptAddon addon, SequencedCollection<AddonModule> modules) implements ModuleOrigin {
1212

13-
private final SkriptAddon addon;
14-
private final SequencedCollection<AddonModule> modules;
1513

1614
/**
1715
* Constructs a module origin from an addon and module chain.
1816
* @param addon The addon providing the modules.
1917
* @param modules The module chain, from most specific to root.
2018
*/
2119
public ModuleOriginImpl(SkriptAddon addon, AddonModule... modules) {
22-
this.addon = addon.unmodifiableView();
23-
this.modules = List.of(modules);
20+
this(addon.unmodifiableView(), List.of(modules));
2421
}
2522

2623
@Override

src/main/java/org/skriptlang/skript/addon/HierarchicalAddonModule.java

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
public abstract class HierarchicalAddonModule implements AddonModule {
2121

2222
private final @Nullable AddonModule parentModule;
23-
private List<AddonModule> loadableChildren;
23+
private final List<AddonModule> loadableChildren = new ArrayList<>();
2424

2525
/**
2626
* Constructs a module with no parent.
@@ -59,8 +59,7 @@ public Iterable<AddonModule> children() {
5959
*/
6060
public List<AddonModule> moduleChain() {
6161
List<AddonModule> chain = new ArrayList<>();
62-
chain.add(this);
63-
AddonModule current = parentModule;
62+
AddonModule current = this;
6463
while (current != null) {
6564
chain.add(current);
6665
if (current instanceof HierarchicalAddonModule hierarchical) {
@@ -88,7 +87,7 @@ public final boolean canLoad(SkriptAddon addon) {
8887
}
8988

9089
// Filter children that can load
91-
loadableChildren = new ArrayList<>();
90+
loadableChildren.clear();
9291
for (AddonModule child : children()) {
9392
if (child.canLoad(addon)) {
9493
loadableChildren.add(child);
@@ -107,27 +106,22 @@ protected void initSelf(SkriptAddon addon) {
107106
@Override
108107
public final void init(SkriptAddon addon) {
109108
initSelf(addon);
110-
if (loadableChildren != null) {
111-
for (AddonModule child : loadableChildren) {
112-
child.init(addon);
113-
}
109+
for (AddonModule child : loadableChildren) {
110+
child.init(addon);
114111
}
115112
}
116113

117114
/**
118115
* Override for module-specific loading.
119116
* @param addon The addon this module belongs to.
120117
*/
121-
protected void loadSelf(SkriptAddon addon) {
122-
}
118+
protected abstract void loadSelf(SkriptAddon addon);
123119

124120
@Override
125121
public final void load(SkriptAddon addon) {
126122
loadSelf(addon);
127-
if (loadableChildren != null) {
128-
for (AddonModule child : loadableChildren) {
129-
child.load(addon);
130-
}
123+
for (AddonModule child : loadableChildren) {
124+
child.load(addon);
131125
}
132126
}
133127

src/main/java/org/skriptlang/skript/bukkit/BukkitModule.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.skriptlang.skript.bukkit.damagesource.DamageSourceModule;
1010
import org.skriptlang.skript.bukkit.entity.EntityModule;
1111
import org.skriptlang.skript.bukkit.fishing.FishingModule;
12-
import org.skriptlang.skript.bukkit.furnace.FurnaceModule;
12+
import org.skriptlang.skript.bukkit.block.furnace.FurnaceModule;
1313
import org.skriptlang.skript.bukkit.input.InputModule;
1414
import org.skriptlang.skript.bukkit.itemcomponents.ItemComponentModule;
1515
import org.skriptlang.skript.bukkit.loottables.LootTableModule;
@@ -46,6 +46,11 @@ public Iterable<AddonModule> children() {
4646
);
4747
}
4848

49+
@Override
50+
protected void loadSelf(SkriptAddon addon) {
51+
// nothing to do
52+
}
53+
4954
@Override
5055
public String name() {
5156
return "bukkit";

src/main/java/org/skriptlang/skript/bukkit/furnace/FurnaceModule.java renamed to src/main/java/org/skriptlang/skript/bukkit/block/furnace/FurnaceModule.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package org.skriptlang.skript.bukkit.furnace;
1+
package org.skriptlang.skript.bukkit.block.furnace;
22

33
import org.skriptlang.skript.addon.AddonModule;
44
import org.skriptlang.skript.addon.HierarchicalAddonModule;
55
import org.skriptlang.skript.addon.SkriptAddon;
6-
import org.skriptlang.skript.bukkit.furnace.elements.events.EvtFurnace;
7-
import org.skriptlang.skript.bukkit.furnace.elements.expressions.ExprFurnaceEventItems;
8-
import org.skriptlang.skript.bukkit.furnace.elements.expressions.ExprFurnaceSlot;
9-
import org.skriptlang.skript.bukkit.furnace.elements.expressions.ExprFurnaceTime;
6+
import org.skriptlang.skript.bukkit.block.furnace.elements.events.EvtFurnace;
7+
import org.skriptlang.skript.bukkit.block.furnace.elements.expressions.ExprFurnaceEventItems;
8+
import org.skriptlang.skript.bukkit.block.furnace.elements.expressions.ExprFurnaceSlot;
9+
import org.skriptlang.skript.bukkit.block.furnace.elements.expressions.ExprFurnaceTime;
1010

1111
public class FurnaceModule extends HierarchicalAddonModule {
1212

src/main/java/org/skriptlang/skript/bukkit/furnace/elements/events/EvtFurnace.java renamed to src/main/java/org/skriptlang/skript/bukkit/block/furnace/elements/events/EvtFurnace.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.skriptlang.skript.bukkit.furnace.elements.events;
1+
package org.skriptlang.skript.bukkit.block.furnace.elements.events;
22

33
import ch.njol.skript.aliases.ItemType;
44
import ch.njol.skript.lang.Literal;

src/main/java/org/skriptlang/skript/bukkit/furnace/elements/expressions/ExprFurnaceEventItems.java renamed to src/main/java/org/skriptlang/skript/bukkit/block/furnace/elements/expressions/ExprFurnaceEventItems.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.skriptlang.skript.bukkit.furnace.elements.expressions;
1+
package org.skriptlang.skript.bukkit.block.furnace.elements.expressions;
22

33
import ch.njol.skript.Skript;
44
import ch.njol.skript.classes.Changer.ChangeMode;

src/main/java/org/skriptlang/skript/bukkit/furnace/elements/expressions/ExprFurnaceSlot.java renamed to src/main/java/org/skriptlang/skript/bukkit/block/furnace/elements/expressions/ExprFurnaceSlot.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.skriptlang.skript.bukkit.furnace.elements.expressions;
1+
package org.skriptlang.skript.bukkit.block.furnace.elements.expressions;
22

33
import ch.njol.skript.Skript;
44
import ch.njol.skript.doc.Description;

src/main/java/org/skriptlang/skript/bukkit/furnace/elements/expressions/ExprFurnaceTime.java renamed to src/main/java/org/skriptlang/skript/bukkit/block/furnace/elements/expressions/ExprFurnaceTime.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.skriptlang.skript.bukkit.furnace.elements.expressions;
1+
package org.skriptlang.skript.bukkit.block.furnace.elements.expressions;
22

33
import ch.njol.skript.Skript;
44
import ch.njol.skript.classes.Changer.ChangeMode;

0 commit comments

Comments
 (0)