Skip to content

Commit e21ad38

Browse files
author
MichaelAPI
committed
Now also handling nLogin-based authentication
1 parent 13761ac commit e21ad38

4 files changed

Lines changed: 69 additions & 15 deletions

File tree

pom.xml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>it.mikeslab</groupId>
88
<artifactId>Identity</artifactId>
9-
<version>2.0.4.5</version>
9+
<version>2.0.4.6</version>
1010
<packaging>jar</packaging>
1111

1212
<name>Identity</name>
@@ -132,6 +132,10 @@
132132
<id>codemc-snapshots</id>
133133
<url>https://repo.codemc.io/repository/maven-snapshots/</url>
134134
</repository>
135+
<repository>
136+
<id>nickuc-repo</id>
137+
<url>https://repo.nickuc.com/maven-releases/</url>
138+
</repository>
135139
<repository>
136140
<id>codemc-repo</id>
137141
<url>https://repo.codemc.org/repository/maven-public/</url>
@@ -242,5 +246,13 @@
242246
<version>5.4.0</version>
243247
<scope>provided</scope>
244248
</dependency>
249+
250+
<dependency>
251+
<groupId>com.nickuc.login</groupId>
252+
<artifactId>api</artifactId>
253+
<version>10.4</version>
254+
<scope>provided</scope>
255+
</dependency>
256+
245257
</dependencies>
246258
</project>

src/main/java/it/mikeslab/identity/event/auth/AuthMeListener.java

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
import fr.xephi.authme.events.LoginEvent;
44
import it.mikeslab.identity.IdentityPlugin;
5-
import it.mikeslab.identity.config.ConfigKey;
6-
import it.mikeslab.identity.helper.JoinEventHelper;
5+
import it.mikeslab.identity.helper.AuthHelper;
76
import lombok.RequiredArgsConstructor;
87
import org.bukkit.event.EventHandler;
98
import org.bukkit.event.Listener;
@@ -13,20 +12,13 @@ public class AuthMeListener implements Listener {
1312

1413
private final IdentityPlugin instance;
1514

15+
/**
16+
* AuthMeReloaded auth handling
17+
* @param event AuthMeReloaded auth proprietary event
18+
*/
1619
@EventHandler
1720
public void onAuth(LoginEvent event) {
18-
19-
boolean afterAuth = instance.getCustomConfig().getBoolean(ConfigKey.SETUP_AFTER_AUTH);
20-
21-
if(!afterAuth) {
22-
return;
23-
}
24-
25-
new JoinEventHelper(instance)
26-
.getJoinListener()
27-
.accept(event.getPlayer());
28-
21+
new AuthHelper(instance).postAuth(event.getPlayer());
2922
}
3023

31-
3224
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package it.mikeslab.identity.event.auth;
2+
3+
import com.nickuc.login.api.event.bukkit.auth.AuthenticateEvent;
4+
import it.mikeslab.identity.IdentityPlugin;
5+
import it.mikeslab.identity.helper.AuthHelper;
6+
import lombok.RequiredArgsConstructor;
7+
import org.bukkit.event.EventHandler;
8+
import org.bukkit.event.Listener;
9+
10+
@RequiredArgsConstructor
11+
public class NLoginListener implements Listener {
12+
13+
private final IdentityPlugin instance;
14+
15+
/**
16+
* nLogin auth handling
17+
* @param event nLogin auth proprietary event
18+
*/
19+
@EventHandler
20+
public void onLogin(AuthenticateEvent event) {
21+
new AuthHelper(instance).postAuth(event.getPlayer());
22+
}
23+
24+
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package it.mikeslab.identity.helper;
2+
3+
import it.mikeslab.identity.IdentityPlugin;
4+
import it.mikeslab.identity.config.ConfigKey;
5+
import lombok.RequiredArgsConstructor;
6+
import org.bukkit.entity.Player;
7+
8+
@RequiredArgsConstructor
9+
public class AuthHelper {
10+
11+
private final IdentityPlugin instance;
12+
13+
public void postAuth(Player player) {
14+
15+
boolean afterAuth = instance.getCustomConfig().getBoolean(ConfigKey.SETUP_AFTER_AUTH);
16+
17+
if(!afterAuth) {
18+
return;
19+
}
20+
21+
new JoinEventHelper(instance)
22+
.getJoinListener()
23+
.accept(player);
24+
}
25+
26+
}

0 commit comments

Comments
 (0)