Minecraft
/
QoL
6
0
Fork 1
Code Issues 3 Pull Requests 2 Projects Releases Wiki Activity

Compare commits

base: Minecraft:main
Branches Tags
Minecraft:benamaurer-chatchatDiscod
Minecraft:main
Minecraft:mauberries/main
Minecraft:grief
Minecraft:up
Minecraft:1.16
Minecraft:spec_confirm
Minecraft:dynmap_link
Minecraft:discord_syntax
Minecraft:checkup
Minecraft:master
Minecraft:latest
..
compare: Minecraft:master
Branches Tags
Minecraft:benamaurer-chatchatDiscod
Minecraft:main
Minecraft:mauberries/main
Minecraft:grief
Minecraft:up
Minecraft:1.16
Minecraft:spec_confirm
Minecraft:dynmap_link
Minecraft:discord_syntax
Minecraft:checkup
Minecraft:master
Minecraft:latest

5 Commits
main ... master

Author SHA1 Message Date
Etzelia 09a63b1163
Spacing 
Signed-off-by: Etzelia <etzelia@hotmail.com>
 2019-07-22 13:04:45 -05:00
Etzelia c681978578
Update docs 
Signed-off-by: Etzelia <etzelia@hotmail.com>
 2019-07-22 13:03:58 -05:00
Etzelia acf12810e8
Remove setViewDistance call until re-implemented 
Signed-off-by: Etzelia <etzelia@hotmail.com>
 2019-07-22 10:49:33 -05:00
Etzelia c63fb09e03
Merge branch 'master' of https://git.etztech.xyz/24CarrotCraft/QoL 2019-07-22 10:48:07 -05:00
Etzelia 1e0c8bedbd
Update to 1.14.3 
Signed-off-by: Etzelia <etzelia@hotmail.com>
 2019-07-03 20:25:31 -05:00
53 changed files with 568 additions and 1298 deletions
Show Stats Expand all files Collapse all files

36
.drone.yml
View File

@ -1,36 +0,0 @@
---
kind: pipeline
type: docker
name: compliance
steps:
- name: build
image: maven:3-openjdk-16
commands:
- mvn install
---
kind: pipeline
type: docker
name: release
trigger:
branch:
- main
event:
- push
steps:
- name: build
image: maven:3-openjdk-16
commands:
- mvn install
- name: gitea-release
pull: always
image: jolheiser/drone-gitea-main:latest
settings:
token:
from_secret: gitea_token
base: https://git.canopymc.net
files:
- "target/QoL-*.jar"

7
LICENSE
View File

@ -1,7 +0,0 @@
Copyright 2020 Etzelia
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

4
docs/source/changelog/index.rst
View File

@ -12,6 +12,4 @@ Changelogs
v1.4 <v1.4>
v1.5 <v1.5>
v1.6 <v1.6>
v1.7 <v1.7>
v1.8 <v1.8>
v1.9 <1.9>
v1.7 <v1.7>

3
docs/source/changelog/v1.7.rst
View File

@ -12,5 +12,4 @@ Additions
.. _World View Distance Overrides: https://git.etztech.xyz/24CarrotCraft/QoL/commit/81a2fb3fa0e16ebbd4363074b17447be1d5b950e
Bug Fixes
---------
None
---------

30
docs/source/changelog/v1.8.rst
View File

@ -1,30 +0,0 @@
.. include:: ../common.rst
.. _qol_v1.8:
QoL v1.8
========
Additions
---------
* `Checkup Command`_ - Allows a user to start a checkup, teleporting to each online player
* `Discord Syntax`_ - Allows a user to use Discord (markdown) syntax for chat formatting
``_italic_`` |br|
``*italic*`` |br|
``__underline__`` |br|
``**bold**`` |br|
``~~strikethrough~~``
* `Spec Confirm`_ - Updates the TP confirmation to allow for a configurable list of commands
* `Dynmap Link Command`_ - Allows a user to get a link to dynmap pointing to their current location
.. _Checkup Command: https://git.etztech.xyz/24CarrotCraft/QoL/pulls/33
.. _Discord Syntax: https://git.etztech.xyz/24CarrotCraft/QoL/pulls/36
.. _Spec Confirm: https://git.etztech.xyz/24CarrotCraft/QoL/pulls/39
.. _Dynmap Link Command: https://git.etztech.xyz/24CarrotCraft/QoL/pulls/40
Bug Fixes
---------
None

14
docs/source/changelog/v1.9.rst
View File

@ -1,14 +0,0 @@
.. include:: ../common.rst
.. _qol_v1.9:
QoL v1.9
========
Additions
---------
* `Marker Command`_ - allows a player to create a marker on the dynmap at their current location.
Bug Fixes
---------
None

8
docs/source/commands.rst
View File

@ -41,12 +41,4 @@ Alias ``/names`` and ``/name``
``/deathmute <name>`` toggles death messages on or off for a player.
``/checkup <start|next|stop>`` Start a checkup, teleporting to all online players.
``/dynmaplink [<map>] [<zoom>]`` Get a link to Dynmap with your current location. Optionally choose the map (flat, surface, etc.) and zoom level.
``/marker <set> <name>`` Creates a marker on the dynmap at the players current location.
``/marker <remove> <name>`` Removes a marker a user has created.
``/marker <list>`` Lists all the markers a player owns.

7
docs/source/misc.rst
View File

@ -59,9 +59,4 @@ World View Distance Override
.. note::
Paper has removed this feature in ``1.14.x`` and so it has been disabled in QoL until it is re-implemented by Paper.
Each world can have its own view distance. View distances of each world can be set in the config file. If no view distance is set, the view distance defaults to the one in server.properties.
QoL Dynmap Markers
------------------
QoL Markers are placed on their own layer which can be configured to be shown or hidden. The icon of the marker can be set in the `dynmap.marker_icon` config option.
The number of markers a player can have is set by the `qol.marker.limit.#` permission.
Each world can have its own view distance. View distances of each world can be set in the config file. If no view distance is set, the view distance defaults to the one in server.properties.

14
docs/source/permissions.rst
View File

@ -24,7 +24,7 @@ Permissions
``qol.auditor`` - Ability to bypass auditing when running commands on auditable
``qol.specconfirm`` - Forces a player to confirm a (configurable) command(s) when outside spectator mode
``qol.tpconfirm`` - Forces a player to confirm teleports when outside spectator mode
``qol.whitelist.bypass`` - Allows someone into the server when Whitelist mode is enabled
@ -38,16 +38,8 @@ Permissions
``qol.timeout.*`` - Wildcard permission for Timeout
``qol.karattrophy`` - Ability to use the Karat Trophy command
``qol.dynmaplink`` - Ability to use the Dynmap Link command
``qol.karattrophy`` - Ability to use the Karat Trophy Command
``qol.deathmute`` - Ability to use the Death Mute command
``qol.griefalert`` - Receive GriefAlert alerts
``qol.checkup`` - Ability to use the Checkup command
``qol.discord`` - Use Discord (markdown) syntax for chat formatting
``qol.marker`` - Ability to use the Marker command
``qol.griefalert`` - Receive GriefAlert alerts

67
pom.xml
View File

@ -3,7 +3,7 @@
<groupId>xyz.etztech</groupId>
<artifactId>QoL</artifactId>
<!-- Version is used in plugin.yml -->
<version>1.16</version>
<version>1.7</version>
<packaging>jar</packaging>
<!-- Plugin Information -->
@ -29,63 +29,50 @@
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.16.3-R0.1-SNAPSHOT</version>
<groupId>com.destroystokyo.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.14.3-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>xyz.etztech</groupId>
<artifactId>plugin-api</artifactId>
<version>1.0.7</version>
<artifactId>EtzCore</artifactId>
<version>1.0.5</version>
</dependency>
<dependency>
<groupId>net.ess3</groupId>
<artifactId>Essentials</artifactId>
<version>2.14-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>us.dynmap</groupId>
<artifactId>dynmap-api</artifactId>
<version>1.9.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
<dependency>
<groupId>com.discordsrv</groupId>
<artifactId>discordsrv</artifactId>
<version>1.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>me.lucko</groupId>
<artifactId>spark-api</artifactId>
<version>0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.nisovin.shopkeepers</groupId>
<artifactId>ShopkeepersAPI</artifactId>
<version>2.13.3</version>
<scope>provided</scope>
</dependency>
</dependencies>
<repositories>
<repository>
<id>spigotmc-repo</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
<id>papermc</id>
<url>https://papermc.io/repo/repository/maven-public/</url>
</repository>
<repository>
<id>Scarsz-Nexus</id>
<url>https://nexus.scarsz.me/content/groups/public/</url>
</repository>
<repository>
<id>birbmc-repo</id>
<url>https://mvn.birbmc.com</url>
<id>etztech-repo</id>
<url>http://repo.etztech.xyz</url>
</repository>
<repository>
<id>dynmap-repo</id>
<url>https://repo.mikeprimm.com/</url>
<url>http://repo.mikeprimm.com/</url>
</repository>
<repository>
<id>ess-repo</id>
<url>http://repo.ess3.net/content/groups/essentials</url>
</repository>
<repository>
<id>mvn-repo</id>
@ -93,20 +80,12 @@
</repository>
<repository> <!-- This repo fixes issues with transitive dependencies -->
<id>jcenter</id>
<url>https://jcenter.bintray.com</url>
<url>http://jcenter.bintray.com</url>
</repository>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
<repository>
<id>sonatype-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
<repository>
<id>shopkeepers-repo</id>
<url>https://nexus.lichtspiele.org/repository/releases/</url>
</repository>
</repositories>
<build>
@ -171,4 +150,4 @@
</plugin>
</plugins>
</build>
</project>
</project>

17
src/main/java/xyz/etztech/qol/EtzTechUtil.java
View File

@ -7,7 +7,6 @@ import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.permissions.PermissionAttachmentInfo;
import java.io.BufferedReader;
import java.io.InputStream;
@ -15,7 +14,6 @@ import java.io.InputStreamReader;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Set;
import java.util.UUID;
public class EtzTechUtil
@ -38,6 +36,8 @@ public class EtzTechUtil
paramPlayer.sendMessage(ChatColor.translateAlternateColorCodes('&', paramString));
}
public static UUID asUUID(String uuid) {
try {
if (uuid.contains("-") && uuid.length() == 36) {
@ -116,18 +116,7 @@ public class EtzTechUtil
return minutes*60*20;
}
public static int getPermValue(String perm, Set<PermissionAttachmentInfo> permissions) {
int limit = 0;
for (PermissionAttachmentInfo permission : permissions) {
if (permission.getPermission().startsWith(perm + ".") && permission.getValue()) {
try {
int p = Integer.parseInt(permission.getPermission().replaceFirst(perm + ".", ""));
limit = limit > p ? limit : p;
} catch (Exception ignored) {}
}
}
return limit;
}

255
src/main/java/xyz/etztech/qol/QoL.java
View File

@ -1,43 +1,27 @@
package xyz.etztech.qol;
import com.nisovin.shopkeepers.api.ShopkeepersPlugin;
import github.scarsz.discordsrv.DiscordSRV;
import net.md_5.bungee.api.chat.BaseComponent;
import net.ess3.api.IEssentials;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.ChatColor;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.plugin.RegisteredServiceProvider;
import org.bukkit.plugin.java.JavaPlugin;
import org.dynmap.DynmapAPI;
import org.dynmap.markers.Marker;
import org.dynmap.markers.MarkerAPI;
import org.dynmap.markers.MarkerIcon;
import org.dynmap.markers.MarkerSet;
import xyz.etztech.qol.commands.*;
import xyz.etztech.qol.listeners.*;
import xyz.etztech.qol.other.GriefAlert;
import xyz.etztech.qol.other.LinkCommand;
import xyz.etztech.qol.other.Reminder;
import xyz.etztech.qol.other.TPSRunnable;
import me.lucko.spark.api.Spark;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import java.util.*;
import java.util.logging.Logger;
public class QoL extends JavaPlugin {
static private final String qolMarkerSetName = "qolMarkerSet";
private String qolMarkerIcon = null;
private static QoL instance;
private Spark spark = null;
private IEssentials essentials = null;
private DynmapAPI dynmap = null;
private MarkerAPI markerAPI = null;
private MarkerSet playerMarkerSet = null;
private boolean qolMarkerLayerShow = false;
private String qolMarkerSetLabel = null;
public static FileConfiguration config;
private Logger log = Logger.getLogger( "Minecraft" );
@ -49,7 +33,8 @@ public class QoL extends JavaPlugin {
private static List<String> audits = new ArrayList<>();
private static List<LinkCommand> links = new ArrayList<>();
private Reminder reminder = null;
private static Map<String, Integer> viewDistances = new HashMap<>();
private GriefAlert griefAlert;
public void onEnable() {
instance = this;
@ -57,91 +42,77 @@ public class QoL extends JavaPlugin {
reloadConfig();
saveResource("qol.png", true);
//Spark hook
RegisteredServiceProvider<Spark> sparkProvider = Bukkit.getServicesManager().getRegistration(Spark.class);
if (sparkProvider != null) {
log("Hooked into Spark for TPS alert.");
spark = sparkProvider.getProvider();
//Essentials hook
if (Bukkit.getPluginManager().isPluginEnabled("Essentials")) {
log("Hooked into Essentials for TPS alert.");
essentials = (IEssentials) Bukkit.getPluginManager().getPlugin("Essentials");
}
//Dynmap hook
if (Bukkit.getPluginManager().isPluginEnabled("dynmap")) {
log("Hooked into Dynmap.");
dynmap = (DynmapAPI) Bukkit.getPluginManager().getPlugin("dynmap");
// Marker setup
if (dynmap != null) {
markerAPI = dynmap.getMarkerAPI();
playerMarkerSet = markerAPI.getMarkerSet(qolMarkerSetName);
if (playerMarkerSet == null) {
playerMarkerSet = markerAPI.createMarkerSet(qolMarkerSetName, qolMarkerSetLabel, null, true);
}
if (playerMarkerSet == null) {
log("Unable to create marker set");
}
else {
playerMarkerSet.setHideByDefault(!qolMarkerLayerShow);
playerMarkerSet.setMarkerSetLabel(qolMarkerSetLabel);
}
}
}
// DiscordSRV Hook
if (Bukkit.getPluginManager().isPluginEnabled("DiscordSRV")) {
new DiscordSRVListener(this);
}
// Shopkeepers Hook
if (Bukkit.getPluginManager().isPluginEnabled("Shopkeepers")) {
new HeadShopListener(this);
log("Hooked in Shopkeepers for the head shop");
}
if( isEnabled() ) {
// Add listeners
new ServerListPingListener(this);
new AsyncPlayerChatListener(this);
new LoginListener(this);
new JoinListener(this);
new BlockIgniteListener(this);
new CommandPreprocessListener(this);
new DeathListener(this);
new EntityChangeBlockListener(this);
ServerListPingListener serverListPingListener = new ServerListPingListener(this);
getServer().getPluginManager().registerEvents(serverListPingListener, this);
AsyncPlayerChatListener asyncPlayerChatListener = new AsyncPlayerChatListener(this);
getServer().getPluginManager().registerEvents(asyncPlayerChatListener, this);
LoginListener loginListener = new LoginListener(this);
getServer().getPluginManager().registerEvents(loginListener, this);
JoinListener joinListener = new JoinListener(this);
getServer().getPluginManager().registerEvents(joinListener, this);
BlockIgniteListener blockIgniteListener = new BlockIgniteListener(this);
getServer().getPluginManager().registerEvents(blockIgniteListener, this);
CommandPreprocessListener commandPreprocessListener = new CommandPreprocessListener(this);
getServer().getPluginManager().registerEvents(commandPreprocessListener, this);
DeathListener deathListener = new DeathListener(this);
getServer().getPluginManager().registerEvents(deathListener, this);
PlayerBucketEmptyListener playerBucketEmptyListener = new PlayerBucketEmptyListener(this);
getServer().getPluginManager().registerEvents(playerBucketEmptyListener, this);
BlockPlaceListener blockPlaceListener = new BlockPlaceListener(this);
getServer().getPluginManager().registerEvents(blockPlaceListener, this);
PlayerChangedWorldListener playerChangedWorldListener = new PlayerChangedWorldListener(this);
getServer().getPluginManager().registerEvents(playerChangedWorldListener, this);
// Add commands
new MainCommand(this);
new UUIDCommand(this);
new NameHistoryCommand(this);
new PortalCommand(this);
new SudoCommand(this);
new MakeMeCommand(this);
new ShadowMuteCommand(this);
new WhitelistCommand(this);
new TimeoutCommand(this);
new ColorsCommand(this);
new WorldInfoCommand(this);
new DeathMuteCommand(this);
new CheckupCommand(this);
new DynmapLinkCommand(this);
new WikiCommand(this);
new MoonCommand(this);
if (DiscordSRV.api.isAnyHooked()) {
new DiscordIgnoreCommand(this);
}
if (dynmap != null) {
new MarkerCommand(this);
}
MainCommand mainCommand = new MainCommand(this);
this.getCommand("qol").setExecutor(mainCommand);
UUIDCommand uuidCommand = new UUIDCommand(this);
this.getCommand("uuid").setExecutor(uuidCommand);
NameHistoryCommand nameHistoryCommand = new NameHistoryCommand(this);
this.getCommand("history").setExecutor(nameHistoryCommand);
PortalCommand portalCommand = new PortalCommand(this);
this.getCommand("portal").setExecutor(portalCommand);
SudoCommand sudoCommand = new SudoCommand(this);
this.getCommand("sudo").setExecutor(sudoCommand);
MakeMeCommand makeMeCommand = new MakeMeCommand(this);
this.getCommand("makeme").setExecutor(makeMeCommand);
ShadowMuteCommand shadowMuteCommand = new ShadowMuteCommand(this);
this.getCommand("shadowmute").setExecutor(shadowMuteCommand);
WhitelistCommand whitelistCommand = new WhitelistCommand(this);
this.getCommand("whitelist").setExecutor(whitelistCommand);
TimeoutCommand timeoutCommand = new TimeoutCommand(this);
this.getCommand("timeout").setExecutor(timeoutCommand);
ColorsCommand colorsCommand = new ColorsCommand(this);
this.getCommand("colors").setExecutor(colorsCommand);
WorldInfoCommand worldInfoCommand = new WorldInfoCommand(this);
this.getCommand("worldinfo").setExecutor(worldInfoCommand);
DeathMuteCommand deathMuteCommand = new DeathMuteCommand(this);
this.getCommand("deathmute").setExecutor(deathMuteCommand);
KaratTrophyCommand karatTrophyCommand = new KaratTrophyCommand(this);
this.getCommand("karattrophy").setExecutor(karatTrophyCommand);
if (getConfig().getStringList("list").size() > 0) {
new ListCommand(this);
ListCommand listCommand = new ListCommand(this);
this.getCommand("list").setExecutor(listCommand);
}
if (getConfig().getStringList("plugins").size() > 0) {
PluginsCommand pluginsCommand = new PluginsCommand(this);
this.getCommand("plugins").setExecutor(pluginsCommand);
}
@ -157,21 +128,33 @@ public class QoL extends JavaPlugin {
}, 0, EtzTechUtil.minutesToTicks(schedule));
}
if (reminder != null && reminder.getFrequency() != 0) {
// Reminders
int frequency = config.getInt("reminders.frequency");
if (frequency > 0) {
Bukkit.getScheduler().scheduleSyncRepeatingTask(QoL.getInstance(), new Runnable() {
int idx = 0;
@Override
public void run() {
BaseComponent [] msg = reminder.nextReminder();
for (Player player : Bukkit.getOnlinePlayers()) {
player.spigot().sendMessage(msg);
List<String> reminders = config.getStringList("reminders.messages");
ChatColor color = ChatColor.getByChar(config.getString("reminders.color").replace("&", ""));
if (idx >= reminders.size()) {
idx = 0;
}
Bukkit.getConsoleSender().spigot().sendMessage(msg);
for (Player player : Bukkit.getOnlinePlayers()) {
EtzTechUtil.sms(player, color + reminders.get(idx));
}
idx++;
}
}, 0, EtzTechUtil.minutesToTicks(reminder.getFrequency()));
}, 0, EtzTechUtil.minutesToTicks(frequency));
}
// TPS Check
Bukkit.getScheduler().scheduleSyncRepeatingTask(QoL.getInstance(), new TPSRunnable(this), 0, EtzTechUtil.minutesToTicks(1));
// Grief Alert
griefAlert = new GriefAlert(this);
Bukkit.getScheduler().scheduleSyncRepeatingTask(QoL.getInstance(), griefAlert, 0, EtzTechUtil.minutesToTicks(10));
}
}
@ -196,11 +179,16 @@ public class QoL extends JavaPlugin {
links.add(LinkCommand.fromString(raw));
}
qolMarkerIcon = config.getString("dynmap.marker_icon", "blueflag");
qolMarkerLayerShow = config.getBoolean("dynmap.marker_set_show", false);
qolMarkerSetLabel = config.getString("dynmap.marker_set_label", "QoL Markers");
viewDistances = new HashMap<>();
reminder = Reminder.fromConfig(config.getConfigurationSection("reminders"));
ConfigurationSection view_distances = config.getConfigurationSection("view-distances");
for (String worldName : view_distances.getKeys(false)) {
int viewDistance = view_distances.getInt(worldName);
viewDistances.put(worldName, viewDistance);
}
}
@ -297,61 +285,24 @@ public class QoL extends JavaPlugin {
return links;
}
public IEssentials getEssentials() { return essentials; }
public DynmapAPI getDynmap() { return dynmap; }
public GriefAlert getGriefAlert() {
return griefAlert;
}
public static Map<String, Integer> getViewDistances() {
return viewDistances;
}
public void runTask(final String command) {
Bukkit.getScheduler().runTask(QoL.instance, () -> Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command));
}
public MarkerSet getPlayerMarkerSet() {
return playerMarkerSet;
}
public List<Marker> getPlayerMarkers(Player player) {
ArrayList<Marker> markers = new ArrayList<>();
String player_uuid = EtzTechUtil.formatUUID(player.getUniqueId().toString(), true);
for (Marker marker: playerMarkerSet.getMarkers()) {
if (marker.getMarkerID().contains(player_uuid)) {
markers.add(marker);
}
}
return markers;
}
public String getMarkerName(Player player, String name) {
String uuid = EtzTechUtil.formatUUID(player.getUniqueId().toString(), true);
return uuid + " " + name;
}
public void createMarkerAtPlayer(Player player, String name) {
Location location = player.getLocation();
MarkerIcon icon = markerAPI.getMarkerIcon(qolMarkerIcon);
Marker playerMarker = getPlayerMarker(player, name);
if (playerMarker != null) {
playerMarker.deleteMarker();
}
playerMarkerSet.createMarker(getMarkerName(player, name), name, true, player.getWorld().getName(), location.getX(), location.getY(), location.getZ(), icon, true);
}
public Marker getPlayerMarker(Player player, String name) {
Marker marker = playerMarkerSet.findMarker(getMarkerName(player, name));
// Find marker using old naming system
if (marker == null) {
String uuid = EtzTechUtil.formatUUID(player.getUniqueId().toString(), false);
return playerMarkerSet.findMarker(uuid);
}
else {
return marker;
}
}
public Spark getSpark() {
return spark;
public void updatePlayerViewDistance(Player player) {
//player.setViewDistance(viewDistances.getOrDefault(player.getWorld().getName().toLowerCase(), getServer().getViewDistance()));
}
}

140
src/main/java/xyz/etztech/qol/commands/CheckupCommand.java
View File

@ -1,140 +0,0 @@
package xyz.etztech.qol.commands;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import xyz.etztech.qol.EtzTechUtil;
import xyz.etztech.qol.Lang;
import xyz.etztech.qol.QoL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.UUID;
public class CheckupCommand implements CommandExecutor {
QoL plugin;
private static HashMap<UUID, Checkup> checkups = new HashMap<>();
public CheckupCommand(QoL paramQoL) {
this.plugin = paramQoL;
plugin.getCommand("checkup").setExecutor(this);
}
public static void join(Player player) {
Checkup checkup;
checkup:
for (UUID uuid : checkups.keySet()) {
checkup = checkups.get(uuid);
for (Player pl : checkup.players) {
if (pl.getUniqueId().equals(player.getUniqueId())) {
continue checkup; // Don't check twice, even if they re-logged
}
}
checkup.players.add(player);
checkups.put(uuid, checkup);
}
}
@Override
public boolean onCommand(CommandSender commandSender, Command command, String s, String[] args) {
if (!( commandSender instanceof Player)) {
EtzTechUtil.sms(commandSender, Lang.NO_CONSOLE.getDef());
return true;
}
if (!commandSender.hasPermission("qol.checkup")) {
EtzTechUtil.sms(commandSender, Lang.NO_PERMISSION.getDef());
return true;
}
if (args.length < 1) {
EtzTechUtil.sms(commandSender, ChatColor.RED + "Please specify a sub-command. `/checkup <start|stop|next>`");
return true;
}
Player player = (Player) commandSender;
switch (args[0].toLowerCase()) {
case "start":
start(player);
break;
case "stop":
stop(player);
break;
case "next":
next(player);
break;
default:
EtzTechUtil.sms(commandSender, ChatColor.RED + "Invalid sub-command. `/checkup <start|stop|next>`");
}
return true;
}
private void start(Player player) {
if (checkups.containsKey(player.getUniqueId())) {
EtzTechUtil.sms(player, ChatColor.RED + "You are already performing a checkup. Stop with `/checkup stop` or continue with `/checkup next`");
return;
}
checkups.put(player.getUniqueId(), new Checkup(new ArrayList<>(Bukkit.getOnlinePlayers()), player.getLocation()));
next(player); // Start the checkup
}
private void stop(Player player) {
if (!checkups.containsKey(player.getUniqueId())) {
EtzTechUtil.sms(player, ChatColor.RED + "You aren't currently performing a checkup. Start one with `/checkup start`");
return;
}
Checkup checkup = checkups.get(player.getUniqueId());
checkups.remove(player.getUniqueId());
player.teleport(checkup.back);
}
private void next(Player player) {
if (!checkups.containsKey(player.getUniqueId())) {
EtzTechUtil.sms(player, ChatColor.RED + "You aren't currently performing a checkup. Start one with `/checkup start`");
return;
}
Checkup checkup = checkups.get(player.getUniqueId());
Player next;
while (checkup.hasNext()) {
// Loop until next player is online
next = checkup.next();
if (next.isOnline() && player.getUniqueId() != next.getUniqueId()) {
player.teleport(next.getLocation());
EtzTechUtil.sms(player, ChatColor.GREEN + "You are now checking on " + ChatColor.YELLOW + next.getName());
checkups.put(player.getUniqueId(), checkup);
return;
}
}
EtzTechUtil.sms(player, ChatColor.GREEN + "This is the last player in the checkup. Once you are finished, use `/checkup stop`");
}
private class Checkup {
Integer index;
List<Player> players;
Location back;
private Checkup(List<Player> players, Location back) {
this.index = 0;
this.players = players;
this.back = back;
}
private boolean hasNext() {
return this.index < this.players.size();
}
private Player next() {
return this.players.get(this.index++);
}
}
}

3
src/main/java/xyz/etztech/qol/commands/ColorsCommand.java
View File

@ -12,7 +12,6 @@ public class ColorsCommand implements CommandExecutor {
public ColorsCommand(QoL plugin) {
this.plugin = plugin;
plugin.getCommand("colors").setExecutor(this);
}
@Override
@ -30,7 +29,7 @@ public class ColorsCommand implements CommandExecutor {
ChatColor.DARK_GRAY + "\n&8 - Dark Gray" +
ChatColor.BLUE + "\n&9 - Blue" +
ChatColor.GREEN + "\n&a - Green" +
ChatColor.AQUA + "\n&b - Aqua" +
ChatColor.AQUA + "\n&b - Aqu" +
ChatColor.RED + "\n&c - Red" +
ChatColor.LIGHT_PURPLE + "\n&d - Light Purple" +
ChatColor.YELLOW + "\n&e - Yellow" +

4
src/main/java/xyz/etztech/qol/commands/DeathMuteCommand.java
View File

@ -14,9 +14,9 @@ public class DeathMuteCommand implements CommandExecutor {
QoL plugin;
public DeathMuteCommand(QoL paramQoL) {
public DeathMuteCommand(QoL paramQoL)
{
this.plugin = paramQoL;
plugin.getCommand("deathmute").setExecutor(this);
}
@Override

55
src/main/java/xyz/etztech/qol/commands/DiscordIgnoreCommand.java
View File

@ -1,55 +0,0 @@
package xyz.etztech.qol.commands;
import github.scarsz.discordsrv.DiscordSRV;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.metadata.FixedMetadataValue;
import xyz.etztech.qol.EtzTechUtil;
import xyz.etztech.qol.Lang;
import xyz.etztech.qol.QoL;
public class DiscordIgnoreCommand implements CommandExecutor {
public static final String DISCORD_IGNORE_METADATA = "qol.discord_ignore";
QoL plugin;
public DiscordIgnoreCommand(QoL plugin) {
this.plugin = plugin;
plugin.getCommand("discordignore").setExecutor(this);
}
@Override
public boolean onCommand(CommandSender commandSender, Command command, String s, String[] args) {
if (!( commandSender instanceof Player)) {
EtzTechUtil.sms(commandSender, Lang.NO_CONSOLE.getDef());
return true;
}
if (!commandSender.hasPermission("qol.discordignore")) {
EtzTechUtil.sms(commandSender, Lang.NO_PERMISSION.getDef());
return true;
}
if (!DiscordSRV.api.isAnyHooked()) {
EtzTechUtil.sms(commandSender, "Command not enabled!");
return true;
}
Player player = (Player) commandSender;
boolean ignoreState = player.hasMetadata(DISCORD_IGNORE_METADATA);
String msg;
if (ignoreState) {
player.removeMetadata(DISCORD_IGNORE_METADATA, plugin);
msg = "Discord messages will now appear.";
}
else {
player.setMetadata(DISCORD_IGNORE_METADATA, new FixedMetadataValue(plugin, DISCORD_IGNORE_METADATA));
msg = "Ignoring Discord messages.";
}
EtzTechUtil.sms(commandSender, org.bukkit.ChatColor.GREEN + msg);
return true;
}
}

59
src/main/java/xyz/etztech/qol/commands/DynmapLinkCommand.java
View File

@ -1,59 +0,0 @@
package xyz.etztech.qol.commands;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.Location;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import xyz.etztech.qol.EtzTechUtil;
import xyz.etztech.qol.Lang;
import xyz.etztech.qol.QoL;
public class DynmapLinkCommand implements CommandExecutor {
QoL plugin;
public DynmapLinkCommand(QoL plugin) {
this.plugin = plugin;
plugin.getCommand("dynmaplink").setExecutor(this);
}
@Override
public boolean onCommand(CommandSender commandSender, Command command, String s, String[] args) {
if (!( commandSender instanceof Player)) {
EtzTechUtil.sms(commandSender, Lang.NO_CONSOLE.getDef());
return true;
}
Player player = (Player) commandSender;
String base = plugin.getConfig().getString("dynmap.url", "");
String defaultMap = plugin.getConfig().getString("dynmap.defaults.map", "surface");
String defaultZoom = String.valueOf(plugin.getConfig().getInt("dynmap.defaults.zoom", 5));
TextComponent message;
if (base.trim().length() > 0) {
String world = player.getWorld().getName();
Location location = player.getLocation();
String x = String.valueOf(location.getX());
String y = String.valueOf(location.getY());
String z = String.valueOf(location.getZ());
String map = args.length > 0 ? args[0] : defaultMap;
String zoom = args.length > 1 ? args[1] : defaultZoom;
String url = String.format("%s?worldname=%s&mapname=%s&zoom=%s&x=%s&y=%s&z=%s", base, world, map, zoom, x, y, z);
message = new TextComponent("Click here to see your location on Dynmap.");
message.setColor(ChatColor.YELLOW);
message.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, url));
} else {
message = new TextComponent("This command is currently disabled or the server has no Dynmap!");
message.setColor(ChatColor.RED);
}
player.spigot().sendMessage(message);
return true;
}
}

50
src/main/java/xyz/etztech/qol/commands/KaratTrophyCommand.java 100644
View File

@ -0,0 +1,50 @@
package xyz.etztech.qol.commands;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.advancement.Advancement;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.NamespacedKey;
import xyz.etztech.qol.EtzTechUtil;
import xyz.etztech.qol.Lang;
import xyz.etztech.qol.QoL;
public class KaratTrophyCommand implements CommandExecutor {
QoL plugin;
public KaratTrophyCommand(QoL plugin) {
this.plugin = plugin;
}
@Override
public boolean onCommand(CommandSender commandSender, Command command, String s, String args[]) {
if (!commandSender.hasPermission("qol.karattrophy")) {
EtzTechUtil.sms(commandSender, Lang.NO_PERMISSION.getDef());
return true;
}
Player argPlayer = Bukkit.getPlayer(args[0]);
if (argPlayer == null) {
EtzTechUtil.sms(commandSender, ChatColor.RED + "No player found.");
return true;
}
final Player player = argPlayer;
Advancement adv = Bukkit.getAdvancement(new NamespacedKey("carrotcraft", "24_karat_trophy"));
if (!player.getAdvancementProgress(adv).isDone()) {
EtzTechUtil.sms(commandSender, ChatColor.GREEN + "Awarding 24 Karat Trophy to " + player.getName());
player.getAdvancementProgress(adv).awardCriteria("win");
} else {
EtzTechUtil.sms(commandSender, ChatColor.RED + player.getName() + " already has the 24 Karat Trophy");
}
return true;
}
}

1
src/main/java/xyz/etztech/qol/commands/ListCommand.java
View File

@ -17,7 +17,6 @@ public class ListCommand implements CommandExecutor {
public ListCommand(QoL plugin) {
this.plugin = plugin;
plugin.getCommand("list").setExecutor(this);
}
@Override

4
src/main/java/xyz/etztech/qol/commands/MainCommand.java
View File

@ -15,9 +15,9 @@ public class MainCommand implements CommandExecutor {
QoL plugin;
public MainCommand(QoL paramQoL) {
public MainCommand(QoL paramQoL)
{
this.plugin = paramQoL;
plugin.getCommand("qol").setExecutor(this);
}
@Override

4
src/main/java/xyz/etztech/qol/commands/MakeMeCommand.java
View File

@ -15,9 +15,9 @@ public class MakeMeCommand implements CommandExecutor {
QoL plugin;
public MakeMeCommand(QoL paramQoL) {
public MakeMeCommand(QoL paramQoL)
{
this.plugin = paramQoL;
plugin.getCommand("makeme").setExecutor(this);
}
@Override

127
src/main/java/xyz/etztech/qol/commands/MarkerCommand.java
View File

@ -1,127 +0,0 @@
package xyz.etztech.qol.commands;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.TabExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.dynmap.markers.Marker;
import org.dynmap.markers.MarkerSet;
import xyz.etztech.qol.EtzTechUtil;
import xyz.etztech.qol.Lang;
import xyz.etztech.qol.QoL;
import static org.apache.commons.lang.StringEscapeUtils.escapeHtml;
import java.util.Arrays;
import java.util.List;
public class MarkerCommand implements CommandExecutor, TabExecutor{
QoL plugin;
List<String> subCommandList = Arrays.asList("set", "remove", "list");
public MarkerCommand(QoL paramQoL) {
this.plugin = paramQoL;
plugin.getCommand("marker").setExecutor(this);
plugin.getCommand("marker").setTabCompleter(this);
}
@Override
public boolean onCommand(CommandSender commandSender, Command command, String s, String[] args) {
if (!( commandSender instanceof Player)) {
EtzTechUtil.sms(commandSender, Lang.NO_CONSOLE.getDef());
return true;
}
Player player = (Player) commandSender;
if (!player.hasPermission("qol.marker")) {
EtzTechUtil.sms(player, Lang.NO_PERMISSION.getDef());
return true;
}
if (args.length < 1) {
EtzTechUtil.sms(player, ChatColor.RED + "/marker set");
EtzTechUtil.sms(player, ChatColor.RED + "/marker remove");
return true;
}
else {
String action = args[0].toLowerCase();
String name;
if (args.length > 1) {
String[] arr = Arrays.copyOfRange(args, 1, args.length);
name = String.join(" ", arr);
}
else {
name = (player).getDisplayName();
}
name = escapeHtml(name);
if (name.length() > 50) {
EtzTechUtil.sms(player, ChatColor.RED + "Marker name too long, try a shorter name");
return true;
}
if (action.equals("set")) {
int marker_count = plugin.getPlayerMarkers(player).size();
if (marker_count >= EtzTechUtil.getPermValue("qol.marker.limit", player.getEffectivePermissions())) {
EtzTechUtil.sms(player, ChatColor.RED + "You can't add more markers, delete an old one first.");
return true;
}
plugin.createMarkerAtPlayer(player, name);
EtzTechUtil.sms(player, ChatColor.GREEN + "Marker \"" + name + "\" created");
}
else if (action.equals("remove")) {
Marker marker = plugin.getPlayerMarker(player, name);
if (marker != null) {
marker.deleteMarker();
EtzTechUtil.sms(player, ChatColor.GREEN + "Marker \"" + name +"\" removed.");
}
else {
EtzTechUtil.sms(player, ChatColor.RED + "You don't have a marker by that name");
}
}
else if (action.equals("list")) {
MarkerSet markerSet = plugin.getPlayerMarkerSet();
StringBuilder msg = new StringBuilder();
int marker_count = 0;
msg.append(ChatColor.GREEN);
msg.append("You have the following markers:\n");
msg.append(ChatColor.YELLOW);
for (Marker marker: plugin.getPlayerMarkers(player)) {
msg.append(marker.getLabel());
msg.append('\n');
marker_count++;
}
if (marker_count == 0) {
EtzTechUtil.sms(player, ChatColor.RED + "You don't have any markers");
}
else {
EtzTechUtil.sms(player, msg.toString());
}
}
}
return true;
}
@Override
public List<String> onTabComplete(CommandSender commandSender, Command command, String s, String[] strings) {
for (String arg: strings) {
if (subCommandList.contains(arg)) {
return null;
}
}
return subCommandList;
}
}

51
src/main/java/xyz/etztech/qol/commands/MoonCommand.java
View File

@ -1,51 +0,0 @@
package xyz.etztech.qol.commands;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import xyz.etztech.qol.QoL;
import xyz.etztech.qol.EtzTechUtil;
import xyz.etztech.qol.Lang;
import java.util.Map;
import java.lang.*;
public class MoonCommand implements CommandExecutor {
QoL plugin;
private final Map<Integer, String> moonPhases = Map.of(
0, "Full moon",
1, "Waning gibbous",
2, "Third quarter",
3, "Waning crescent",
4, "New moon",
5, "Waxing crescent",
6, "First quarter",
7, "Waxing gibbous"
);
public MoonCommand(QoL paramQoL) {
this.plugin = paramQoL;
plugin.getCommand("moon").setExecutor(this);
}
@Override
public boolean onCommand(CommandSender commandSender, Command command, String s, String[] args) {
if (!commandSender.hasPermission("qol.moon")) {
EtzTechUtil.sms(commandSender, Lang.NO_PERMISSION.getDef());
return true;
}
String playername = commandSender.getName();
long time = commandSender.getServer().getPlayer(playername).getWorld().getFullTime();
double day = Math.floor(time / 24000);
int moonPhase = (int)(day % 8);
StringBuilder message = new StringBuilder(ChatColor.GOLD + "===== Moon Phase Utility =====");
message.append("\n" + ChatColor.GREEN + "Current moon phase: " + moonPhases.get(moonPhase) + ".");
message.append("\n" + ChatColor.GREEN + "Full moon is " + (moonPhase == 0 ? "tonight." : "in " + (8 - moonPhase) + ((moonPhase == 7) ? " day." : " days.")));
EtzTechUtil.sms(commandSender, message.toString());
return true;
}
}

4
src/main/java/xyz/etztech/qol/commands/NameHistoryCommand.java
View File

@ -24,9 +24,9 @@ public class NameHistoryCommand implements CommandExecutor {
QoL plugin;
public NameHistoryCommand(QoL paramQoL) {
public NameHistoryCommand(QoL paramQoL)
{
this.plugin = paramQoL;
plugin.getCommand("history").setExecutor(this);
}
@Override

27
src/main/java/xyz/etztech/qol/commands/PluginsCommand.java 100644
View File

@ -0,0 +1,27 @@
package xyz.etztech.qol.commands;
import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import xyz.etztech.qol.QoL;
public class PluginsCommand implements CommandExecutor {
QoL plugin;
public PluginsCommand(QoL plugin) {
this.plugin = plugin;
}
@Override
public boolean onCommand(CommandSender commandSender, Command command, String s, String[] strings) {
commandSender.sendMessage(ChatColor.GOLD + "Plugins: " + ChatColor.YELLOW +
StringUtils.join(plugin.getConfig().getStringList("plugins"), ", "));
return true;
}
}

8
src/main/java/xyz/etztech/qol/commands/PortalCommand.java
View File

@ -18,9 +18,9 @@ public class PortalCommand implements CommandExecutor {
QoL plugin;
public PortalCommand(QoL paramQoL) {
public PortalCommand(QoL paramQoL)
{
this.plugin = paramQoL;
plugin.getCommand("portal").setExecutor(this);
}
@Override
@ -60,9 +60,9 @@ public class PortalCommand implements CommandExecutor {
message.append("\n" + ChatColor.GREEN + "Location in the " + worldStr + ": " + newX + ", " + y + ", " + newZ);
EtzTechUtil.sms(commandSender, message.toString());
// Send link to instructions for setting up nether portal
// Send link to image for setting up nether portal
TextComponent link = new TextComponent(ChatColor.GREEN + "Click here for directions on how to set up a nether portal.");
link.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, plugin.getConfig().getString("portal-link", "https://i.imgur.com/tQCbI0C.png")));
link.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://i.imgur.com/tQCbI0C.png"));
commandSender.spigot().sendMessage(link);
return true;

18
src/main/java/xyz/etztech/qol/commands/ShadowMuteCommand.java
View File

@ -9,18 +9,16 @@ import org.bukkit.entity.Player;
import xyz.etztech.qol.EtzTechUtil;
import xyz.etztech.qol.Lang;
import xyz.etztech.qol.QoL;
import xyz.etztech.core.command.TickDuration;
import java.time.Duration;
import xyz.etztech.qol.other.ShadowMuteTime;
public class ShadowMuteCommand implements CommandExecutor {
QoL plugin;
public ShadowMuteCommand(QoL paramQoL) {
public ShadowMuteCommand(QoL paramQoL)
{
this.plugin = paramQoL;
plugin.getCommand("shadowmute").setExecutor(this);
}
@Override
@ -45,16 +43,16 @@ public class ShadowMuteCommand implements CommandExecutor {
final Player player = argPlayer;
TickDuration duration;
ShadowMuteTime smt;
try {
duration = TickDuration.parse(args[1]);
smt = ShadowMuteTime.parse(args[1]);
} catch (Exception ex) {
duration = new TickDuration(Duration.ofMinutes(5));
smt = new ShadowMuteTime();
commandSender.sendMessage(ChatColor.RED + ex.getMessage());
}
EtzTechUtil.sms(commandSender, ChatColor.GREEN + "Shadow Muting " + ChatColor.YELLOW +
player.getName() + ChatColor.GREEN + " for " + ChatColor.YELLOW + duration.getDuration().toMinutes() + "minutes.");
player.getName() + ChatColor.GREEN + " for " + ChatColor.YELLOW + smt.toString());
QoL.addSM(player);
Bukkit.getScheduler().runTaskLater(plugin, new Runnable() {
@ -63,7 +61,7 @@ public class ShadowMuteCommand implements CommandExecutor {
Bukkit.getConsoleSender().sendMessage(ChatColor.GREEN + "Removing Shadow Mute for " + ChatColor.YELLOW + player.getName());
QoL.removeSM(player);
}
}, duration.toTicks());
}, smt.toTicks());
return true;

4
src/main/java/xyz/etztech/qol/commands/SudoCommand.java
View File

@ -16,9 +16,9 @@ public class SudoCommand implements CommandExecutor {
QoL plugin;
public SudoCommand(QoL paramQoL) {
public SudoCommand(QoL paramQoL)
{
this.plugin = paramQoL;
plugin.getCommand("sudo").setExecutor(this);
}
@Override

4
src/main/java/xyz/etztech/qol/commands/TimeoutCommand.java
View File

@ -20,9 +20,9 @@ public class TimeoutCommand implements CommandExecutor {
QoL plugin;
public TimeoutCommand(QoL paramQoL) {
public TimeoutCommand(QoL paramQoL)
{
this.plugin = paramQoL;
plugin.getCommand("timeout").setExecutor(this);
}
@Override

4
src/main/java/xyz/etztech/qol/commands/UUIDCommand.java
View File

@ -23,9 +23,9 @@ public class UUIDCommand implements CommandExecutor {
QoL plugin;
public UUIDCommand(QoL paramQoL) {
public UUIDCommand(QoL paramQoL)
{
this.plugin = paramQoL;
plugin.getCommand("uuid").setExecutor(this);
}
@Override

4
src/main/java/xyz/etztech/qol/commands/WhitelistCommand.java
View File

@ -20,9 +20,9 @@ public class WhitelistCommand implements CommandExecutor {
QoL plugin;
public WhitelistCommand(QoL paramQoL) {
public WhitelistCommand(QoL paramQoL)
{
this.plugin = paramQoL;
plugin.getCommand("whitelist").setExecutor(this);
}
@Override

60
src/main/java/xyz/etztech/qol/commands/WikiCommand.java
View File

@ -1,60 +0,0 @@
package xyz.etztech.qol.commands;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import xyz.etztech.qol.QoL;
import xyz.etztech.qol.EtzTechUtil;
import xyz.etztech.qol.Lang;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
import java.util.Date;
public class WikiCommand implements CommandExecutor {
QoL plugin;
public WikiCommand(QoL paramQoL) {
this.plugin = paramQoL;
plugin.getCommand("wiki").setExecutor(this);
}
@Override
public boolean onCommand(CommandSender commandSender, Command command, String s, String[] args) {
if (!commandSender.hasPermission("qol.wiki")) {
EtzTechUtil.sms(commandSender, Lang.NO_PERMISSION.getDef());
return true;
}
if (args.length < 1) {
EtzTechUtil.sms(commandSender, ChatColor.RED + "Please give a search argument.");
return true;
}
try {
Date changedToAt;
JsonObject obj;
InputStream response = new URL(String.format("https://minecraft.gamepedia.com/api.php?action=opensearch&format=json&formatversion=2&search=%s&namespace=0&limit=1", args[0])).openStream();
BufferedReader reader = new BufferedReader(new InputStreamReader(response));
JsonArray jsonArray = new JsonParser().parse(reader.readLine()).getAsJsonArray();
StringBuilder message = new StringBuilder(ChatColor.GREEN + jsonArray.get(1).getAsJsonArray().get(0).getAsString());
message.append(": ");
message.append(ChatColor.WHITE + jsonArray.get(3).getAsJsonArray().get(0).getAsString());
EtzTechUtil.sms(commandSender, message.toString());
} catch (IOException e) {
EtzTechUtil.sms(commandSender, ChatColor.RED + "Minecraft wiki API returned nothing.");
} catch (IndexOutOfBoundsException e) {
EtzTechUtil.sms(commandSender, ChatColor.RED + String.format("Nothing was found on the wiki using: %s", args[0]));
}
return true;
}
}

1
src/main/java/xyz/etztech/qol/commands/WorldInfoCommand.java
View File

@ -20,7 +20,6 @@ public class WorldInfoCommand implements CommandExecutor {
public WorldInfoCommand(QoL plugin) {
this.plugin = plugin;
plugin.getCommand("worldinfo").setExecutor(this);
}
@Override

66
src/main/java/xyz/etztech/qol/listeners/AsyncPlayerChatListener.java
View File

@ -1,33 +1,27 @@
package xyz.etztech.qol.listeners;
import org.bukkit.ChatColor;
import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.event.server.ServerListPingEvent;
import org.bukkit.util.CachedServerIcon;
import xyz.etztech.qol.QoL;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.File;
public class AsyncPlayerChatListener implements Listener {
private final List<Pattern> discordSyntax = Arrays.asList(
Pattern.compile("__([^_]+)__"), // 0: __underline__
Pattern.compile("_([^_]+)_"), // 1: _italic_
Pattern.compile("\\*\\*([^*]+)\\*\\*"), // 2: **bold**
Pattern.compile("\\*([^*]+)\\*"), // 3: *italic*
Pattern.compile("~~([^~]+)~~") // 4: ~~strikethrough~~
);
private QoL plugin;
public AsyncPlayerChatListener(QoL plugin) {
this.plugin = plugin;
plugin.getServer().getPluginManager().registerEvents(this, plugin);
}
@EventHandler(priority=EventPriority.HIGH, ignoreCancelled=true)
@ -42,50 +36,6 @@ public class AsyncPlayerChatListener implements Listener {
if (QoL.getTimeout() && !player.hasPermission("qol.timeout.bypass")) {
event.getRecipients().clear();
}
// Discord syntax for font emphasis
if (player.hasPermission("qol.discord")) {
String chat = event.getMessage();
boolean escape = false;
// Escape
if (chat.startsWith("\\")) {
escape = true;
event.setMessage(chat.substring(1));
// Escape the escape, this monster wants to start their message with a backslash
if (chat.startsWith("\\\\")) {
escape = false;
}
}
if (!escape) {
Pattern syntax;
Matcher matcher;
for (int i = 0; i < discordSyntax.size(); i++) {
syntax = discordSyntax.get(i);
matcher = syntax.matcher(chat);
switch (i) {
case 0:
chat = matcher.replaceAll("&n$1&r");
break;
case 1:
case 3:
chat = matcher.replaceAll("&o$1&r");
break;
case 2:
chat = matcher.replaceAll("&l$1&r");
break;
case 4:
chat = matcher.replaceAll("&m$1&r");
break;
default:
break;
}
}
event.setMessage(ChatColor.translateAlternateColorCodes('&', chat));
}
}
}

5
src/main/java/xyz/etztech/qol/listeners/BlockIgniteListener.java
View File

@ -11,7 +11,6 @@ public class BlockIgniteListener implements Listener {
public BlockIgniteListener(QoL plugin) {
this.plugin = plugin;
plugin.getServer().getPluginManager().registerEvents(this, plugin);
}
@EventHandler
@ -20,5 +19,9 @@ public class BlockIgniteListener implements Listener {
if (plugin.getConfig().getBoolean("disable-fire." + cause.name().toLowerCase())) {
event.setCancelled(true);
}
if (event.getPlayer() != null && (cause == BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL || cause == BlockIgniteEvent.IgniteCause.FIREBALL)) {
plugin.getGriefAlert().addAlert(event.getPlayer().getName() + " started a fire.");
}
}
}

26
src/main/java/xyz/etztech/qol/listeners/BlockPlaceListener.java 100644
View File

@ -0,0 +1,26 @@
package xyz.etztech.qol.listeners;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.player.PlayerBucketEmptyEvent;
import xyz.etztech.qol.QoL;
public class BlockPlaceListener implements Listener {
QoL plugin;
public BlockPlaceListener(QoL plugin) {
this.plugin = plugin;
}
@EventHandler
public void onBlockPlace(BlockPlaceEvent event) {
Player player = event.getPlayer();
if( event.getBlockPlaced().getType() == Material.TNT) {
plugin.getGriefAlert().addAlert(player.getName() + " placed TnT.");
}
}
}

56
src/main/java/xyz/etztech/qol/listeners/CommandPreprocessListener.java
View File

@ -1,31 +1,34 @@
package xyz.etztech.qol.listeners;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.TextComponent;
import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor;
import org.bukkit.GameMode;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import org.bukkit.event.server.ServerCommandEvent;
import org.dynmap.DynmapAPI;
import xyz.etztech.core.web.Http;
import xyz.etztech.core.CoreUtils;
import xyz.etztech.core.web.CoreWeb;
import xyz.etztech.qol.QoL;
import xyz.etztech.qol.other.LinkCommand;
import org.dynmap.DynmapAPI;
import java.util.*;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import java.util.Collection;
public class CommandPreprocessListener implements Listener {
QoL plugin;
private Map<UUID, String> confirmMap = new HashMap<>();
private Map<UUID, String> confirmTpMap = new HashMap<>();
private Map<UUID, Boolean> dynmapVisibleStatusMap = new HashMap<>();
public CommandPreprocessListener(QoL plugin) {
this.plugin = plugin;
plugin.getServer().getPluginManager().registerEvents(this, plugin);
}
@EventHandler
@ -70,39 +73,27 @@ public class CommandPreprocessListener implements Listener {
visibleStatus = true;
}
TextComponent textComponent = new TextComponent(message);
textComponent.setColor(ChatColor.GREEN);
sender.spigot().sendMessage(textComponent);
sender.spigot().sendMessage(new TextComponent(ChatColor.GREEN + message));
dynmap.setPlayerVisiblity(sender.getName(), visibleStatus);
}
// Spec confirmation
List<String> specConfirm = plugin.getConfig().getStringList("spec-confirm");
if (sender.hasPermission("qol.specconfirm")) {
boolean confirm = false;
for (String confirmable : specConfirm) {
// If the player command either starts with a confirmable command and space (meaning confirmation is needed regardless of arguments)
// Or the player command is a full match to the confirmable command
if (noSlash(command).toLowerCase().startsWith(confirmable.toLowerCase() + " ") || noSlash(command).toLowerCase().equals(confirmable.toLowerCase())) {
confirm = true;
// Spec TP confirmation
if (sender.hasPermission("qol.tpconfirm")) {
//check if the command is a tp command
if (noSlash(base).equals("tp") || noSlash(base).toLowerCase().startsWith("tele") || noSlash(command).toLowerCase().startsWith("lagg tpchunk")) {
//If the user is in the confirm tp map, remove them and let the command run
if (command.equals(confirmTpMap.get(sender.getUniqueId()))) {
confirmTpMap.remove(sender.getUniqueId());
}
}
//check if the command is a spec confirm command
if (confirm) {
//If the user is in the confirm map, remove them and let the command run
if (command.equals(confirmMap.get(sender.getUniqueId()))) {
confirmMap.remove(sender.getUniqueId());
}
//If the user is running the command for the first time outside of spec
//If the user is running the tp command for the first time outside of spec
else if (sender.getGameMode() != GameMode.SPECTATOR) {
//Cancel the command
event.setCancelled(true);
//Add the user to the spec confirm map
confirmMap.put(sender.getUniqueId(), command);
//Add the user to the tp confirm map
confirmTpMap.put(sender.getUniqueId(), command);
TextComponent message = new TextComponent("You are running this command out of spec, run again to confirm.");
message.setColor(ChatColor.GREEN);
TextComponent message = new TextComponent(ChatColor.GREEN + "You are TPing out of spec, run command again to confirm.");
sender.spigot().sendMessage(message);
}
}
@ -123,8 +114,7 @@ public class CommandPreprocessListener implements Listener {
for (LinkCommand linkCommand : QoL.getLinks()) {
if (base.equalsIgnoreCase(linkCommand.getCommand())) {
event.setCancelled(true);
TextComponent link = new TextComponent(linkCommand.getMessage());
link.setColor(ChatColor.GREEN);
TextComponent link = new TextComponent(ChatColor.GREEN + linkCommand.getMessage());
link.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, linkCommand.getUrl()));
sender.spigot().sendMessage(link);
return;
@ -163,7 +153,7 @@ public class CommandPreprocessListener implements Listener {
Map<String, String> post = new HashMap<>();
post.put("username", username);
post.put("content", content);
Http.asyncPost(plugin, webhook, post);
CoreWeb.asyncPost(plugin, webhook, post);
}
}

1
src/main/java/xyz/etztech/qol/listeners/DeathListener.java
View File

@ -21,7 +21,6 @@ public class DeathListener implements Listener {
public DeathListener(QoL plugin) {
this.plugin = plugin;
plugin.getServer().getPluginManager().registerEvents(this, plugin);
}
@EventHandler

43
src/main/java/xyz/etztech/qol/listeners/DiscordSRVListener.java
View File

@ -1,43 +0,0 @@
package xyz.etztech.qol.listeners;
import github.scarsz.discordsrv.DiscordSRV;
import github.scarsz.discordsrv.api.events.DiscordGuildMessagePreBroadcastEvent;
import github.scarsz.discordsrv.api.events.GameChatMessagePreProcessEvent;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import xyz.etztech.qol.EtzTechUtil;
import xyz.etztech.qol.Lang;
import xyz.etztech.qol.QoL;
import github.scarsz.discordsrv.api.Subscribe;
import xyz.etztech.qol.commands.DiscordIgnoreCommand;
public class DiscordSRVListener {
private final QoL plugin;
public DiscordSRVListener(QoL plugin) {
this.plugin = plugin;
DiscordSRV.api.subscribe(this);
}
@Subscribe
public void gameChatMessagePreProcess(GameChatMessagePreProcessEvent event) {
if (QoL.hasSM(event.getPlayer())) {
event.setCancelled(true);
}
}
@Subscribe
public void discordGuildMessagePreBroadcastEvent(DiscordGuildMessagePreBroadcastEvent event) {
event.getRecipients().removeIf(recipient -> {
if (recipient instanceof Player) {
Player player = (Player) recipient;
return player.hasMetadata(DiscordIgnoreCommand.DISCORD_IGNORE_METADATA);
}
else {
return false;
}
});
}
}

26
src/main/java/xyz/etztech/qol/listeners/EntityChangeBlockListener.java
View File

@ -1,26 +0,0 @@
package xyz.etztech.qol.listeners;
import org.bukkit.entity.EntityType;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityChangeBlockEvent;
import xyz.etztech.qol.QoL;
public class EntityChangeBlockListener implements Listener {
QoL plugin;
public EntityChangeBlockListener(QoL plugin) {
this.plugin = plugin;
plugin.getServer().getPluginManager().registerEvents(this, plugin);
}
@EventHandler
public void onEntityChangeBlock(EntityChangeBlockEvent e) {
if (e.getEntity().getType() == EntityType.ENDERMAN) {
if(plugin.getConfig().getBoolean("disable-mob-grief.enderman", false)){
e.setCancelled(true);
}
}
}
}

68
src/main/java/xyz/etztech/qol/listeners/HeadShopListener.java
View File

@ -1,68 +0,0 @@
package xyz.etztech.qol.listeners;
import com.nisovin.shopkeepers.api.ShopkeepersPlugin;
import com.nisovin.shopkeepers.api.shopkeeper.ShopkeeperRegistry;
import com.nisovin.shopkeepers.api.shopkeeper.admin.regular.RegularAdminShopkeeper;
import com.nisovin.shopkeepers.api.shopkeeper.offers.TradeOffer;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.SkullMeta;
import xyz.etztech.qol.QoL;
import java.util.ArrayList;
import java.util.List;
public class HeadShopListener implements Listener{
private final QoL plugin;
private final ShopkeepersPlugin shopkeepersAPI;
public HeadShopListener(QoL plugin) {
this.plugin = plugin;
plugin.getServer().getPluginManager().registerEvents(this, plugin);
this.shopkeepersAPI = ShopkeepersPlugin.getInstance();
}
@EventHandler
public void onJoin(PlayerJoinEvent event) {
final Player player = event.getPlayer();
if (shopkeepersAPI != null && player.hasPermission("qol.head_shop")) {
int shopKeeperID = plugin.getConfig().getInt("head_shop.id", -1);
if (shopKeeperID != -1) {
ShopkeeperRegistry shopkeeperRegistry = shopkeepersAPI.getShopkeeperRegistry();
RegularAdminShopkeeper donorHeadShop = (RegularAdminShopkeeper) shopkeeperRegistry.getShopkeeperById(shopKeeperID);
if (donorHeadShop != null) {
// Remove the head if it already exists. This is done to refresh the skin of the head.
List<? extends TradeOffer> tradeOffers = new ArrayList<>(donorHeadShop.getOffers());
tradeOffers.removeIf(tradeOffer -> {
SkullMeta itemOfferMeta = (SkullMeta)tradeOffer.getResultItem().getItemMeta();
return itemOfferMeta.getOwningPlayer().getUniqueId() == player.getUniqueId();
});
donorHeadShop.setOffers(tradeOffers);
// Add the head to the shop
int diamondPrice = plugin.getConfig().getInt("head_shop.price", 2);
ItemStack playerHead = new ItemStack(Material.PLAYER_HEAD);
SkullMeta skullMeta = (SkullMeta) playerHead.getItemMeta();
skullMeta.setOwningPlayer(player);
skullMeta.setDisplayName(player.getDisplayName());
playerHead.setItemMeta(skullMeta);
TradeOffer donorHeadTrade = TradeOffer.create(playerHead, new ItemStack(Material.DIAMOND, diamondPrice), null);
donorHeadShop.addOffer(donorHeadTrade);
}
}
}
}
}

12
src/main/java/xyz/etztech/qol/listeners/JoinListener.java
View File

@ -2,14 +2,18 @@ package xyz.etztech.qol.listeners;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerLoginEvent;
import xyz.etztech.qol.QoL;
import xyz.etztech.qol.commands.CheckupCommand;
import java.util.*;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
public class JoinListener implements Listener {
@ -17,7 +21,6 @@ public class JoinListener implements Listener {
public JoinListener(QoL plugin) {
this.plugin = plugin;
plugin.getServer().getPluginManager().registerEvents(this, plugin);
}
@EventHandler
@ -55,7 +58,8 @@ public class JoinListener implements Listener {
}
}
CheckupCommand.join(player);
plugin.updatePlayerViewDistance(player);
}
}

1
src/main/java/xyz/etztech/qol/listeners/LoginListener.java
View File

@ -14,7 +14,6 @@ public class LoginListener implements Listener {
public LoginListener(QoL plugin) {
this.plugin = plugin;
plugin.getServer().getPluginManager().registerEvents(this, plugin);
}
@EventHandler

26
src/main/java/xyz/etztech/qol/listeners/PlayerBucketEmptyListener.java 100644
View File

@ -0,0 +1,26 @@
package xyz.etztech.qol.listeners;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockIgniteEvent;
import org.bukkit.event.player.PlayerBucketEmptyEvent;
import xyz.etztech.qol.QoL;
public class PlayerBucketEmptyListener implements Listener {
QoL plugin;
public PlayerBucketEmptyListener(QoL plugin) {
this.plugin = plugin;
}
@EventHandler
public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) {
Player player = event.getPlayer();
if( event.getBucket() == Material.LAVA_BUCKET) {
plugin.getGriefAlert().addAlert(player.getName() + " poured lava.");
}
}
}

24
src/main/java/xyz/etztech/qol/listeners/PlayerChangedWorldListener.java 100644
View File

@ -0,0 +1,24 @@
package xyz.etztech.qol.listeners;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerChangedWorldEvent;
import xyz.etztech.qol.QoL;
import java.util.Map;
public class PlayerChangedWorldListener implements Listener {
QoL plugin;
public PlayerChangedWorldListener(QoL plugin) {
this.plugin = plugin;
}
@EventHandler
public void onPlayerChangedWorld(PlayerChangedWorldEvent event) {
Player player = event.getPlayer();
plugin.updatePlayerViewDistance(player);
}
}

1
src/main/java/xyz/etztech/qol/listeners/ServerListPingListener.java
View File

@ -21,7 +21,6 @@ public class ServerListPingListener implements Listener {
public ServerListPingListener(QoL plugin) {
this.plugin = plugin;
plugin.getServer().getPluginManager().registerEvents(this, plugin);
}
@EventHandler

58
src/main/java/xyz/etztech/qol/other/GriefAlert.java 100644
View File

@ -0,0 +1,58 @@
package xyz.etztech.qol.other;
import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import xyz.etztech.core.web.CoreWeb;
import xyz.etztech.qol.EtzTechUtil;
import xyz.etztech.qol.QoL;
import java.util.HashMap;
import java.util.Map;
public class GriefAlert implements Runnable {
private Map<String, Integer> alerts;
private QoL plugin;
public GriefAlert(QoL plugin) {
this.plugin = plugin;
}
@Override
public void run() {
alerts = new HashMap<>();
}
public void addAlert(String alert) {
int num = alerts.getOrDefault(alert, 0);
alerts.put(alert, ++num);
int lines = plugin.getConfig().getInt("grief-alert.lines", 5);
if (num < lines) {
alert(alert);
} else if (num == lines) {
String extra = " Suppressing more alerts for a while";
String webhook = plugin.getConfig().getString("grief-alert.webhook", "");
String message = "@here " + alert;
if (StringUtils.isNotEmpty(webhook)) {
extra += " and pinging Discord";
Map<String, String> data = new HashMap<>();
data.put("username", "Grief Alert");
data.put("content", message);
CoreWeb.asyncPost(plugin, webhook, data);
}
extra += "...";
alert(alert + extra);
}
}
private void alert(String alert) {
for (Player player : Bukkit.getOnlinePlayers()) {
if (player.hasPermission("qol.griefalert")) {
EtzTechUtil.sms(player, ChatColor.RED + alert);
}
}
}
}

63
src/main/java/xyz/etztech/qol/other/Reminder.java
View File

@ -1,63 +0,0 @@
package xyz.etztech.qol.other;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.ComponentBuilder;
import org.bukkit.configuration.ConfigurationSection;
import net.md_5.bungee.api.ChatColor;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
public class Reminder {
private final int frequency;
private final List<ReminderList> reminderLists;
public Reminder(int frequency, List<ReminderList> reminderLists) {
this.frequency = frequency;
this.reminderLists = reminderLists;
Collections.sort(reminderLists);
}
public static Reminder fromConfig(ConfigurationSection config) {
int frequency = config.getInt("frequency");
List<ReminderList> reminderLists = new ArrayList();
ConfigurationSection reminderGroups = config.getConfigurationSection("reminder_groups");
for (String groupName: reminderGroups.getKeys(false)) {
ConfigurationSection group = reminderGroups.getConfigurationSection(groupName);
int period = group.getInt("period", 0);
ChatColor color = ChatColor.of(group.getString("color", "#3273DC"));
List<String> reminders = group.getStringList("reminders");
reminderLists.add(new ReminderList(reminders, period, color));
}
return new Reminder(frequency, reminderLists);
}
public BaseComponent[] nextReminder() {
BaseComponent[] msg = null;
boolean reminderFound = false;
for (ReminderList reminderList: reminderLists) {
if (!reminderFound && reminderList.isReady()) {
msg = new ComponentBuilder().
color(reminderList.getColor())
.append(reminderList.nextReminder())
.create();
reminderFound = true;
}
reminderList.incCount();
}
return msg;
}
public int getFrequency() {
return frequency;
}
}

46
src/main/java/xyz/etztech/qol/other/ReminderList.java
View File

@ -1,46 +0,0 @@
package xyz.etztech.qol.other;
import net.md_5.bungee.api.ChatColor;
import org.jetbrains.annotations.NotNull;
import java.util.List;
public class ReminderList implements Comparable<ReminderList>{
private final List<String> reminders;
private final int period;
private final ChatColor color;
private int ndx;
private int count;
public ReminderList(List<String> reminders, int period, ChatColor color) {
this.reminders = reminders;
this.period = period;
this.color = color;
this.ndx = 0;
this.count = 0;
}
public void incCount() {
count = (count + 1) % (period + 1);
}
public boolean isReady() {
return count == period;
}
public String nextReminder() {
String nextReminder = reminders.get(ndx);
ndx = (ndx + 1) % reminders.size();
return nextReminder;
}
@Override
public int compareTo(@NotNull ReminderList o) {
return Integer.compare(o.period, this.period);
}
public ChatColor getColor() {
return color;
}
}

112
src/main/java/xyz/etztech/qol/other/ShadowMuteTime.java 100644
View File

@ -0,0 +1,112 @@
package xyz.etztech.qol.other;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class ShadowMuteTime {
private int hours;
private int minutes;
private int seconds;
public ShadowMuteTime() {
hours = 1;
minutes = 0;
seconds = 0;
}
public int getHours() {
return hours;
}
public void setHours(int hours) {
this.hours = hours;
}
public void addHours(int hours) {
this.hours += hours;
}
public int getMinutes() {
return minutes;
}
public void setMinutes(int minutes) {
this.minutes = minutes;
}
public void addMinutes(int minutes) {
this.minutes += minutes;
}
public int getSeconds() {
return seconds;
}
public void setSeconds(int seconds) {
this.seconds = seconds;
}
public void addSeconds(int seconds) {
this.seconds += seconds;
}
public String toString() {
return getHours() + " hours, " + getMinutes() + " minutes, and " + getSeconds() + " seconds";
}
public long toTicks() {
int seconds = getSeconds();
seconds += getMinutes()*60;
seconds += getHours()*60*60;
return seconds*20;
}
public static ShadowMuteTime parse(String time) throws Exception {
ShadowMuteTime smt = new ShadowMuteTime();
smt.setHours(0); // Defaults to 1 hour
String timePattern = "(?:(?<hours>\\d+)h)?(?:(?<minutes>\\d+)m)?(?:(?<seconds>\\d+)s)?";
Pattern pattern = Pattern.compile(timePattern);
Matcher match = pattern.matcher(time);
if (!match.matches()) {
throw new Exception("Time format does not match, defaulting to 1 hour.");
}
String hourString = match.group("hours");
if (hourString != null) {
int hours = Integer.parseInt(hourString);
smt.addHours(hours);
}
String minuteString = match.group("minutes");
if (minuteString != null) {
int minutes = Integer.parseInt(minuteString);
if (minutes >= 60) {
int toHours = minutes / 60;
minutes %= 60;
smt.addHours(toHours);
}
smt.addMinutes(minutes);
}
String secondString = match.group("seconds");
if (secondString != null) {
int seconds = Integer.parseInt(secondString);
if (seconds >= 60) {
int toMinutes = seconds / 60;
seconds %= 60;
int minutes = smt.getMinutes() + toMinutes;
if (minutes >= 60) {
int toHours = minutes / 60;
minutes %= 60;
smt.addHours(toHours);
}
smt.addMinutes(minutes);
}
smt.addSeconds(seconds);
}
return smt;
}
}

16
src/main/java/xyz/etztech/qol/other/TPSRunnable.java
View File

@ -1,11 +1,9 @@
package xyz.etztech.qol.other;
import me.lucko.spark.api.statistic.StatisticWindow;
import me.lucko.spark.api.statistic.types.DoubleStatistic;
import net.ess3.api.IEssentials;
import org.apache.commons.lang.StringUtils;
import xyz.etztech.core.web.Http;
import xyz.etztech.core.web.CoreWeb;
import xyz.etztech.qol.QoL;
import me.lucko.spark.api.Spark;
import java.util.HashMap;
import java.util.Map;
@ -20,19 +18,19 @@ public class TPSRunnable implements Runnable {
@Override
public void run() {
Spark spark = plugin.getSpark();
if (spark != null) {
DoubleStatistic<StatisticWindow.TicksPerSecond> tps = spark.tps();
IEssentials essentials = plugin.getEssentials();
if (essentials != null) {
double tps = essentials.getTimer().getAverageTPS();
int threshold = plugin.getConfig().getInt("tps.threshold", 0);
String webhook = plugin.getConfig().getString("tps.webhook", "");
String message = "@here TPS has fallen below " + threshold + "!";
if (tps.poll(StatisticWindow.TicksPerSecond.SECONDS_10) < threshold) {
if (tps < threshold) {
plugin.log(message);
if (StringUtils.isNotEmpty(webhook)) {
Map<String, String> data = new HashMap<>();
data.put("username", "TPS Alert");
data.put("content", message);
Http.asyncPost(plugin, webhook, data);
CoreWeb.asyncPost(plugin, webhook, data);
}
}
}

61
src/main/resources/config.yml
View File

@ -19,6 +19,11 @@ list:
# - mod
# - member
# A list of plugins to show, overriding the Vanilla /pl
# Leave blank to disable
plugins:
# - QoL
# A list of permissions to check, followed by a list of commands to run on login if a player has the specified permission
# Special variables are <player> for the player logging in
queue:
@ -43,8 +48,9 @@ tps:
threshold: 12
webhook: ''
# The link to open for portal setup instructions
portal-link: 'https://i.imgur.com/tQCbI0C.png'
grief-alert:
lines: 5
webhook: ''
# The range after which a player will be marked as "outside the border"
worldinfo:
@ -60,19 +66,10 @@ schedule:
# To disable, set minutes to 0
reminders:
frequency: 1 # In minutes
reminder_groups:
standard:
color: '#3273DC'
reminders:
- '1st Standard Reminder'
- '2nd Standard Reminder'
event:
color: '#3273DC'
period: 2
reminders:
- '1st Event Reminder'
- '2nd Event Reminder'
frequency: 5 # In minutes
color: '&a'
messages:
- 'Check out the Discord!'
# A list of links for link command aliases, separated by a comma between name and URL
links:
@ -93,34 +90,6 @@ disable-fire:
ender_crystal: false
explosion: false
disable-mob-grief:
enderman: false
# A list of commands to confirm before using if the user isn't in spectator mode
spec-confirm:
- "tp"
- "checkup"
- "lagg tpchunk"
# Dynmap link
# Leave url blank to disable
dynmap:
# Dynmap marker to use
marker_icon: "blueflag"
# Name of the marker layer
marker_set_label: "QoL Markers"
# Show the markers on the map by default
marker_set_show: false
# Limit to how many markers one player can have
url: ""
defaults:
map: "surface"
zoom: 5
# Shopkeepers Player Head Shop
head_shop:
# Shopkeeper Shop ID, set to -1 to disable
id: -1
# Diamond price of a head in the shop, default is 2 diamonds
price: 2
# Overrides view distance per world, format is [World Name]: [View Distance]
view-distances:
# world: 2

61
src/main/resources/plugin.yml
View File

@ -4,17 +4,18 @@ description: ${description}
author: ${author}
website: ${url}
main: ${mainClass}
softdepend: [spark, dynmap, DiscordSRV, Shopkeepers]
api-version: 1.13
commands:
qol:
description: Base command
colors:
description: See all color/formatting codes
aliases: [color, c, colour, colours]
aliases: [color, c]
list:
description: See a list of players
aliases: [players, playerlist]
plugins:
description: See a list of plugins
aliases: [pl]
history:
description: Name History utility command
aliases: [names, name]
@ -39,28 +40,13 @@ commands:
description: Whitelist command
timeout:
description: Timeout command
checkup:
description: Checkup command
dynmaplink:
description: Dynmap Link command
aliases: [dlink]
marker:
description: Dynmap marker command
aliases: [mark]
wiki:
description: Search the Minecraft wiki
moon:
description: Get information about the current moon phase
discordignore:
description: Mute chat messages coming from Discord
aliases: [dignore]
karattrophy:
description: 24 karat trophy command
aliases: [trophy]
permissions:
qol.admin:
description: Ability to reload the plugin
default: op
qol.discord:
description: Ability to use limited Discord syntax for chat formatting
default: op
qol.priority:
description: Allows a player on past the player cap
default: op
@ -88,11 +74,8 @@ permissions:
qol.deathmute:
description: Ability to use the Death Mute command
default: op
qol.checkup:
description: Ability to use the Checkup Command
default: op
qol.dynmaplink:
description: Ability to use the Dynmap Link Command
qol.karattrophy:
description: Ability to use the Karat Trophy Command
default: op
qol.auditable:
description: Audits command usage
@ -100,8 +83,11 @@ permissions:
qol.auditor:
description: Ability to bypass auditing when running commands on auditable
default: op
qol.specconfirm:
description: Makes the user confirm they want to run (configurable) command(s) out of spec
qol.tpconfirm:
description: Makes the user confirm they want to TP out of spec
default: op
qol.griefalert:
description: Alerts the user when monitored actions are encountered
default: op
qol.whitelist.bypass:
description: Allows someone into the server when Whitelist is enabled
@ -119,20 +105,5 @@ permissions:
default: op
children:
qol.timeout.bypass: true
qol.marker:
description: Ability to use the marker command
default: op
children:
qol.marker.limit: true
qol.wiki:
description: Ability to use the wiki command
default: op
qol.moon:
description: Ability to use the moon command
default: op
qol.discordignore:
description: Ability to use the use the discordignore command
default: op
qol.head_shop:
description: Controls if a player's head should be added to the head shop
default: op