Skip to content
GitLab
Commit d2705a67 authored by Lizzy's avatar Lizzy
Browse files

Ready for prime time, version 1.2.0

parent 0c7a1273
Branches
Tags 1.2.0
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 13 additions and 107 deletions
dependency-reduced-pom.xml
+ 1
− 1
View file @ d2705a67
......@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.theender</groupId>
<artifactId>LiizziisDiscordBridge</artifactId>
<version>1.1.3</version>
<version>1.2.0</version>
<build>
<plugins>
<plugin>
......
pom.xml
+ 1
− 1
View file @ d2705a67
......@@ -6,7 +6,7 @@
<groupId>net.theender</groupId>
<artifactId>LiizziisDiscordBridge</artifactId>
<version>1.1.3</version>
<version>1.2.0</version>
<properties>
<maven.compiler.source>11</maven.compiler.source>
......
src/main/java/net/theender/ldbridge/LDListener.java
+ 10
− 95
View file @ d2705a67
......@@ -14,11 +14,13 @@ import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.*;
import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.json.JSONArray;
import org.json.JSONObject;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Optional;
import java.util.Set;
......@@ -124,81 +126,20 @@ public class LDListener implements Listener {
}
}
@EventHandler
public void onPlayerLoginEvent(PlayerLoginEvent event) throws InterruptedException {
if (true) {return;}
this.logger.info("AAAAAAAAAAAAAAAAAAAAAAAAAAAA");
this.logger.info(event.getPlayer().toString());
this.logger.info(String.valueOf(event.isAsynchronous()));
Group verified = MainClass.luckperms.getGroupManager().getGroup("verified");
Group def = MainClass.luckperms.getGroupManager().getGroup("default");
// User user = MainClass.luckperms.getPlayerAdapter(Player.class).getUser(event.getPlayer());
MainClass.getLogger().info("We got user object!!!! Pawgers");
Player player = event.getPlayer();
if (event.getPlayer().getDisplayName().equals("EveyTheKsitty")) {
event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "You haven't linked your discord yet!");
}
CachedMetaData metaData = MainClass.luckperms.getPlayerAdapter(Player.class).getMetaData(event.getPlayer());
BigInteger discordID = BigInteger.ZERO;
if (metaData.getMetaValue("discord_id") != null) {
discordID = new BigInteger(metaData.getMetaValue("discord_id")).or(BigInteger.ZERO);
}
// if (discordID.equals(BigInteger.ZERO)) {
// MainClass.luckperms.getUserManager().modifyUser(event.getPlayer().getUniqueId(), (User user) -> {
// user.data().clear(NodeType.INHERITANCE::matches);
// Node node = InheritanceNode.builder(def).build();
// user.data().add(node);
//// MainClass.luckperms.getUserManager().saveUser(user);
// });
// logger.info("discord ID was 0");
// return;
// }
Bukkit.getScheduler().runTaskAsynchronously(this.MainClass, new Runnable() {
@Override
public void run() {
// JSONObject user_data = new JSONObject();
try {
Response resp = utils.makeGetRequest(String.format("http://192.168.0.63:8080/userinfo/303284679774306307/%s", metaData.getMetaValue("discord_id")));
// user_data = (JSONObject) JSONObject.stringToValue(resp.getResponseBody());
logger.info(resp.getResponseBody());
Integer return_code = resp.getStatusCode();
if (return_code.equals(403)) {
Bukkit.getScheduler().runTask(MainClass, new Runnable() {
@Override
public void run() {
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, "You've been banned from the discord");
event.getPlayer().kickPlayer("You're banned from the discord, therefore you are not allowed on here");
}
});
// event.getPlayer().kickPlayer("You're banned from the discord, therefore you are not allowed on here");
}
} catch (InterruptedException | ExecutionException e) {
e.printStackTrace();
}
// logger.info(user_data);
}
});
}
@EventHandler
public void onPlayerJoin(PlayerJoinEvent event) {
// Check here if user has linked discord stuff
Player player = event.getPlayer();
User user = MainClass.luckperms.getPlayerAdapter(Player.class).getUser(player);
MainClass.getLogger().info("We got user object!!!! Pawgers");
JSONObject Data = new JSONObject();
CachedMetaData metaData = MainClass.luckperms.getPlayerAdapter(Player.class).getMetaData(player);
// this.logger.info(String.valueOf(new BigInteger(metaData.getMetaValue("discord_id")).or(BigInteger.ZERO)));
// String discord_id = user.getNodes(NodeType.META).toString();
// MainClass.getLogger().info(String.format("%s", discord_id));
if (metaData.getMetaValue("discord_id") == null) {
player.sendMessage("&dYou don't have a discord account linked. See the hologram for instructions.");
MainClass.getLogger().info(String.format("Player %s doesn't have a Discord ID linked.", player.getDisplayName()));
} else {
MainClass.getLogger().info(String.format("Player %s has a discord ID of %s", player.getDisplayName(), metaData.getMetaValue("discord_id")));
}
Data.put("content", String.format("[ __%s__ ] JOIN: %s (`%s`) just joined the server!",
MainClass.Instance, player.getDisplayName(), player.getName()));
Bukkit.getScheduler().runTaskAsynchronously(MainClass, () -> {
......@@ -212,8 +153,6 @@ public class LDListener implements Listener {
@EventHandler
public void onPlayerQuit(PlayerQuitEvent event) {
// Check here if user has linked discord stuff
// String URL = "https://media.guilded.gg/webhooks/fdf1fdbe-e8dd-43a3-b6ff-8de72d59ebe7/JUcRD1Wx6CoyUASOwMG8eeeYewYKEwUS02mIkE4MWI0sAcSaakQcCSeCQmA2Auq6SSw4KG6mUKAM6EIgCioIiC";
JSONObject Data = new JSONObject();
Data.put("content", String.format("[ __%s__ ] PART: %s (`%s`) just left the server!\n" +
"`%s`", MainClass.Instance, event.getPlayer().getDisplayName(), event.getPlayer().getName(), event.getQuitMessage()));
......@@ -228,9 +167,6 @@ public class LDListener implements Listener {
@EventHandler
public void onAsyncPlayerChat(AsyncPlayerChatEvent event) {
// modify chat messages here, need to hook into LP
// this.logger.info("Woah! We got a chat message!? POGGERS");
// String URL = "https://media.guilded.gg/webhooks/d39d21c7-6387-4850-8d1b-3a0fa82a9611/w1t1aqUWqGCcuQc0csM6Me8A8G0auaMQI4wMAOsY4Mm8CescsQIKAG8ge04UG4qEIkSew8GEQW8ky6IkY8U06u"
Player player = event.getPlayer();
String MessageContent = String.format("[ __%s__ ] CHAT: %s (`%s`)>\n`%s`",
MainClass.Instance, player.getDisplayName(), player.getName(), event.getMessage());
......@@ -241,27 +177,6 @@ public class LDListener implements Listener {
} catch (InterruptedException | ExecutionException e) {
e.printStackTrace();
}
// this.logger.info("Ok, lets make a web request");
// this.logger.info(Data.toString());
// Bukkit.getScheduler().runTaskAsynchronously(MainClass, new Runnable() {
// @Override
// public void run() {
// Future<Response> whenResponse = httpClient.preparePost(URL).setHeader("Content-Type", "application/json").setBody(Data.toString()).execute(new AsyncCompletionHandler<Response>() {
// @Override
// public Response onCompleted(Response response) throws IOException {
// logger.info("Done!");
// logger.info(response.getResponseBody());
// return response;
// }
// });
// try {
// Response response = whenResponse.get();
// } catch (ExecutionException | InterruptedException e) {
// e.printStackTrace();
// }
// }
// });
}
}
......
src/main/java/net/theender/ldbridge/LiizziisDiscordBridge.java
+ 0
− 9
View file @ d2705a67
......@@ -47,16 +47,7 @@ public class LiizziisDiscordBridge extends JavaPlugin {
@Override
public void onDisable() {
getLogger().info("Oh shit!");
// JSONObject Data = new JSONObject();
// Data.put("content", String.format("Liizzii's Discord/Guilded Bridge! %s signing off!", this.Instance));
// makeRequest(this.getConfig().getString("join-part-hook"), Data);
this.saveConfig();
// might need to uncomment this later
// try {
// this.httpClient.close();
// } catch (IOException e) {
// e.printStackTrace();
// }
}
public void setupConfig() {
......
src/main/resources/plugin.yml
+ 1
− 1
View file @ d2705a67
name: LiizzisDiscordBridge
version: 1.1.3-TETST
version: 1.2.0
main: net.theender.ldbridge.LiizziisDiscordBridge
author: Liizzii
api-version: 1.18
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment