Skip to content

Commit c512471

Browse files
d4rpx1d4rpx1
committed
fix: code clean-up
1 parent 9c5453d commit c512471

10 files changed

Lines changed: 162 additions & 191 deletions

File tree

‎src/main/java/org/matrixnetwork/stats2/MatrixStats.java‎

Lines changed: 72 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
package org.matrixnetwork.stats2;
22

3-
import com.fasterxml.jackson.databind.ObjectMapper;
43
import com.sun.net.httpserver.HttpServer;
54
import net.milkbowl.vault.economy.Economy;
6-
import net.skinsrestorer.api.SkinsRestorerAPI;
7-
import org.bukkit.Bukkit;
8-
import org.bukkit.entity.Player;
95
import org.bukkit.plugin.RegisteredServiceProvider;
106
import org.bukkit.plugin.java.JavaPlugin;
11-
import org.bukkit.scheduler.BukkitRunnable;
12-
import org.bukkit.scheduler.BukkitTask;
137
import org.glassfish.jersey.jdkhttp.JdkHttpServerFactory;
148
import org.glassfish.jersey.message.GZipEncoder;
159
import org.glassfish.jersey.server.ResourceConfig;
@@ -23,78 +17,77 @@
2317
import org.matrixnetwork.stats2.util.JacksonFeature;
2418

2519
import java.net.URI;
26-
import java.util.List;
27-
28-
public class MatrixStats extends JavaPlugin{
29-
30-
private static MatrixStats plugin;
31-
private HttpServer server;
32-
private static Economy econ;
33-
34-
public static Economy getEcon() {
35-
return econ;
36-
}
37-
38-
@Override
39-
public void onLoad() {
40-
plugin = this;
41-
}
42-
43-
@Override
44-
public void onEnable() {
45-
if (!setupEconomy() ) {
46-
getLogger().severe(String.format("[%s] - Disabled due to no Vault dependency found!",
47-
getDescription().getName()));
48-
getServer().getPluginManager().disablePlugin(this);
49-
return;
50-
}
51-
52-
getServer().getPluginManager().registerEvents(new StatsListener(), this);
53-
54-
StatsHandler.init();
55-
56-
ResourceConfig rc = new ResourceConfig();
57-
rc.packages("org.matrixnetwork.stats.rest");
58-
rc.register(StatsResource.class);
59-
rc.register(SkinResource.class);
60-
rc.register(AuthResource.class);
61-
rc.register(CorsFilter.class);
62-
rc.register(new GZipEncoder());
63-
rc.register(JacksonFeature.class);
64-
65-
rc.property(ServerProperties.WADL_FEATURE_DISABLE, true);
66-
67-
server = JdkHttpServerFactory.createHttpServer(
68-
URI.create( "http://localhost:8081/api" ), rc );
69-
70-
getLogger().info("Listening on http://localhost:8081/api !");
71-
}
72-
73-
private boolean setupEconomy() {
74-
if (getServer().getPluginManager().getPlugin("Vault") == null) {
75-
return false;
76-
}
77-
78-
RegisteredServiceProvider<Economy> rsp = getServer()
79-
.getServicesManager()
80-
.getRegistration(Economy.class);
81-
82-
if (rsp == null) {
83-
return false;
84-
}
85-
econ = rsp.getProvider();
86-
return econ != null;
87-
}
88-
89-
@Override
90-
public void onDisable() {
91-
if(server != null)
92-
server.stop( 0 );
93-
getLogger().info("Disabled");
94-
}
95-
96-
public static org.bukkit.plugin.Plugin getPlugin() {
97-
return plugin;
98-
}
20+
21+
public class MatrixStats extends JavaPlugin {
22+
23+
private static MatrixStats plugin;
24+
private static Economy econ;
25+
private HttpServer server;
26+
27+
public static Economy getEcon() {
28+
return econ;
29+
}
30+
31+
public static org.bukkit.plugin.Plugin getPlugin() {
32+
return plugin;
33+
}
34+
35+
@Override
36+
public void onLoad() {
37+
plugin = this;
38+
}
39+
40+
@Override
41+
public void onEnable() {
42+
if (!setupEconomy()) {
43+
getLogger().severe(String.format("[%s] - Disabled due to no Vault dependency found!",
44+
getDescription().getName()));
45+
getServer().getPluginManager().disablePlugin(this);
46+
return;
47+
}
48+
49+
getServer().getPluginManager().registerEvents(new StatsListener(), this);
50+
51+
StatsHandler.init();
52+
53+
ResourceConfig rc = new ResourceConfig();
54+
rc.packages("org.matrixnetwork.stats.rest");
55+
rc.register(StatsResource.class);
56+
rc.register(SkinResource.class);
57+
rc.register(AuthResource.class);
58+
rc.register(CorsFilter.class);
59+
rc.register(new GZipEncoder());
60+
rc.register(JacksonFeature.class);
61+
62+
rc.property(ServerProperties.WADL_FEATURE_DISABLE, true);
63+
64+
server = JdkHttpServerFactory.createHttpServer(
65+
URI.create("http://localhost:8081/api"), rc);
66+
67+
getLogger().info("Listening on http://localhost:8081/api !");
68+
}
69+
70+
private boolean setupEconomy() {
71+
if (getServer().getPluginManager().getPlugin("Vault") == null) {
72+
return false;
73+
}
74+
75+
RegisteredServiceProvider<Economy> rsp = getServer()
76+
.getServicesManager()
77+
.getRegistration(Economy.class);
78+
79+
if (rsp == null) {
80+
return false;
81+
}
82+
econ = rsp.getProvider();
83+
return econ != null;
84+
}
85+
86+
@Override
87+
public void onDisable() {
88+
if (server != null)
89+
server.stop(0);
90+
getLogger().info("Disabled");
91+
}
9992

10093
}

‎src/main/java/org/matrixnetwork/stats2/entity/MatrixPlayer.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
package org.matrixnetwork.stats2.entity;
22

3-
import org.json.simple.JSONArray;
4-
import org.json.simple.JSONObject;
5-
63
import javax.persistence.*;
74
import java.util.List;
85

96
@Entity
107
public class MatrixPlayer {
8+
String uuid;
119
@Id
1210
@GeneratedValue(strategy = GenerationType.IDENTITY)
1311
private
1412
Long id;
15-
16-
String uuid;
17-
1813
private String username;
1914

2015
@OneToMany(mappedBy = "matrixPlayer", fetch = FetchType.EAGER)

‎src/main/java/org/matrixnetwork/stats2/handler/StatsHandler.java‎

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,16 @@
1717

1818
import static com.gmail.mrphpfan.mccombatlevel.calculator.JavaScriptCalculator.*;
1919
import static com.projectkorra.projectkorra.BendingPlayer.getBendingPlayer;
20-
import static com.projectkorra.projectkorra.Element.getElement;
2120

2221
public class StatsHandler {
23-
private BukkitTask runnable;
24-
2522
private static StatsHandler instance;
23+
private BukkitTask runnable;
2624

2725
private StatsHandler() {
2826
}
2927

3028
public static StatsHandler getInstance() {
31-
if(instance == null)
29+
if (instance == null)
3230
init();
3331

3432
return instance;
@@ -43,10 +41,10 @@ public void run() {
4341
try (Session session = DataManager.getInstance().getSession()) {
4442
Transaction t = session.beginTransaction();
4543

46-
for(Player p : MatrixStats.getPlugin().getServer().getOnlinePlayers()) {
44+
for (Player p : MatrixStats.getPlugin().getServer().getOnlinePlayers()) {
4745
MatrixPlayer player = DataManager.getInstance().getMatrixPlayerByProperty("uuid", p.getUniqueId().toString());
4846

49-
if(player == null) {
47+
if (player == null) {
5048
Session s = DataManager.getInstance().getSession();
5149

5250
player = (MatrixPlayer) s.merge(new MatrixPlayer(p.getUniqueId().toString(), p.getName()));
@@ -67,34 +65,34 @@ public void run() {
6765
}
6866
element = bPlayer.getElements().size() == 0 ? "None" : element;
6967
int matrik = McCombatLevel.inst().getPlayerLevels().get(p.getName());
70-
PlayerStats data = new PlayerStats(p.getExp(),
71-
p.getFoodLevel(),
72-
p.getLocation().getX(),
73-
p.getLocation().getY(),
74-
p.getLocation().getZ(),
75-
balance,
76-
p.getHealth(),
77-
p.getGameMode().toString(),
78-
p.getLastDamageCause() == null ? null : p.getLastDamageCause().getCause().toString(),
79-
p.getRemainingAir(),
80-
LocalDateTime.now(),
81-
guildRank,
82-
threatTier,
83-
sfTitle,
84-
mcmmoPower,
85-
mageRank,
86-
skillClass,
87-
skillLevel,
88-
element,
89-
matrik,
90-
player);
91-
session.merge(data);
68+
PlayerStats data = new PlayerStats(p.getExp(),
69+
p.getFoodLevel(),
70+
p.getLocation().getX(),
71+
p.getLocation().getY(),
72+
p.getLocation().getZ(),
73+
balance,
74+
p.getHealth(),
75+
p.getGameMode().toString(),
76+
p.getLastDamageCause() == null ? null : p.getLastDamageCause().getCause().toString(),
77+
p.getRemainingAir(),
78+
LocalDateTime.now(),
79+
guildRank,
80+
threatTier,
81+
sfTitle,
82+
mcmmoPower,
83+
mageRank,
84+
skillClass,
85+
skillLevel,
86+
element,
87+
matrik,
88+
player);
89+
session.merge(data);
9290
}
9391

9492
t.commit();
9593

9694
}
9795
}
98-
}.runTaskTimer(MatrixStats.getPlugin(), 20*60, 20*60);
96+
}.runTaskTimer(MatrixStats.getPlugin(), 20 * 60, 20 * 60);
9997
}
10098
}

‎src/main/java/org/matrixnetwork/stats2/listener/StatsListener.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
import org.matrixnetwork.stats2.entity.MatrixPlayer;
1010
import org.matrixnetwork.stats2.manager.DataManager;
1111

12-
public class StatsListener implements Listener {
12+
public class StatsListener implements Listener {
1313
@EventHandler
1414
public void onJoin(PlayerJoinEvent event) {
1515
Player p = event.getPlayer();
1616
MatrixPlayer player = DataManager.getInstance()
1717
.getMatrixPlayerByProperty("uuid", p.getUniqueId().toString());
1818

19-
if(player == null) {
19+
if (player == null) {
2020
Session s = DataManager.getInstance().getSession();
2121
Transaction t = s.beginTransaction();
2222
s.merge(new MatrixPlayer(p.getUniqueId().toString(), p.getName()));

‎src/main/java/org/matrixnetwork/stats2/manager/DataManager.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private DataManager() {
5353
}
5454

5555
public static DataManager getInstance() {
56-
if(instance == null)
56+
if (instance == null)
5757
instance = new DataManager();
5858

5959
return instance;
@@ -64,7 +64,7 @@ public Session getSession() {
6464
}
6565

6666
public MatrixPlayer getMatrixPlayerByProperty(String propertyName, Object propertyValue) {
67-
try(Session session = DataManager.getInstance().getSession()) {
67+
try (Session session = DataManager.getInstance().getSession()) {
6868
CriteriaQuery<MatrixPlayer> criteria = DataManager.getInstance().getSession()
6969
.getCriteriaBuilder()
7070
.createQuery(MatrixPlayer.class);
@@ -82,7 +82,7 @@ public MatrixPlayer getMatrixPlayerByProperty(String propertyName, Object proper
8282
}
8383

8484
public PlayerStats getLastStatisticsOfPlayer(Long matrixPlayerId) {
85-
try(Session session = DataManager.getInstance().getSession()) {
85+
try (Session session = DataManager.getInstance().getSession()) {
8686
CriteriaBuilder cb = DataManager.getInstance().getSession().getCriteriaBuilder();
8787

8888
CriteriaQuery<PlayerStats> criteria = cb
@@ -91,10 +91,10 @@ public PlayerStats getLastStatisticsOfPlayer(Long matrixPlayerId) {
9191
Root<PlayerStats> root = criteria.from(PlayerStats.class);
9292

9393
PlayerStats stats = session.createQuery(criteria.select(root)
94-
.where(
95-
cb.equal(root.get("matrixPlayer"), matrixPlayerId)
96-
)
97-
.orderBy(cb.desc(root.get("timeStamp"))))
94+
.where(
95+
cb.equal(root.get("matrixPlayer"), matrixPlayerId)
96+
)
97+
.orderBy(cb.desc(root.get("timeStamp"))))
9898
.setFirstResult(0)
9999
.setMaxResults(1)
100100
.list().get(0);

‎src/main/java/org/matrixnetwork/stats2/rest/AuthResource.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
@Path("/auth")
1515
public class AuthResource {
16-
private JSONParser parser = new JSONParser();
16+
private final JSONParser parser = new JSONParser();
1717

1818
@Consumes(MediaType.APPLICATION_JSON)
1919
@Produces(MediaType.APPLICATION_JSON)
@@ -27,15 +27,15 @@ public Response login(String jsonRequest) {
2727
return Response.status(400).build();
2828
}
2929

30-
if(obj.get("username") == null ||
30+
if (obj.get("username") == null ||
3131
!(obj.get("username") instanceof String) ||
3232
obj.get("password") == null ||
3333
!(obj.get("password") instanceof String)) {
3434
return Response.status(400).build();
3535
}
3636

3737

38-
if(AuthMeApi.getInstance().checkPassword((String) obj.get("username"), (String) obj.get("password"))) {
38+
if (AuthMeApi.getInstance().checkPassword((String) obj.get("username"), (String) obj.get("password"))) {
3939
String token = Auth.getInstance().generateToken((String) obj.get("username"));
4040

4141
if (token == null) {
@@ -46,8 +46,7 @@ public Response login(String jsonRequest) {
4646
retObj.put("token", token);
4747
retObj.put("expiryDate", LocalDateTime.now().plusSeconds(Auth.getInstance().TOKEN_EXPIRATION_TIME).toString());
4848
return Response.ok(retObj.toJSONString()).build();
49-
}
50-
else {
49+
} else {
5150
return Response.status(403).build();
5251
}
5352
}
@@ -56,7 +55,7 @@ public Response login(String jsonRequest) {
5655
@Produces(MediaType.APPLICATION_JSON)
5756
public Response optionsForBookResource() {
5857
return Response.status(200)
59-
.header("Allow","POST")
58+
.header("Allow", "POST")
6059
.header("Content-Type", MediaType.APPLICATION_JSON)
6160
.header("Content-Length", "0")
6261
.build();

0 commit comments

Comments
 (0)