rrryfoo/notify-on-start
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

update after a decade (+ greet messages, - redundant events)

Browse Source
This commit is contained in:
Maki
2025-04-20 02:45:23 +08:00
parent 0f834e5810
commit 6b463cf5b3
25 changed files with 128 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2 -3
View File
@@ -1,4 +1,4 @@
.gradle
/.gradle
**/build/
!src/**/build/
@@ -17,5 +17,4 @@ gradle-app.setting
# JDT-specific (Eclipse Java Development Tools)
.classpath
/bin
/bin
.idea/compiler.xml
generated
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="17" />
<bytecodeTargetLevel target="18" />
</component>
</project>
.idea/gradle.xml
generated
+1
View File
@@ -5,6 +5,7 @@
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="17" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
.idea/jarRepositories.xml
generated
+5
View File
@@ -26,5 +26,10 @@
<option name="name" value="maven" />
<option name="url" value="https://oss.sonatype.org/content/repositories/snapshots" />
</remote-repository>
<remote-repository>
<option name="id" value="maven3" />
<option name="name" value="maven3" />
<option name="url" value="https://repo.opencollab.dev/main/" />
</remote-repository>
</component>
</project>
.idea/misc.xml
generated
+2 -1
View File
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="EntryPointsManager">
<list size="1">
@@ -5,5 +6,5 @@
</list>
</component>
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_18" default="true" project-jdk-name="17" project-jdk-type="JavaSDK" />
</project>
.idea/modules.xml
generated
-1
View File
@@ -2,7 +2,6 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/modules/cf.sobrooms.notifyonstart.main.iml" filepath="$PROJECT_DIR$/.idea/modules/cf.sobrooms.notifyonstart.main.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/notifyonstart.main.iml" filepath="$PROJECT_DIR$/.idea/modules/notifyonstart.main.iml" />
</modules>
</component>
.idea/modules/notifyonstart.main.iml
generated
+1
View File
@@ -6,6 +6,7 @@
<autoDetectTypes>
<platformType>SPIGOT</platformType>
</autoDetectTypes>
<projectReimportVersion>1</projectReimportVersion>
</configuration>
</facet>
</component>
.idea/workspace.xml
generated
+17 -10
View File
@@ -4,11 +4,7 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="ce97b9f5-6785-4670-b350-12f90ab9ea27" name="Changes" comment="dunno if it works">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/cf/sobrooms/commands/PingCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cf/sobrooms/commands/PingCommand.java" afterDir="false" />
</list>
<list default="true" id="ce97b9f5-6785-4670-b350-12f90ab9ea27" name="Changes" comment="dunno if it works (2)" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -46,7 +42,6 @@
&quot;associatedIndex&quot;: 8
}</component>
<component name="ProjectId" id="2VtRIra79d9tkHTc8fsXlFQRFWj" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
@@ -54,19 +49,22 @@
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"Downloaded.Files.Path.Enabled": "false",
"Gradle.notify-on-start [build].executor": "Run",
"Repository.Attach.Annotations": "false",
"Repository.Attach.JavaDocs": "false",
"Repository.Attach.Sources": "false",
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"RunOnceActivity.git.unshallow": "true",
"git-widget-placeholder": "main",
"last_opened_file_path": "G:/java/notify-on-start",
"project.structure.last.edited": "Libraries",
"project.structure.proportion": "0.0",
"project.structure.side.proportion": "0.2",
"settings.editor.selected.configurable": "preferences.pluginManager"
"settings.editor.selected.configurable": "reference.settingsdialog.project.gradle"
}
}]]></component>
<component name="RunManager" selected="Gradle.notify-on-start [dependencies]">
<component name="RunManager" selected="Gradle.notify-on-start [build]">
<configuration name="notify-on-start [build]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
<ExternalSystemSettings>
<option name="executionName" />
@@ -171,7 +169,15 @@
<option name="project" value="LOCAL" />
<updated>1699756821626</updated>
</task>
<option name="localTasksCounter" value="5" />
<task id="LOCAL-00005" summary="dunno if it works (2)">
<option name="closed" value="true" />
<created>1699768015200</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1699768015200</updated>
</task>
<option name="localTasksCounter" value="6" />
<servers />
</component>
<component name="VcsManagerConfiguration">
@@ -179,6 +185,7 @@
<MESSAGE value="fix stuff and add more functionality (definitely) (hi again)" />
<MESSAGE value="wrong version number" />
<MESSAGE value="dunno if it works" />
<option name="LAST_COMMIT_MESSAGE" value="dunno if it works" />
<MESSAGE value="dunno if it works (2)" />
<option name="LAST_COMMIT_MESSAGE" value="dunno if it works (2)" />
</component>
</project>
README.md
+4 -1
View File
@@ -4,7 +4,10 @@ this project is made to just send messages to Discord webhooks when events trigg
this was just made to remember whatever goofy things we did in a minecraft server, in discord
or, you know, notify us when the server starts (but not ends)
or, you know, notify us when the server starts and ends (and other things...)
*(maki, 4/20/25)*
this is a personal project, there are DEFINITELY better alternatives; this plugin is mostly server-exclusive
# Prerequisites
Before using this plugin, you must:
* Get Spigot
src/main/java/cf/sobrooms/Main.java
+59 -3
View File
@@ -19,11 +19,14 @@ import cf.sobrooms.events.world.WorldUnload;
import com.google.gson.JsonElement;
import com.google.gson.JsonParser;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin;
import java.awt.*;
import java.io.*;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.Date;
import java.util.Objects;
public class Main extends JavaPlugin {
@@ -31,11 +34,26 @@ public class Main extends JavaPlugin {
public static File webhookConfig;
private static boolean webhooksAreValidUrls;
public static boolean hdc;
public static File greetConfig;
public static void main(String... args) {
System.out.printf("Initializing using server address: %s...%n", ServerUtils.address);
}
@Override
public void onDisable() {
if (Main.webhooksAreValidUrls) {
DiscordWebhook notify = new DiscordWebhook(Main.getNotifyWebhook());
DiscordWebhook.EmbedObject embedObject = new DiscordWebhook.EmbedObject().setTitle("The server has been disabled.").setDescription(String.format("The server at %s:%d is now shutting down.", Utils.getServerHostPublicIP(), Bukkit.getServer().getPort()))
.addField("Date occurred (as a local timestamp)", new Date().toString(), false)
.setColor(Color.DARK_GRAY);
notify.addEmbed(embedObject);
try {
notify.execute();
} catch (IOException e) {
throw new RuntimeException(e);
}
}
}
@Override
public void onEnable() {
String loggingDir = "./NoS";
File directory = new File(loggingDir);
@@ -47,6 +65,7 @@ public class Main extends JavaPlugin {
}
}
isLoggingConfig = new File("./NoS/willLogEvents");
greetConfig = new File("./NoS/greetText.txt");
webhookConfig = new File("./NoS/config_webhook.json");
try {
if (isLoggingConfig.createNewFile()) {
@@ -55,8 +74,13 @@ public class Main extends JavaPlugin {
//FileWriter pubMessageWebhookConfigWriter = new FileWriter(pubMessageWebhookConfig);
//notifyWebhookConfigWriter.write("{\"url_notify\": \"default-ns\"}");
FileWriter linkConfigWriter = new FileWriter(webhookConfig);
linkConfigWriter.write("{\"url_publicmsg\": \"default-ns\",\"url_notify\": \"default-ns\"}");
FileWriter greetConfigWriter = new FileWriter(greetConfig);
greetConfigWriter.write("Welcome to $servername, $playername!");
linkConfigWriter.write("""
{"servername": "Nilou-PNK", "url_publicmsg": "default-ns", "url_notify": "default-ns", "entryMessage": "Welcome to @servername, @playername!"}
""");
linkConfigWriter.close();
greetConfigWriter.close();
//notifyWebhookConfigWriter.close();
} else {
System.out.println("Tried to create config even while it already exists, skipping step...");
@@ -109,7 +133,7 @@ public class Main extends JavaPlugin {
}
} catch (Exception e) {
System.out.println("Invalid webhook URL provide for your public messages. Please provide the correct webhook and check for any typos. (Caught exception)");
System.out.println("Exception: %s".formatted(e));
System.out.printf("Exception: %s%n", e);
return false;
}
}
@@ -149,6 +173,38 @@ public class Main extends JavaPlugin {
throw new RuntimeException(e);
}
}
public static String getServerName() {
try {
BufferedReader brfmsg = new BufferedReader(new FileReader(webhookConfig));
JsonParser jsonReader = new JsonParser();
JsonElement MsgParse = jsonReader.parse(brfmsg.readLine());
String serverName = MsgParse.getAsJsonObject().get("servername").getAsString();
brfmsg.close();
return serverName;
} catch (IOException e) {
throw new RuntimeException(e);
}
}
public static String getGreetMessage(Player player) {
try {
BufferedReader brfmsg = new BufferedReader(new FileReader(webhookConfig));
JsonParser jsonReader = new JsonParser();
JsonElement MsgParse = jsonReader.parse(brfmsg.readLine());
String entryMessage = MsgParse.getAsJsonObject().get("entryMessage").getAsString();
String serverName = getServerName();
String playername = player.getName();
brfmsg.close();
String finalOut = "";
finalOut = entryMessage.replaceAll("@servername", serverName).replaceAll("@playername", playername);
return finalOut;
} catch (IOException e) {
throw new RuntimeException(e);
}
}
public static String getNotifyWebhook() {
try {
BufferedReader brfntfy = new BufferedReader(new FileReader(webhookConfig));
src/main/java/cf/sobrooms/commands/InfoCommand.java
+4 -3
View File
@@ -1,6 +1,7 @@
package cf.sobrooms.commands;
import cf.sobrooms.Main;
import cf.sobrooms.Utils;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
@@ -17,13 +18,13 @@ public class InfoCommand implements CommandExecutor {
""" + ChatColor.WHITE +
"""
Server name/type: %s
Server name: %s
Server IP: %s
Server Port: %s
Server Version: %s
Active Players:""" + ChatColor.GOLD +
" %s\n" + ChatColor.WHITE + "Plugin made by sobrooms (rrryfoo, AnonCYTO)\n" + ChatColor.MAGIC + ":sob: all day" + ChatColor.WHITE)
.formatted(Bukkit.getServer().getName(), Utils.getServerHostPublicIP(), Bukkit.getServer().getPort(), Bukkit.getServer().getVersion(), Utils.getActivePlayers()));
" %s\n" + ChatColor.WHITE + "Plugin made by sobrooms (rrryfoo/maki + AnonCYTO)\n" + ChatColor.MAGIC + ":sob: all day" + ChatColor.WHITE)
.formatted(Main.getServerName(), Utils.getServerHostPublicIP(), Bukkit.getServer().getPort(), Bukkit.getServer().getVersion(), Utils.getActivePlayers()));
return true;
}
}
src/main/java/cf/sobrooms/commands/PingCommand.java
+3 -2
View File
@@ -27,8 +27,9 @@ public class PingCommand implements CommandExecutor {
sender.sendMessage("Failed to fetch server ping.");
} else {
if (GeyserApi.api().isBedrockPlayer(player.getUniqueId()))
sender.sendMessage(ChatColor.RED + "" + ChatColor.ITALIC + "This command will not work properly on bedrock clients.");
sender.sendMessage(ChatColor.ITALIC + "Player ping: %sms".formatted(player.getPing()));
sender.sendMessage(ChatColor.RED + "" + ChatColor.ITALIC + "This command will not work on bedrock clients.");
else
sender.sendMessage(ChatColor.ITALIC + "Player ping: %sms".formatted(player.getPing()));
}
return true;
} catch (Exception e) {
src/main/java/cf/sobrooms/events/enchantment/EnchantItem.java
+2 -2
View File
@@ -27,10 +27,10 @@ public class EnchantItem implements Listener {
.addField("Amount", String.valueOf(event.getItem().getAmount()), true)
.setColor(Color.BLUE);
notify.addEmbed(embedObject);
try {
/*try {
notify.execute();
} catch (IOException e) {
throw new RuntimeException(e);
}
}*/
}
}
src/main/java/cf/sobrooms/events/enchantment/PrepareItemEnchant.java
+2 -2
View File
@@ -24,10 +24,10 @@ public class PrepareItemEnchant implements Listener {
.addField("Item to be enchanted", event.getItem().toString(), true)
.setColor(Color.BLUE);
notify.addEmbed(embedObject);
try {
/*try {
notify.execute();
} catch (IOException e) {
throw new RuntimeException(e);
}
}*/
}
}
src/main/java/cf/sobrooms/events/player/PlayerBedEnter.java
+2 -2
View File
@@ -15,10 +15,10 @@ import java.util.Date;
public class PlayerBedEnter implements Listener {
@EventHandler
public void onPlayerBedEnter(PlayerBedEnterEvent event) {
Bukkit.getConsoleSender().sendMessage("Triggered PlayerBedEnter event.");
Bukkit.getConsoleSender().sendMessage("Player entered a bed.");
Player player = event.getPlayer();
DiscordWebhook notify = new DiscordWebhook(ServerUtils.webhook_notify);
DiscordWebhook.EmbedObject embedObject = new DiscordWebhook.EmbedObject().setTitle("Player slep").setDescription("Player is sleping")
DiscordWebhook.EmbedObject embedObject = new DiscordWebhook.EmbedObject().setTitle(player.getName() + " is now sleeping...")
.addField("Time", new Date().toString(), false)
.addField("Player name", player.getName(), true)
.setColor(Color.BLUE);
src/main/java/cf/sobrooms/events/player/PlayerBedLeave.java
+2 -2
View File
@@ -15,10 +15,10 @@ import java.util.Date;
public class PlayerBedLeave implements Listener {
@EventHandler
public void onPlayerBedLeave(PlayerBedLeaveEvent event) {
Bukkit.getConsoleSender().sendMessage("Triggered PlayerBedLeave event.");
Bukkit.getConsoleSender().sendMessage("Player left a bed");
Player player = event.getPlayer();
DiscordWebhook notify = new DiscordWebhook(ServerUtils.webhook_notify);
DiscordWebhook.EmbedObject embedObject = new DiscordWebhook.EmbedObject().setTitle("Player no longe slep...").setDescription("Player is no slep")
DiscordWebhook.EmbedObject embedObject = new DiscordWebhook.EmbedObject().setTitle(player.getName() + " is no longer sleeping.")
.addField("Time", new Date().toString(), false)
.addField("Player name", player.getName(), true)
.setColor(Color.BLUE);
src/main/java/cf/sobrooms/events/player/PlayerChat.java
+2 -2
View File
@@ -18,10 +18,10 @@ public class PlayerChat implements Listener {
@EventHandler
public void onPlayerChat(AsyncPlayerChatEvent event) {
Bukkit.getConsoleSender().sendMessage("Triggered chat event.");
Bukkit.getConsoleSender().sendMessage("A message was sent by " + event.getPlayer().getName());
Player player = event.getPlayer();
DiscordWebhook notify = new DiscordWebhook(ServerUtils.webhook_notify);
DiscordWebhook.EmbedObject embedObject = new DiscordWebhook.EmbedObject().setTitle("A message was sent").setDescription(String.format("A message sent by %s was sent.", player.getName()))
DiscordWebhook.EmbedObject embedObject = new DiscordWebhook.EmbedObject().setTitle("A message was sent by " + event.getPlayer().getName())
.addField("Date of message", new Date().toString(), false)
.addField("Message content", event.getMessage(), true)
.setColor(Color.BLUE);
src/main/java/cf/sobrooms/events/player/PlayerCommandPreprocess.java
+1 -1
View File
@@ -16,7 +16,7 @@ import java.util.Date;
public class PlayerCommandPreprocess implements Listener {
@EventHandler
public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
Bukkit.getConsoleSender().sendMessage("PlayerCommandPreprocess event triggered");
Bukkit.getConsoleSender().sendMessage("%s used a command".formatted(event.getPlayer().getName()));
Player player = event.getPlayer();
String[] command = event.getMessage().split(" "); // get the command name
DiscordWebhook notify = new DiscordWebhook(ServerUtils.webhook_notify);
src/main/java/cf/sobrooms/events/player/PlayerJoin.java
+5 -4
View File
@@ -1,8 +1,10 @@
package cf.sobrooms.events.player;
import cf.sobrooms.DiscordWebhook;
import cf.sobrooms.Main;
import cf.sobrooms.ServerUtils;
import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
@@ -15,17 +17,16 @@ import java.util.Date;
public class PlayerJoin implements Listener {
@EventHandler
public void onPlayerJoin(PlayerJoinEvent event) {
Bukkit.getConsoleSender().sendMessage("Triggered PlayerJoinEvent.");
Bukkit.getConsoleSender().sendMessage("A player has joined the server.");
Player player = event.getPlayer();
DiscordWebhook notify = new DiscordWebhook(ServerUtils.webhook_notify);
DiscordWebhook.EmbedObject embedObject = new DiscordWebhook.EmbedObject().setTitle("Player join").setDescription("A player has joined the game.")
DiscordWebhook.EmbedObject embedObject = new DiscordWebhook.EmbedObject().setTitle("A player has joined the server.")
.addField("Date of join", new Date().toString(), false)
.addField("Player name", player.getName(), true)
.setColor(Color.BLUE);
notify.addEmbed(embedObject);
try {
if (!player.hasPlayedBefore())
player.sendMessage("Welcome to the server!");
Bukkit.broadcastMessage(Main.getGreetMessage(player));
notify.execute();
} catch (IOException e) {
throw new RuntimeException(e);
src/main/java/cf/sobrooms/events/player/PlayerQuit.java
+3 -3
View File
@@ -14,10 +14,10 @@ import java.util.Date;
public class PlayerQuit implements Listener {
@EventHandler
public void onPlayerQuit(PlayerQuitEvent event) {
Bukkit.getConsoleSender().sendMessage("PlayerQuit event triggered");
Bukkit.getConsoleSender().sendMessage("A player has left the server.");
Player player = event.getPlayer();
DiscordWebhook.EmbedObject embedObject = new DiscordWebhook.EmbedObject().setTitle("A player has left the server").setDescription(String.format("A player left the server..", player.getName()))
.addField("Date of quit", new Date().toString(), false)
DiscordWebhook.EmbedObject embedObject = new DiscordWebhook.EmbedObject().setTitle("A player has left the server.")
.addField("Date of exit", new Date().toString(), false)
.addField("Player name", event.getPlayer().getName(), true)
.setColor(Color.BLUE);
DiscordWebhook notify = new DiscordWebhook(ServerUtils.webhook_notify);
src/main/java/cf/sobrooms/events/vehicle/VehicleEnter.java
+2 -2
View File
@@ -14,9 +14,9 @@ import java.util.Date;
public class VehicleEnter implements Listener {
@EventHandler
public void onVehicleEnter(VehicleEnterEvent event) {
Bukkit.getConsoleSender().sendMessage("Triggered VehicleEnter event.");
Bukkit.getConsoleSender().sendMessage("%s rode a vehicle.".formatted(event.getEntered().getName()));
DiscordWebhook notify = new DiscordWebhook(ServerUtils.webhook_notify);
DiscordWebhook.EmbedObject embedObject = new DiscordWebhook.EmbedObject().setTitle("Vehicle Enter").setDescription("cars update? :scream:")
DiscordWebhook.EmbedObject embedObject = new DiscordWebhook.EmbedObject().setTitle("Vehicle Enter").setDescription("On a ridable animal")
.addField("Time", new Date().toString(), false)
.addField("Triggered by", event.getEntered().getName(), true)
.addField("Vehicle name", event.getVehicle().getName(), true)
src/main/java/cf/sobrooms/events/vehicle/VehicleExit.java
+2 -2
View File
@@ -14,9 +14,9 @@ import java.util.Date;
public class VehicleExit implements Listener {
@EventHandler
public void onVehicleExit(VehicleExitEvent event) {
Bukkit.getConsoleSender().sendMessage("Triggered VehicleExit event.");
Bukkit.getConsoleSender().sendMessage("%s left a vehicle.".formatted(event.getExited().getName()));
DiscordWebhook notify = new DiscordWebhook(ServerUtils.webhook_notify);
DiscordWebhook.EmbedObject embedObject = new DiscordWebhook.EmbedObject().setTitle("Vehicle Exit").setDescription("cars update? :scream:")
DiscordWebhook.EmbedObject embedObject = new DiscordWebhook.EmbedObject().setTitle("Vehicle Exit").setDescription("Off a ridable animal")
.addField("Time", new Date().toString(), false)
.addField("Triggered by", event.getExited().getName(), true)
.addField("Vehicle name", event.getVehicle().getName(), true)
src/main/java/cf/sobrooms/events/weather/LightningStrike.java
+2 -2
View File
@@ -22,10 +22,10 @@ public class LightningStrike implements Listener {
.addField("Cause of strike", event.getCause().name(), true)
.setColor(Color.BLUE);
notify.addEmbed(embedObject);
try {
/*try {
notify.execute();
} catch (IOException e) {
throw new RuntimeException(e);
}
}*/
}
}
src/main/java/cf/sobrooms/events/weather/ThunderChange.java
+2 -2
View File
@@ -21,10 +21,10 @@ public class ThunderChange implements Listener {
.addField("Occurred in world", event.getWorld().getName(), true)
.setColor(Color.BLUE);
notify.addEmbed(embedObject);
try {
/*try {
notify.execute();
} catch (IOException e) {
throw new RuntimeException(e);
}
}*/
}
}
src/main/java/cf/sobrooms/events/weather/WeatherChange.java
+2 -2
View File
@@ -21,10 +21,10 @@ public class WeatherChange implements Listener {
.addField("Occurred in world", event.getWorld().getName(), true)
.setColor(Color.BLUE);
notify.addEmbed(embedObject);
try {
/*try {
notify.execute();
} catch (IOException e) {
throw new RuntimeException(e);
}
}*/
}
}