mirror of
https://github.com/amalthea-mc/ShopChest.git
synced 2024-11-22 10:22:29 +00:00
Re-added broadcast messages
They work a bit different now. They are still only shown on startup, on join or when a player checks for updates, but also if no update is available. Also the player needs the permission "shopchest.broadcast" in order to get the message.
This commit is contained in:
parent
e1198028ee
commit
558741e587
@ -48,8 +48,6 @@ hopper-protection: true
|
|||||||
explosion-protection: true
|
explosion-protection: true
|
||||||
|
|
||||||
# Set whether broadcast messages should be enabled
|
# Set whether broadcast messages should be enabled
|
||||||
# The messages are sent to every player who have permission to get update notifications.
|
|
||||||
# They are sent each time the update checker checks for an update below the message whether an update is available.
|
|
||||||
enable-broadcast: true
|
enable-broadcast: true
|
||||||
|
|
||||||
# Set the currency symbol after price values
|
# Set the currency symbol after price values
|
||||||
|
@ -63,4 +63,7 @@ permissions:
|
|||||||
default: op
|
default: op
|
||||||
shopchest.limits:
|
shopchest.limits:
|
||||||
description: Allows you to view shop limits.
|
description: Allows you to view shop limits.
|
||||||
default: true
|
default: true
|
||||||
|
shopchest.broadcast:
|
||||||
|
description: Allows you to get broadcast messages.
|
||||||
|
default: op
|
@ -212,6 +212,10 @@ public class Commands extends BukkitCommand {
|
|||||||
player.sendMessage(Config.update_check_error());
|
player.sendMessage(Config.update_check_error());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (perm.has(player, "shopchest.broadcast")) {
|
||||||
|
if (Config.enable_broadcast()) ShopChest.broadcast = uc.getBroadcast();
|
||||||
|
if (!ShopChest.broadcast.equals("")) player.sendMessage(ShopChest.broadcast);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56,6 +56,7 @@ public class ShopChest extends JavaPlugin{
|
|||||||
public static boolean isUpdateNeeded = false;
|
public static boolean isUpdateNeeded = false;
|
||||||
public static String latestVersion = "";
|
public static String latestVersion = "";
|
||||||
public static String downloadLink = "";
|
public static String downloadLink = "";
|
||||||
|
public static String broadcast = "";
|
||||||
|
|
||||||
public static Utils utils;
|
public static Utils utils;
|
||||||
|
|
||||||
@ -191,6 +192,8 @@ public class ShopChest extends JavaPlugin{
|
|||||||
UpdateChecker uc = new UpdateChecker(this, getDescription().getWebsite());
|
UpdateChecker uc = new UpdateChecker(this, getDescription().getWebsite());
|
||||||
UpdateCheckerResult result = uc.updateNeeded();
|
UpdateCheckerResult result = uc.updateNeeded();
|
||||||
|
|
||||||
|
if (Config.enable_broadcast()) broadcast = uc.getBroadcast();
|
||||||
|
|
||||||
Bukkit.getConsoleSender().sendMessage("[ShopChest] " + Config.checking_update());
|
Bukkit.getConsoleSender().sendMessage("[ShopChest] " + Config.checking_update());
|
||||||
if(result == UpdateCheckerResult.TRUE) {
|
if(result == UpdateCheckerResult.TRUE) {
|
||||||
latestVersion = uc.getVersion();
|
latestVersion = uc.getVersion();
|
||||||
@ -223,6 +226,14 @@ public class ShopChest extends JavaPlugin{
|
|||||||
isUpdateNeeded = false;
|
isUpdateNeeded = false;
|
||||||
Bukkit.getConsoleSender().sendMessage("[ShopChest] " + Config.update_check_error());
|
Bukkit.getConsoleSender().sendMessage("[ShopChest] " + Config.update_check_error());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (Player p : getServer().getOnlinePlayers()) {
|
||||||
|
if (perm.has(p, "shopchest.broadcast")) {
|
||||||
|
if (!broadcast.equals("")) p.sendMessage(broadcast);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!broadcast.equals("")) Bukkit.getConsoleSender().sendMessage("[ShopChest] " + broadcast);
|
||||||
|
|
||||||
File itemNamesFile = new File(getDataFolder(), "item_names.txt");
|
File itemNamesFile = new File(getDataFolder(), "item_names.txt");
|
||||||
|
|
||||||
|
@ -38,6 +38,10 @@ public class NotifyUpdate implements Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (perm.has(p, "shopchest.broadcast")) {
|
||||||
|
if (!ShopChest.broadcast.equals("")) p.sendMessage(ShopChest.broadcast);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -44,6 +44,23 @@ public class UpdateChecker {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getBroadcast() {
|
||||||
|
try {
|
||||||
|
Connection con = Jsoup.connect("http://textuploader.com/5b51f/raw");
|
||||||
|
con.userAgent("Mozilla/5.0 (Windows NT 10.0; WOW64; rv:40.0) Gecko/20100101 Firefox/40.0");
|
||||||
|
|
||||||
|
Document doc = con.get();
|
||||||
|
|
||||||
|
String broadcast = doc.text();
|
||||||
|
|
||||||
|
if (!broadcast.equals("/"))
|
||||||
|
return broadcast;
|
||||||
|
|
||||||
|
} catch (Exception | Error e) {}
|
||||||
|
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
public String getVersion() {
|
public String getVersion() {
|
||||||
return version;
|
return version;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user