From e23bfa7f87248b7921a24fcc048a34e04331d2b1 Mon Sep 17 00:00:00 2001
From: ZeroEpoch1969 <13510767+ZeroEpoch1969@users.noreply.github.com>
Date: Wed, 8 Apr 2020 20:08:37 -0700
Subject: [PATCH] sometimes I fucking hate people
---
TotalFreedomMod.iml | 6 +++---
pom.xml | 7 +++++++
.../totalfreedommod/shop/Shop.java | 20 ++++++++++++-------
3 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/TotalFreedomMod.iml b/TotalFreedomMod.iml
index e145fbf4..869f5898 100644
--- a/TotalFreedomMod.iml
+++ b/TotalFreedomMod.iml
@@ -81,6 +81,8 @@
+
+
@@ -163,8 +165,6 @@
-
-
-
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 28c5f343..03dd2704 100644
--- a/pom.xml
+++ b/pom.xml
@@ -213,6 +213,13 @@
provided
+
+ com.github.ConnorLinfoot
+ ActionBarAPI
+ 5b2d642d3d
+ provided
+
+
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/shop/Shop.java b/src/main/java/me/totalfreedom/totalfreedommod/shop/Shop.java
index 1e76a316..fd125665 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/shop/Shop.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/shop/Shop.java
@@ -7,12 +7,12 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.time.LocalDate;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import lombok.Getter;
+import me.rayzr522.jsonmessage.JSONMessage;
import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
@@ -37,7 +37,7 @@ import org.bukkit.scheduler.BukkitTask;
public class Shop extends FreedomService
{
@Getter
- public final Map dataMap = Maps.newHashMap(); // uuid, dataMap
+ public final Map dataMap = Maps.newHashMap();
@Getter
private final File configFolder;
private BukkitTask reactions;
@@ -67,11 +67,17 @@ public class Shop extends FreedomService
public void run()
{
reactionString = FUtil.randomString(ConfigEntry.SHOP_REACTIONS_STRING_LENGTH.getInteger());
- String reactionMessage = ChatColor.DARK_GRAY + "[" + ChatColor.YELLOW + "Reaction" + ChatColor.DARK_GRAY + "] "
- + ChatColor.AQUA + "Type the string " + ChatColor.DARK_AQUA + reactionString
- + ChatColor.AQUA + " to win " + ChatColor.GOLD + plugin.sh.coinsPerReactionWin + ChatColor.AQUA + " coins!";
- FUtil.bcastMsg(reactionMessage, false);
- reactionStartTime = new Date();
+ for (Player player : server.getOnlinePlayers())
+ {
+ String reactionMessage = ChatColor.DARK_GRAY + "[" + ChatColor.YELLOW + "Reaction" + ChatColor.DARK_GRAY + "] "
+ + ChatColor.AQUA + "Hover over this message or click on it and type the "
+ + ChatColor.AQUA + "string to win " + ChatColor.GOLD + plugin.sh.coinsPerReactionWin + ChatColor.AQUA + " coins!";
+ JSONMessage.create(reactionMessage)
+ .tooltip(ChatColor.DARK_AQUA + reactionString)
+ .runCommand("/reactionbar")
+ .send(player);
+ reactionStartTime = new Date();
+ }
}
}.runTaskTimer(plugin, interval, interval);
}