Skip to content

Commit b97bc0f

Browse files
AlessioDPAlessioDP
committed
Release 3.2.17
1 parent 04cccf7 commit b97bc0f

File tree

27 files changed

+205
-313
lines changed

27 files changed

+205
-313
lines changed

‎api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<artifactId>parties</artifactId>
99
<groupId>com.alessiodp.parties</groupId>
10-
<version>3.2.16</version>
10+
<version>3.2.17</version>
1111
</parent>
1212

1313
<artifactId>parties-api</artifactId>

‎bukkit/dependency-reduced-pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>parties</artifactId>
55
<groupId>com.alessiodp.parties</groupId>
6-
<version>3.2.16</version>
6+
<version>3.2.17</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>parties-bukkit</artifactId>
@@ -80,7 +80,7 @@
8080
<dependency>
8181
<groupId>com.alessiodp.parties</groupId>
8282
<artifactId>parties-common</artifactId>
83-
<version>3.2.16</version>
83+
<version>3.2.17</version>
8484
<scope>compile</scope>
8585
</dependency>
8686
<dependency>
@@ -116,7 +116,7 @@
116116
<dependency>
117117
<groupId>net.essentialsx</groupId>
118118
<artifactId>EssentialsX</artifactId>
119-
<version>2.19.7</version>
119+
<version>2.21.2</version>
120120
<scope>provided</scope>
121121
<exclusions>
122122
<exclusion>
@@ -152,13 +152,13 @@
152152
<dependency>
153153
<groupId>me.clip</groupId>
154154
<artifactId>placeholderapi</artifactId>
155-
<version>2.11.2</version>
155+
<version>2.11.6</version>
156156
<scope>provided</scope>
157157
</dependency>
158158
<dependency>
159159
<groupId>com.github.SkriptLang</groupId>
160160
<artifactId>Skript</artifactId>
161-
<version>2.6.2</version>
161+
<version>2.12.1</version>
162162
<scope>provided</scope>
163163
<exclusions>
164164
<exclusion>

‎bukkit/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<artifactId>parties</artifactId>
99
<groupId>com.alessiodp.parties</groupId>
10-
<version>3.2.16</version>
10+
<version>3.2.17</version>
1111
</parent>
1212

1313
<artifactId>parties-bukkit</artifactId>

‎bukkit/src/main/java/com/alessiodp/parties/bukkit/addons/external/skript/Types.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package com.alessiodp.parties.bukkit.addons.external.skript;
22

33
import ch.njol.skript.classes.ClassInfo;
4-
import ch.njol.skript.classes.Converter;
54
import ch.njol.skript.classes.Parser;
65
import ch.njol.skript.expressions.base.EventValueExpression;
76
import ch.njol.skript.lang.ParseContext;
87
import ch.njol.skript.registrations.Classes;
9-
import ch.njol.skript.registrations.Converters;
108
import com.alessiodp.parties.api.interfaces.Party;
119
import com.alessiodp.parties.api.interfaces.PartyPlayer;
1210
import org.bukkit.Bukkit;
1311
import org.bukkit.OfflinePlayer;
12+
import org.skriptlang.skript.lang.converter.Converter;
13+
import org.skriptlang.skript.lang.converter.Converters;
1414

1515
@SuppressWarnings("NullableProblems")
1616
public class Types {
@@ -81,6 +81,6 @@ public String toVariableNameString(PartyPlayer partyPlayer) {
8181
}
8282
})
8383
);
84-
Converters.registerConverter(PartyPlayer.class, OfflinePlayer.class, partyPlayer -> Bukkit.getOfflinePlayer(partyPlayer.getPlayerUUID()), Converter.NO_COMMAND_ARGUMENTS);
84+
Converters.registerConverter(PartyPlayer.class, OfflinePlayer.class, partyPlayer -> Bukkit.getOfflinePlayer(partyPlayer.getPlayerUUID()), Converter.NO_CHAINING);
8585
}
8686
}

‎bukkit/src/main/java/com/alessiodp/parties/bukkit/addons/external/skript/events/EvtPartyCreate.java‎

Lines changed: 18 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
import ch.njol.skript.Skript;
44
import ch.njol.skript.lang.Literal;
5-
import ch.njol.skript.lang.SelfRegisteringSkriptEvent;
5+
import ch.njol.skript.lang.SkriptEvent;
66
import ch.njol.skript.lang.SkriptParser;
77
import ch.njol.skript.lang.Trigger;
88
import ch.njol.skript.registrations.EventValues;
9-
import ch.njol.skript.util.Getter;
109
import com.alessiodp.parties.api.events.bukkit.party.BukkitPartiesPartyPostCreateEvent;
1110
import com.alessiodp.parties.api.events.bukkit.party.BukkitPartiesPartyPreCreateEvent;
1211
import com.alessiodp.parties.api.interfaces.Party;
@@ -16,82 +15,54 @@
1615
import org.bukkit.event.Event;
1716

1817
import java.util.ArrayList;
19-
import java.util.Collection;
18+
import java.util.Collections;
19+
import java.util.List;
2020

2121
@SuppressWarnings("NullableProblems")
22-
public class EvtPartyCreate extends SelfRegisteringSkriptEvent {
22+
public class EvtPartyCreate extends SkriptEvent {
2323
static {
2424
Skript.registerEvent("Party Pre Create", EvtPartyCreate.class, BukkitPartiesPartyPreCreateEvent.class,
2525
"[player] pre create[s] [a] party")
2626
.description("Called when a player is creating a party. Cancellable.")
2727
.examples("on pre create party:",
2828
"\tmessage \"%event-partyplayer% is creating the party %event-string%\"")
2929
.since("3.0.0");
30-
EventValues.registerEventValue(BukkitPartiesPartyPreCreateEvent.class, String.class, new Getter<String, BukkitPartiesPartyPreCreateEvent>() {
31-
@Override
32-
public String get(BukkitPartiesPartyPreCreateEvent e) {
33-
return e.getPartyName();
34-
}
35-
}, 0);
36-
EventValues.registerEventValue(BukkitPartiesPartyPreCreateEvent.class, PartyPlayer.class, new Getter<PartyPlayer, BukkitPartiesPartyPreCreateEvent>() {
37-
@Override
38-
public PartyPlayer get(BukkitPartiesPartyPreCreateEvent e) {
39-
return e.getPartyPlayer();
40-
}
41-
}, 0);
42-
EventValues.registerEventValue(BukkitPartiesPartyPreCreateEvent.class, CommandSender.class, new Getter<CommandSender, BukkitPartiesPartyPreCreateEvent>() {
43-
@Override
44-
public CommandSender get(BukkitPartiesPartyPreCreateEvent e) {
45-
return e.getPartyPlayer() != null ? Bukkit.getPlayer(e.getPartyPlayer().getPlayerUUID()) : Bukkit.getConsoleSender();
46-
}
47-
}, 0);
30+
EventValues.registerEventValue(BukkitPartiesPartyPreCreateEvent.class, String.class, BukkitPartiesPartyPreCreateEvent::getPartyName, EventValues.TIME_NOW);
31+
EventValues.registerEventValue(BukkitPartiesPartyPreCreateEvent.class, PartyPlayer.class, BukkitPartiesPartyPreCreateEvent::getPartyPlayer, EventValues.TIME_NOW);
32+
EventValues.registerEventValue(BukkitPartiesPartyPreCreateEvent.class, CommandSender.class, e -> e.getPartyPlayer() != null ? Bukkit.getPlayer(e.getPartyPlayer().getPlayerUUID()) : Bukkit.getConsoleSender(), EventValues.TIME_NOW);
4833

4934
Skript.registerEvent("Party Post Create", EvtPartyCreate.class, BukkitPartiesPartyPostCreateEvent.class,
5035
"[player] [post] create[s] [a] party")
5136
.description("Called when a player has created a party.")
5237
.examples("on post create party:",
5338
"\tmessage \"%event-partyplayer% created the party %event-party%\"")
5439
.since("3.0.0");
55-
EventValues.registerEventValue(BukkitPartiesPartyPostCreateEvent.class, Party.class, new Getter<Party, BukkitPartiesPartyPostCreateEvent>() {
56-
@Override
57-
public Party get(BukkitPartiesPartyPostCreateEvent e) {
58-
return e.getParty();
59-
}
60-
}, 0);
61-
EventValues.registerEventValue(BukkitPartiesPartyPostCreateEvent.class, PartyPlayer.class, new Getter<PartyPlayer, BukkitPartiesPartyPostCreateEvent>() {
62-
@Override
63-
public PartyPlayer get(BukkitPartiesPartyPostCreateEvent e) {
64-
return e.getCreator();
65-
}
66-
}, 0);
67-
EventValues.registerEventValue(BukkitPartiesPartyPostCreateEvent.class, CommandSender.class, new Getter<CommandSender, BukkitPartiesPartyPostCreateEvent>() {
68-
@Override
69-
public CommandSender get(BukkitPartiesPartyPostCreateEvent e) {
70-
return e.getCreator() != null ? Bukkit.getPlayer(e.getCreator().getPlayerUUID()) : Bukkit.getConsoleSender();
71-
}
72-
}, 0);
40+
EventValues.registerEventValue(BukkitPartiesPartyPostCreateEvent.class, Party.class, BukkitPartiesPartyPostCreateEvent::getParty, EventValues.TIME_NOW);
41+
EventValues.registerEventValue(BukkitPartiesPartyPostCreateEvent.class, PartyPlayer.class, BukkitPartiesPartyPostCreateEvent::getCreator, EventValues.TIME_NOW);
42+
EventValues.registerEventValue(BukkitPartiesPartyPostCreateEvent.class, CommandSender.class, e -> e.getCreator() != null ? Bukkit.getPlayer(e.getCreator().getPlayerUUID()) : Bukkit.getConsoleSender(), EventValues.TIME_NOW);
7343
}
7444

75-
final static Collection<Trigger> triggers = new ArrayList<>();
45+
private static final List<Trigger> TRIGGERS = Collections.synchronizedList(new ArrayList<>());
7646

7747
@Override
7848
public boolean init(Literal<?>[] args, int matchedPattern, SkriptParser.ParseResult parseResult) {
7949
return true;
8050
}
8151

8252
@Override
83-
public void register(Trigger trigger) {
84-
triggers.add(trigger);
53+
public boolean load() {
54+
TRIGGERS.add(trigger);
55+
return true;
8556
}
8657

8758
@Override
88-
public void unregister(Trigger trigger) {
89-
triggers.remove(trigger);
59+
public void unload() {
60+
TRIGGERS.remove(trigger);
9061
}
9162

9263
@Override
93-
public void unregisterAll() {
94-
triggers.clear();
64+
public boolean check(Event event) {
65+
throw new UnsupportedOperationException();
9566
}
9667

9768
@Override

‎bukkit/src/main/java/com/alessiodp/parties/bukkit/addons/external/skript/events/EvtPartyDelete.java‎

Lines changed: 18 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
import ch.njol.skript.Skript;
44
import ch.njol.skript.lang.Literal;
5-
import ch.njol.skript.lang.SelfRegisteringSkriptEvent;
5+
import ch.njol.skript.lang.SkriptEvent;
66
import ch.njol.skript.lang.SkriptParser;
77
import ch.njol.skript.lang.Trigger;
88
import ch.njol.skript.registrations.EventValues;
9-
import ch.njol.skript.util.Getter;
109
import com.alessiodp.parties.api.events.bukkit.party.BukkitPartiesPartyPostDeleteEvent;
1110
import com.alessiodp.parties.api.events.bukkit.party.BukkitPartiesPartyPreDeleteEvent;
1211
import com.alessiodp.parties.api.interfaces.Party;
@@ -16,82 +15,54 @@
1615
import org.bukkit.event.Event;
1716

1817
import java.util.ArrayList;
19-
import java.util.Collection;
18+
import java.util.Collections;
19+
import java.util.List;
2020

2121
@SuppressWarnings("NullableProblems")
22-
public class EvtPartyDelete extends SelfRegisteringSkriptEvent {
22+
public class EvtPartyDelete extends SkriptEvent {
2323
static {
2424
Skript.registerEvent("Party Pre Delete", EvtPartyDelete.class, BukkitPartiesPartyPreDeleteEvent.class,
2525
"[player] pre delete[s] [a] party")
2626
.description("Called when a player is deleting a party. Cancellable.")
2727
.examples("on pre delete party:",
2828
"\tmessage \"%event-partyplayer% is deleting the party %event-party%\"")
2929
.since("3.0.0");
30-
EventValues.registerEventValue(BukkitPartiesPartyPreDeleteEvent.class, Party.class, new Getter<Party, BukkitPartiesPartyPreDeleteEvent>() {
31-
@Override
32-
public Party get(BukkitPartiesPartyPreDeleteEvent e) {
33-
return e.getParty();
34-
}
35-
}, 0);
36-
EventValues.registerEventValue(BukkitPartiesPartyPreDeleteEvent.class, PartyPlayer.class, new Getter<PartyPlayer, BukkitPartiesPartyPreDeleteEvent>() {
37-
@Override
38-
public PartyPlayer get(BukkitPartiesPartyPreDeleteEvent e) {
39-
return e.getCommandSender();
40-
}
41-
}, 0);
42-
EventValues.registerEventValue(BukkitPartiesPartyPreDeleteEvent.class, CommandSender.class, new Getter<CommandSender, BukkitPartiesPartyPreDeleteEvent>() {
43-
@Override
44-
public CommandSender get(BukkitPartiesPartyPreDeleteEvent e) {
45-
return e.getKickedPlayer() != null ? Bukkit.getPlayer(e.getKickedPlayer().getPlayerUUID()) : Bukkit.getConsoleSender();
46-
}
47-
}, 0);
30+
EventValues.registerEventValue(BukkitPartiesPartyPreDeleteEvent.class, Party.class, BukkitPartiesPartyPreDeleteEvent::getParty, EventValues.TIME_NOW);
31+
EventValues.registerEventValue(BukkitPartiesPartyPreDeleteEvent.class, PartyPlayer.class, BukkitPartiesPartyPreDeleteEvent::getCommandSender, EventValues.TIME_NOW);
32+
EventValues.registerEventValue(BukkitPartiesPartyPreDeleteEvent.class, CommandSender.class, e -> e.getKickedPlayer() != null ? Bukkit.getPlayer(e.getKickedPlayer().getPlayerUUID()) : Bukkit.getConsoleSender(), EventValues.TIME_NOW);
4833

4934
Skript.registerEvent("Party Post Delete", EvtPartyDelete.class, BukkitPartiesPartyPostDeleteEvent.class,
5035
"[player] [post] delete[s] [a] party")
5136
.description("Called when a player has deleted a party.")
5237
.examples("on post delete party:",
5338
"\tmessage \"%event-partyplayer% deleted the party %event-party%\"")
5439
.since("3.0.0");
55-
EventValues.registerEventValue(BukkitPartiesPartyPostDeleteEvent.class, Party.class, new Getter<Party, BukkitPartiesPartyPostDeleteEvent>() {
56-
@Override
57-
public Party get(BukkitPartiesPartyPostDeleteEvent e) {
58-
return e.getParty();
59-
}
60-
}, 0);
61-
EventValues.registerEventValue(BukkitPartiesPartyPostDeleteEvent.class, PartyPlayer.class, new Getter<PartyPlayer, BukkitPartiesPartyPostDeleteEvent>() {
62-
@Override
63-
public PartyPlayer get(BukkitPartiesPartyPostDeleteEvent e) {
64-
return e.getCommandSender();
65-
}
66-
}, 0);
67-
EventValues.registerEventValue(BukkitPartiesPartyPostDeleteEvent.class, CommandSender.class, new Getter<CommandSender, BukkitPartiesPartyPostDeleteEvent>() {
68-
@Override
69-
public CommandSender get(BukkitPartiesPartyPostDeleteEvent e) {
70-
return e.getKickedPlayer() != null ? Bukkit.getPlayer(e.getKickedPlayer().getPlayerUUID()) : Bukkit.getConsoleSender();
71-
}
72-
}, 0);
40+
EventValues.registerEventValue(BukkitPartiesPartyPostDeleteEvent.class, Party.class, BukkitPartiesPartyPostDeleteEvent::getParty, EventValues.TIME_NOW);
41+
EventValues.registerEventValue(BukkitPartiesPartyPostDeleteEvent.class, PartyPlayer.class, BukkitPartiesPartyPostDeleteEvent::getCommandSender, EventValues.TIME_NOW);
42+
EventValues.registerEventValue(BukkitPartiesPartyPostDeleteEvent.class, CommandSender.class, e -> e.getKickedPlayer() != null ? Bukkit.getPlayer(e.getKickedPlayer().getPlayerUUID()) : Bukkit.getConsoleSender(), EventValues.TIME_NOW);
7343
}
7444

75-
final static Collection<Trigger> triggers = new ArrayList<>();
45+
private static final List<Trigger> TRIGGERS = Collections.synchronizedList(new ArrayList<>());
7646

7747
@Override
7848
public boolean init(Literal<?>[] args, int matchedPattern, SkriptParser.ParseResult parseResult) {
7949
return true;
8050
}
8151

8252
@Override
83-
public void register(Trigger trigger) {
84-
triggers.add(trigger);
53+
public boolean load() {
54+
TRIGGERS.add(trigger);
55+
return true;
8556
}
8657

8758
@Override
88-
public void unregister(Trigger trigger) {
89-
triggers.remove(trigger);
59+
public void unload() {
60+
TRIGGERS.remove(trigger);
9061
}
9162

9263
@Override
93-
public void unregisterAll() {
94-
triggers.clear();
64+
public boolean check(Event event) {
65+
throw new UnsupportedOperationException();
9566
}
9667

9768
@Override

0 commit comments

Comments
 (0)