Skip to content

Commit 62b636c

Browse files
jsexpjsexp
committed
Click para ver actualizaciones
Version 1.0-SNAPSHOT -> 1.1 En vez de checkear cuando se logee/registre el jugador sera checkeado cuando se una. Como ahora no necesitamos usar una API para checkear cuando se logea/registra un jugador sacamos todas las API's.
1 parent c17dbc7 commit 62b636c

File tree

17 files changed

+92
-186
lines changed

17 files changed

+92
-186
lines changed

‎bukkit/pom.xml‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
<groupId>today.netshield</groupId>
88
<artifactId>NetShield-Bukkit</artifactId>
9-
<version>1.0-SNAPSHOT</version>
9+
<version>1.1</version>
1010
<packaging>jar</packaging>
1111

1212
<name>NetShield-Bukkit</name>
1313

1414
<properties>
15-
<java.version>1.8</java.version>
15+
<java.version>17</java.version>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
</properties>
1818

@@ -62,36 +62,31 @@
6262
<id>codemc-repo</id>
6363
<url>https://repo.codemc.org/repository/maven-public/</url>
6464
</repository>
65-
<repository>
66-
<id>nickuc-repo</id>
67-
<url>https://repo.nickuc.com/maven-releases/</url>
68-
</repository>
6965
</repositories>
7066

7167
<dependencies>
68+
<!-- Spigot API -->
7269
<dependency>
7370
<groupId>org.spigotmc</groupId>
7471
<artifactId>spigot-api</artifactId>
7572
<version>1.8.8-R0.1-SNAPSHOT</version>
7673
<scope>provided</scope>
7774
</dependency>
78-
<dependency>
79-
<groupId>fr.xephi</groupId>
80-
<artifactId>authme</artifactId>
81-
<version>5.6.0-SNAPSHOT</version>
82-
<scope>provided</scope>
83-
</dependency>
84-
<dependency>
85-
<groupId>com.nickuc.login</groupId>
86-
<artifactId>nlogin-api</artifactId>
87-
<version>10.2</version>
88-
<scope>provided</scope>
89-
</dependency>
75+
76+
<!-- OkHTTP3 -->
9077
<dependency>
9178
<groupId>com.squareup.okhttp3</groupId>
9279
<artifactId>okhttp</artifactId>
9380
<version>4.12.0</version>
9481
<scope>compile</scope>
9582
</dependency>
83+
84+
<!-- Lombok -->
85+
<dependency>
86+
<groupId>org.projectlombok</groupId>
87+
<artifactId>lombok</artifactId>
88+
<version>1.18.30</version>
89+
<scope>compile</scope>
90+
</dependency>
9691
</dependencies>
9792
</project>

‎bukkit/src/main/java/today/netshield/bukkit/NetShield.java‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,19 @@
22

33
import com.google.gson.Gson;
44
import com.google.gson.JsonObject;
5+
import lombok.Getter;
56
import okhttp3.*;
67
import org.apache.commons.lang.StringUtils;
7-
import org.bukkit.Bukkit;
8-
import org.bukkit.plugin.Plugin;
98
import org.bukkit.plugin.java.JavaPlugin;
10-
import today.netshield.bukkit.hook.impl.AuthMe;
11-
import today.netshield.bukkit.hook.impl.nLogin;
9+
import today.netshield.bukkit.listener.PlayerListener;
1210
import today.netshield.bukkit.utils.CC;
1311

1412
import java.io.IOException;
1513

1614
public final class NetShield extends JavaPlugin {
15+
@Getter
1716
private static NetShield instance;
1817

19-
public static NetShield getInstance() {
20-
return instance;
21-
}
22-
2318
@Override
2419
public void onEnable() {
2520
saveDefaultConfig();
@@ -59,8 +54,7 @@ public void onEnable() {
5954
} else {
6055
CC.log("&9Status: &a" + status);
6156
CC.log("&eThanks for using &lNetShield&e!");
62-
registerListeners();
63-
57+
getServer().getPluginManager().registerEvents(new PlayerListener(), this);
6458
}
6559
} else {
6660
CC.log("Error: " + response.code() + " - " + response.message());
@@ -73,18 +67,6 @@ public void onEnable() {
7367
CC.log("&7&m" + StringUtils.repeat("-", 24));
7468
}
7569

76-
private void registerListeners() {
77-
Plugin nLoginPlugin = Bukkit.getPluginManager().getPlugin("nLogin");
78-
Plugin AuthMePlugin = Bukkit.getPluginManager().getPlugin("AuthMe");
79-
80-
if (nLoginPlugin != null && nLoginPlugin.isEnabled()) {
81-
getServer().getPluginManager().registerEvents(new nLogin(), this);
82-
}
83-
if (AuthMePlugin != null && AuthMePlugin.isEnabled()) {
84-
getServer().getPluginManager().registerEvents(new AuthMe(), this);
85-
}
86-
}
87-
8870
@Override
8971
public void onDisable() {
9072
// Plugin shutdown logic

‎bukkit/src/main/java/today/netshield/bukkit/hook/impl/AuthMe.java‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎bukkit/src/main/java/today/netshield/bukkit/hook/impl/nLogin.java‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎bukkit/src/main/java/today/netshield/bukkit/listener/PlayerListener.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package today.netshield.bukkit.listener;
2+
3+
import org.bukkit.event.EventHandler;
4+
import org.bukkit.event.Listener;
5+
import org.bukkit.event.player.PlayerLoginEvent;
6+
import today.netshield.bukkit.utils.Authentication;
7+
8+
public class PlayerListener implements Listener {
9+
private final Authentication authentication = new Authentication();
10+
11+
@EventHandler
12+
public void onPlayerLogin(PlayerLoginEvent event) {
13+
authentication.handle(event.getPlayer());
14+
}
15+
}

bukkit/src/main/java/today/netshield/bukkit/hook/Authentication.java renamed to bukkit/src/main/java/today/netshield/bukkit/utils/Authentication.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
package today.netshield.bukkit.hook;
1+
package today.netshield.bukkit.utils;
22

33
import com.google.gson.Gson;
44
import com.google.gson.JsonObject;
55
import okhttp3.*;
66
import org.bukkit.Bukkit;
77
import org.bukkit.ChatColor;
88
import org.bukkit.entity.Player;
9-
import org.bukkit.scheduler.BukkitTask;
109
import today.netshield.bukkit.NetShield;
11-
import today.netshield.bukkit.utils.CC;
1210

1311
import java.io.IOException;
1412
import java.util.List;

‎bukkit/src/main/resources/plugin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ name: NetShield
22
version: '${project.version}'
33
main: today.netshield.bukkit.NetShield
44
loadbefore:
5-
- nLogin
5+
- PlayerListener
66
- AuthMe

‎bungeecord/pom.xml‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
<groupId>today.netshield</groupId>
88
<artifactId>NetShield-Bungee</artifactId>
9-
<version>1.0-SNAPSHOT</version>
9+
<version>1.1</version>
1010
<packaging>jar</packaging>
1111

1212
<name>NetShield-Bungee</name>
1313

1414
<properties>
15-
<java.version>1.8</java.version>
15+
<java.version>17</java.version>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
</properties>
1818

@@ -62,10 +62,6 @@
6262
<id>codemc-repo</id>
6363
<url>https://repo.codemc.org/repository/maven-public/</url>
6464
</repository>
65-
<repository>
66-
<id>nickuc-repo</id>
67-
<url>https://repo.nickuc.com/maven-releases/</url>
68-
</repository>
6965
</repositories>
7066

7167
<dependencies>
@@ -85,20 +81,20 @@
8581
<scope>provided</scope>
8682
</dependency>
8783

88-
<!-- nLogin -->
89-
<dependency>
90-
<groupId>com.nickuc.login</groupId>
91-
<artifactId>nlogin-api</artifactId>
92-
<version>10.2</version>
93-
<scope>provided</scope>
94-
</dependency>
95-
9684
<!-- OkHTTP3 -->
9785
<dependency>
9886
<groupId>com.squareup.okhttp3</groupId>
9987
<artifactId>okhttp</artifactId>
10088
<version>4.12.0</version>
10189
<scope>compile</scope>
10290
</dependency>
91+
92+
<!-- Lombok -->
93+
<dependency>
94+
<groupId>org.projectlombok</groupId>
95+
<artifactId>lombok</artifactId>
96+
<version>1.18.30</version>
97+
<scope>compile</scope>
98+
</dependency>
10399
</dependencies>
104100
</project>

‎bungeecord/src/main/java/today/netshield/bungee/NetShield.java‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,25 @@
22

33
import com.google.gson.Gson;
44
import com.google.gson.JsonObject;
5+
import lombok.Getter;
56
import net.md_5.bungee.api.plugin.Plugin;
67
import net.md_5.bungee.config.Configuration;
78
import net.md_5.bungee.config.ConfigurationProvider;
89
import net.md_5.bungee.config.YamlConfiguration;
910
import okhttp3.*;
10-
import today.netshield.bungee.hook.impl.nLogin;
11+
import today.netshield.bungee.listeners.PlayerListener;
1112
import today.netshield.bungee.utils.CC;
1213
import today.netshield.bungee.utils.ConfigFiles;
1314

1415
import java.io.File;
1516
import java.io.IOException;
1617

1718
public final class NetShield extends Plugin {
19+
@Getter
1820
private static NetShield instance;
21+
@Getter
1922
private Configuration config;
2023

21-
public static NetShield getInstance() {
22-
return instance;
23-
}
24-
2524
@Override
2625
public void onEnable() {
2726
instance = this;
@@ -73,7 +72,7 @@ public void onEnable() {
7372
} else {
7473
CC.log("&9Status: &a" + status);
7574
CC.log("&eThanks for using &lNetShield&e!");
76-
registerListeners();
75+
getProxy().getPluginManager().registerListener(this, new PlayerListener());
7776
}
7877
} else {
7978
CC.log("Error: " + response.code() + " - " + response.message());
@@ -86,14 +85,4 @@ public void onEnable() {
8685

8786
CC.log("&7&m------------------------");
8887
}
89-
90-
private void registerListeners() {
91-
if (getProxy().getPluginManager().getPlugin("nLogin") != null) {
92-
getProxy().getPluginManager().registerListener(this, new nLogin());
93-
}
94-
}
95-
96-
public Configuration getConfig() {
97-
return config;
98-
}
9988
}

‎bungeecord/src/main/java/today/netshield/bungee/hook/impl/nLogin.java‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)