aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/olli/cowlection/Cowlection.java (renamed from src/main/java/eu/olli/cowmoonication/Cowmoonication.java)34
-rw-r--r--src/main/java/eu/olli/cowlection/command/MooCommand.java (renamed from src/main/java/eu/olli/cowmoonication/command/MooCommand.java)38
-rw-r--r--src/main/java/eu/olli/cowlection/command/ShrugCommand.java (renamed from src/main/java/eu/olli/cowmoonication/command/ShrugCommand.java)8
-rw-r--r--src/main/java/eu/olli/cowlection/command/TabCompletableCommand.java (renamed from src/main/java/eu/olli/cowmoonication/command/TabCompletableCommand.java)8
-rw-r--r--src/main/java/eu/olli/cowlection/command/exception/ApiContactException.java (renamed from src/main/java/eu/olli/cowmoonication/command/exception/ApiContactException.java)2
-rw-r--r--src/main/java/eu/olli/cowlection/command/exception/InvalidPlayerNameException.java (renamed from src/main/java/eu/olli/cowmoonication/command/exception/InvalidPlayerNameException.java)2
-rw-r--r--src/main/java/eu/olli/cowlection/command/exception/MooCommandException.java (renamed from src/main/java/eu/olli/cowmoonication/command/exception/MooCommandException.java)4
-rw-r--r--src/main/java/eu/olli/cowlection/command/exception/ThrowingConsumer.java (renamed from src/main/java/eu/olli/cowmoonication/command/exception/ThrowingConsumer.java)6
-rw-r--r--src/main/java/eu/olli/cowlection/config/MooConfig.java (renamed from src/main/java/eu/olli/cowmoonication/config/MooConfig.java)18
-rw-r--r--src/main/java/eu/olli/cowlection/config/MooGuiConfig.java (renamed from src/main/java/eu/olli/cowmoonication/config/MooGuiConfig.java)12
-rw-r--r--src/main/java/eu/olli/cowlection/config/MooGuiFactory.java (renamed from src/main/java/eu/olli/cowmoonication/config/MooGuiFactory.java)2
-rw-r--r--src/main/java/eu/olli/cowlection/data/DataHelper.java (renamed from src/main/java/eu/olli/cowmoonication/data/DataHelper.java)2
-rw-r--r--src/main/java/eu/olli/cowlection/data/Friend.java (renamed from src/main/java/eu/olli/cowmoonication/data/Friend.java)2
-rw-r--r--src/main/java/eu/olli/cowlection/data/HySkyBlockStats.java (renamed from src/main/java/eu/olli/cowmoonication/data/HySkyBlockStats.java)4
-rw-r--r--src/main/java/eu/olli/cowlection/data/HyStalkingData.java (renamed from src/main/java/eu/olli/cowmoonication/data/HyStalkingData.java)4
-rw-r--r--src/main/java/eu/olli/cowlection/data/LogEntry.java (renamed from src/main/java/eu/olli/cowmoonication/data/LogEntry.java)2
-rw-r--r--src/main/java/eu/olli/cowlection/data/SlothStalkingData.java (renamed from src/main/java/eu/olli/cowmoonication/data/SlothStalkingData.java)2
-rw-r--r--src/main/java/eu/olli/cowlection/handler/FriendsHandler.java (renamed from src/main/java/eu/olli/cowmoonication/handler/FriendsHandler.java)18
-rw-r--r--src/main/java/eu/olli/cowlection/handler/PlayerCache.java (renamed from src/main/java/eu/olli/cowmoonication/handler/PlayerCache.java)8
-rw-r--r--src/main/java/eu/olli/cowlection/listener/ChatListener.java (renamed from src/main/java/eu/olli/cowmoonication/listener/ChatListener.java)14
-rw-r--r--src/main/java/eu/olli/cowlection/listener/PlayerListener.java (renamed from src/main/java/eu/olli/cowmoonication/listener/PlayerListener.java)14
-rw-r--r--src/main/java/eu/olli/cowlection/search/GuiDateField.java (renamed from src/main/java/eu/olli/cowmoonication/search/GuiDateField.java)2
-rw-r--r--src/main/java/eu/olli/cowlection/search/GuiSearch.java (renamed from src/main/java/eu/olli/cowmoonication/search/GuiSearch.java)12
-rw-r--r--src/main/java/eu/olli/cowlection/search/GuiTooltip.java (renamed from src/main/java/eu/olli/cowmoonication/search/GuiTooltip.java)2
-rw-r--r--src/main/java/eu/olli/cowlection/search/LogFilesSearcher.java (renamed from src/main/java/eu/olli/cowmoonication/search/LogFilesSearcher.java)6
-rw-r--r--src/main/java/eu/olli/cowlection/util/ApiUtils.java (renamed from src/main/java/eu/olli/cowmoonication/util/ApiUtils.java)18
-rw-r--r--src/main/java/eu/olli/cowlection/util/ChatHelper.java (renamed from src/main/java/eu/olli/cowmoonication/util/ChatHelper.java)2
-rw-r--r--src/main/java/eu/olli/cowlection/util/GsonUtils.java (renamed from src/main/java/eu/olli/cowmoonication/util/GsonUtils.java)2
-rw-r--r--src/main/java/eu/olli/cowlection/util/ImageUtils.java (renamed from src/main/java/eu/olli/cowmoonication/util/ImageUtils.java)6
-rw-r--r--src/main/java/eu/olli/cowlection/util/MooChatComponent.java (renamed from src/main/java/eu/olli/cowmoonication/util/MooChatComponent.java)2
-rw-r--r--src/main/java/eu/olli/cowlection/util/TickDelay.java (renamed from src/main/java/eu/olli/cowmoonication/util/TickDelay.java)2
-rw-r--r--src/main/java/eu/olli/cowlection/util/Utils.java (renamed from src/main/java/eu/olli/cowmoonication/util/Utils.java)2
-rw-r--r--src/main/java/eu/olli/cowlection/util/VersionChecker.java (renamed from src/main/java/eu/olli/cowmoonication/util/VersionChecker.java)22
-rw-r--r--src/main/resources/assets/cowlection/lang/en_US.lang19
-rw-r--r--src/main/resources/assets/cowlection/minion-tier-badges.png (renamed from src/main/resources/assets/cowmoonication/minion-tier-badges.png)bin651 -> 651 bytes
-rw-r--r--src/main/resources/assets/cowmoonication/lang/en_US.lang19
-rw-r--r--src/main/resources/mcmod.info4
37 files changed, 162 insertions, 162 deletions
diff --git a/src/main/java/eu/olli/cowmoonication/Cowmoonication.java b/src/main/java/eu/olli/cowlection/Cowlection.java
index ebadcde..dfa3456 100644
--- a/src/main/java/eu/olli/cowmoonication/Cowmoonication.java
+++ b/src/main/java/eu/olli/cowlection/Cowlection.java
@@ -1,15 +1,15 @@
-package eu.olli.cowmoonication;
-
-import eu.olli.cowmoonication.command.MooCommand;
-import eu.olli.cowmoonication.command.ShrugCommand;
-import eu.olli.cowmoonication.command.TabCompletableCommand;
-import eu.olli.cowmoonication.config.MooConfig;
-import eu.olli.cowmoonication.handler.FriendsHandler;
-import eu.olli.cowmoonication.handler.PlayerCache;
-import eu.olli.cowmoonication.listener.ChatListener;
-import eu.olli.cowmoonication.listener.PlayerListener;
-import eu.olli.cowmoonication.util.ChatHelper;
-import eu.olli.cowmoonication.util.VersionChecker;
+package eu.olli.cowlection;
+
+import eu.olli.cowlection.command.MooCommand;
+import eu.olli.cowlection.command.ShrugCommand;
+import eu.olli.cowlection.command.TabCompletableCommand;
+import eu.olli.cowlection.config.MooConfig;
+import eu.olli.cowlection.handler.FriendsHandler;
+import eu.olli.cowlection.handler.PlayerCache;
+import eu.olli.cowlection.listener.ChatListener;
+import eu.olli.cowlection.listener.PlayerListener;
+import eu.olli.cowlection.util.ChatHelper;
+import eu.olli.cowlection.util.VersionChecker;
import net.minecraftforge.client.ClientCommandHandler;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Configuration;
@@ -22,16 +22,16 @@ import org.apache.logging.log4j.Logger;
import java.io.File;
-@Mod(modid = Cowmoonication.MODID, name = Cowmoonication.MODNAME, version = Cowmoonication.VERSION,
+@Mod(modid = Cowlection.MODID, name = Cowlection.MODNAME, version = Cowlection.VERSION,
clientSideOnly = true,
guiFactory = "@PACKAGE@.config.MooGuiFactory",
- updateJSON = "https://raw.githubusercontent.com/cow-mc/Cowmoonication/master/update.json")
-public class Cowmoonication {
+ updateJSON = "https://raw.githubusercontent.com/cow-mc/Cowlection/master/update.json")
+public class Cowlection {
public static final String MODID = "@MODID@";
public static final String VERSION = "@VERSION@";
public static final String MODNAME = "@MODNAME@";
public static final String GITURL = "@GITURL@";
- private static Cowmoonication instance;
+ private static Cowlection instance;
private File configDir;
private File modsDir;
private MooConfig config;
@@ -110,7 +110,7 @@ public class Cowmoonication {
/**
* Get mod's instance; instead of this method use dependency injection where possible
*/
- public static Cowmoonication getInstance() {
+ public static Cowlection getInstance() {
return instance;
}
}
diff --git a/src/main/java/eu/olli/cowmoonication/command/MooCommand.java b/src/main/java/eu/olli/cowlection/command/MooCommand.java
index 9a73cbe..1798568 100644
--- a/src/main/java/eu/olli/cowmoonication/command/MooCommand.java
+++ b/src/main/java/eu/olli/cowlection/command/MooCommand.java
@@ -1,18 +1,18 @@
-package eu.olli.cowmoonication.command;
+package eu.olli.cowlection.command;
import com.mojang.realmsclient.util.Pair;
-import eu.olli.cowmoonication.Cowmoonication;
-import eu.olli.cowmoonication.command.exception.ApiContactException;
-import eu.olli.cowmoonication.command.exception.InvalidPlayerNameException;
-import eu.olli.cowmoonication.command.exception.MooCommandException;
-import eu.olli.cowmoonication.config.MooConfig;
-import eu.olli.cowmoonication.config.MooGuiConfig;
-import eu.olli.cowmoonication.data.DataHelper;
-import eu.olli.cowmoonication.data.Friend;
-import eu.olli.cowmoonication.data.HySkyBlockStats;
-import eu.olli.cowmoonication.data.HyStalkingData;
-import eu.olli.cowmoonication.search.GuiSearch;
-import eu.olli.cowmoonication.util.*;
+import eu.olli.cowlection.Cowlection;
+import eu.olli.cowlection.command.exception.ApiContactException;
+import eu.olli.cowlection.command.exception.InvalidPlayerNameException;
+import eu.olli.cowlection.command.exception.MooCommandException;
+import eu.olli.cowlection.config.MooConfig;
+import eu.olli.cowlection.config.MooGuiConfig;
+import eu.olli.cowlection.data.DataHelper;
+import eu.olli.cowlection.data.Friend;
+import eu.olli.cowlection.data.HySkyBlockStats;
+import eu.olli.cowlection.data.HyStalkingData;
+import eu.olli.cowlection.search.GuiSearch;
+import eu.olli.cowlection.util.*;
import net.minecraft.client.Minecraft;
import net.minecraft.command.*;
import net.minecraft.entity.Entity;
@@ -36,9 +36,9 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
public class MooCommand extends CommandBase {
- private final Cowmoonication main;
+ private final Cowlection main;
- public MooCommand(Cowmoonication main) {
+ public MooCommand(Cowlection main) {
this.main = main;
}
@@ -190,13 +190,13 @@ public class MooCommand extends CommandBase {
main.getChatHelper().sendMessage(new ChatComponentText("\u279C Update instructions:").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GOLD).setBold(true))
.appendSibling(new ChatComponentText("\n\u278A" + EnumChatFormatting.YELLOW + " download latest mod version").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GOLD).setBold(false)
.setChatClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, main.getVersionChecker().getDownloadUrl()))
- .setChatHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ChatComponentText(EnumChatFormatting.YELLOW + "Download the latest version of " + Cowmoonication.MODNAME + "\n\u279C Click to download latest mod file")))))
+ .setChatHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ChatComponentText(EnumChatFormatting.YELLOW + "Download the latest version of " + Cowlection.MODNAME + "\n\u279C Click to download latest mod file")))))
.appendSibling(new ChatComponentText("\n\u278B" + EnumChatFormatting.YELLOW + " exit Minecraft").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GOLD).setBold(false)
.setChatHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ChatComponentText(EnumChatFormatting.GOLD + "\u278B" + EnumChatFormatting.YELLOW + " Without closing Minecraft first,\n" + EnumChatFormatting.YELLOW + "you can't delete the old .jar file!")))))
- .appendSibling(new ChatComponentText("\n\u278C" + EnumChatFormatting.YELLOW + " copy " + EnumChatFormatting.GOLD + Cowmoonication.MODNAME.replace(" ", "") + "-" + main.getVersionChecker().getNewVersion() + ".jar" + EnumChatFormatting.YELLOW + " into mods directory").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GOLD).setBold(false)
+ .appendSibling(new ChatComponentText("\n\u278C" + EnumChatFormatting.YELLOW + " copy " + EnumChatFormatting.GOLD + Cowlection.MODNAME.replace(" ", "") + "-" + main.getVersionChecker().getNewVersion() + ".jar" + EnumChatFormatting.YELLOW + " into mods directory").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GOLD).setBold(false)
.setChatClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/moo directory"))
.setChatHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ChatComponentText(EnumChatFormatting.YELLOW + "Open mods directory with command " + EnumChatFormatting.GOLD + "/moo directory\n\u279C Click to open mods directory")))))
- .appendSibling(new ChatComponentText("\n\u278D" + EnumChatFormatting.YELLOW + " delete old mod file " + EnumChatFormatting.GOLD + Cowmoonication.MODNAME.replace(" ", "") + "-" + Cowmoonication.VERSION + ".jar ").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GOLD).setBold(false)))
+ .appendSibling(new ChatComponentText("\n\u278D" + EnumChatFormatting.YELLOW + " delete old mod file " + EnumChatFormatting.GOLD + Cowlection.MODNAME.replace(" ", "") + "-" + Cowlection.VERSION + ".jar ").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GOLD).setBold(false)))
.appendSibling(new ChatComponentText("\n\u278E" + EnumChatFormatting.YELLOW + " start Minecraft again").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GOLD).setBold(false))));
} else if (args[0].equalsIgnoreCase("version")) {
main.getVersionChecker().handleVersionStatus(true);
@@ -460,7 +460,7 @@ public class MooCommand extends CommandBase {
}
private void sendCommandUsage(ICommandSender sender) {
- IChatComponent usage = new MooChatComponent("\u279C " + Cowmoonication.MODNAME + " commands:").gold().bold()
+ IChatComponent usage = new MooChatComponent("\u279C " + Cowlection.MODNAME + " commands:").gold().bold()
.appendSibling(createCmdHelpSection(1, "Friends & other players"))
.appendSibling(createCmdHelpEntry("stalk", "Get info of player's status"))
.appendSibling(createCmdHelpEntry("stalkskyblock", "Get info of player's SkyBlock stats"))
diff --git a/src/main/java/eu/olli/cowmoonication/command/ShrugCommand.java b/src/main/java/eu/olli/cowlection/command/ShrugCommand.java
index 5275e54..3d48fac 100644
--- a/src/main/java/eu/olli/cowmoonication/command/ShrugCommand.java
+++ b/src/main/java/eu/olli/cowlection/command/ShrugCommand.java
@@ -1,14 +1,14 @@
-package eu.olli.cowmoonication.command;
+package eu.olli.cowlection.command;
-import eu.olli.cowmoonication.Cowmoonication;
+import eu.olli.cowlection.Cowlection;
import net.minecraft.command.CommandBase;
import net.minecraft.command.CommandException;
import net.minecraft.command.ICommandSender;
public class ShrugCommand extends CommandBase {
- private final Cowmoonication main;
+ private final Cowlection main;
- public ShrugCommand(Cowmoonication main) {
+ public ShrugCommand(Cowlection main) {
this.main = main;
}
diff --git a/src/main/java/eu/olli/cowmoonication/command/TabCompletableCommand.java b/src/main/java/eu/olli/cowlection/command/TabCompletableCommand.java
index 470f93c..87b799e 100644
--- a/src/main/java/eu/olli/cowmoonication/command/TabCompletableCommand.java
+++ b/src/main/java/eu/olli/cowlection/command/TabCompletableCommand.java
@@ -1,6 +1,6 @@
-package eu.olli.cowmoonication.command;
+package eu.olli.cowlection.command;
-import eu.olli.cowmoonication.Cowmoonication;
+import eu.olli.cowlection.Cowlection;
import net.minecraft.client.Minecraft;
import net.minecraft.command.CommandBase;
import net.minecraft.command.CommandException;
@@ -13,10 +13,10 @@ import java.util.List;
* This is not a real command. Its sole purpose is to add tab completion for usernames to server-side commands that do not provide tab completion for usernames by default.
*/
public class TabCompletableCommand extends CommandBase {
- private final Cowmoonication main;
+ private final Cowlection main;
private final String cmdName;
- public TabCompletableCommand(Cowmoonication main, String cmdName) {
+ public TabCompletableCommand(Cowlection main, String cmdName) {
this.main = main;
this.cmdName = cmdName;
}
diff --git a/src/main/java/eu/olli/cowmoonication/command/exception/ApiContactException.java b/src/main/java/eu/olli/cowlection/command/exception/ApiContactException.java
index 9dd8d9e..804fa1d 100644
--- a/src/main/java/eu/olli/cowmoonication/command/exception/ApiContactException.java
+++ b/src/main/java/eu/olli/cowlection/command/exception/ApiContactException.java
@@ -1,4 +1,4 @@
-package eu.olli.cowmoonication.command.exception;
+package eu.olli.cowlection.command.exception;
public class ApiContactException extends MooCommandException {
public ApiContactException(String api, String failedAction) {
diff --git a/src/main/java/eu/olli/cowmoonication/command/exception/InvalidPlayerNameException.java b/src/main/java/eu/olli/cowlection/command/exception/InvalidPlayerNameException.java
index 7afdeaa..3c0c06e 100644
--- a/src/main/java/eu/olli/cowmoonication/command/exception/InvalidPlayerNameException.java
+++ b/src/main/java/eu/olli/cowlection/command/exception/InvalidPlayerNameException.java
@@ -1,4 +1,4 @@
-package eu.olli.cowmoonication.command.exception;
+package eu.olli.cowlection.command.exception;
import net.minecraft.command.SyntaxErrorException;
import net.minecraft.util.EnumChatFormatting;
diff --git a/src/main/java/eu/olli/cowmoonication/command/exception/MooCommandException.java b/src/main/java/eu/olli/cowlection/command/exception/MooCommandException.java
index 6c3cb08..0cc55e0 100644
--- a/src/main/java/eu/olli/cowmoonication/command/exception/MooCommandException.java
+++ b/src/main/java/eu/olli/cowlection/command/exception/MooCommandException.java
@@ -1,9 +1,9 @@
-package eu.olli.cowmoonication.command.exception;
+package eu.olli.cowlection.command.exception;
import net.minecraft.command.CommandException;
public class MooCommandException extends CommandException {
public MooCommandException(String msg) {
- super("cowmoonication.commands.generic.exception", msg);
+ super("cowlection.commands.generic.exception", msg);
}
}
diff --git a/src/main/java/eu/olli/cowmoonication/command/exception/ThrowingConsumer.java b/src/main/java/eu/olli/cowlection/command/exception/ThrowingConsumer.java
index 589ada6..a1ed241 100644
--- a/src/main/java/eu/olli/cowmoonication/command/exception/ThrowingConsumer.java
+++ b/src/main/java/eu/olli/cowlection/command/exception/ThrowingConsumer.java
@@ -1,6 +1,6 @@
-package eu.olli.cowmoonication.command.exception;
+package eu.olli.cowlection.command.exception;
-import eu.olli.cowmoonication.Cowmoonication;
+import eu.olli.cowlection.Cowlection;
import net.minecraft.command.CommandException;
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.EnumChatFormatting;
@@ -17,7 +17,7 @@ public interface ThrowingConsumer<T> extends Consumer<T> {
} catch (CommandException e) {
IChatComponent errorMsg = new ChatComponentTranslation(e.getMessage(), e.getErrorObjects());
errorMsg.getChatStyle().setColor(EnumChatFormatting.RED);
- Cowmoonication.getInstance().getChatHelper().sendMessage(errorMsg);
+ Cowlection.getInstance().getChatHelper().sendMessage(errorMsg);
}
}
diff --git a/src/main/java/eu/olli/cowmoonication/config/MooConfig.java b/src/main/java/eu/olli/cowlection/config/MooConfig.java
index 097f0de..ff54ab9 100644
--- a/src/main/java/eu/olli/cowmoonication/config/MooConfig.java
+++ b/src/main/java/eu/olli/cowlection/config/MooConfig.java
@@ -1,7 +1,7 @@
-package eu.olli.cowmoonication.config;
+package eu.olli.cowlection.config;
-import eu.olli.cowmoonication.Cowmoonication;
-import eu.olli.cowmoonication.util.Utils;
+import eu.olli.cowlection.Cowlection;
+import eu.olli.cowlection.util.Utils;
import net.minecraft.client.Minecraft;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.Util;
@@ -47,11 +47,11 @@ public class MooConfig {
// other stuff
public static String moo;
private static Configuration cfg = null;
- private final Cowmoonication main;
+ private final Cowlection main;
private List<String> propOrderGeneral;
private List<String> propOrderLogsSearch;
- public MooConfig(Cowmoonication main, Configuration configuration) {
+ public MooConfig(Cowlection main, Configuration configuration) {
this.main = main;
cfg = configuration;
initConfig();
@@ -125,9 +125,9 @@ public class MooConfig {
Property propShowBestFriendNotifications = addConfigEntry(cfg.get(Configuration.CATEGORY_CLIENT,
"showBestFriendNotifications", true, "Set to true to receive best friends' login/logout messages, set to false hide them."), true);
Property propShowFriendNotifications = addConfigEntry(cfg.get(Configuration.CATEGORY_CLIENT,
- "showFriendNotifications", false, "Set to true to receive friends' login/logout messages, set to false hide them."), true);
+ "showFriendNotifications", true, "Set to true to receive friends' login/logout messages, set to false hide them."), true);
Property propShowGuildNotifications = addConfigEntry(cfg.get(Configuration.CATEGORY_CLIENT,
- "showGuildNotifications", false, "Set to true to receive guild members' login/logout messages, set to false hide them."), true);
+ "showGuildNotifications", true, "Set to true to receive guild members' login/logout messages, set to false hide them."), true);
Property propShowAdvancedTooltips = addConfigEntry(cfg.get(Configuration.CATEGORY_CLIENT,
"showAdvancedTooltips", true, "Set to true to show advanced tooltips, set to false show default tooltips."), true);
Property propNumeralSystem = addConfigEntry(cfg.get(Configuration.CATEGORY_CLIENT,
@@ -199,7 +199,7 @@ public class MooConfig {
private Property addConfigEntry(Property property, boolean showInGui, String category) {
if (showInGui) {
- property.setLanguageKey(Cowmoonication.MODID + ".config." + property.getName());
+ property.setLanguageKey(Cowlection.MODID + ".config." + property.getName());
} else {
property.setShowInGui(false);
}
@@ -266,7 +266,7 @@ public class MooConfig {
public class ConfigEventHandler {
@SubscribeEvent(priority = EventPriority.NORMAL)
public void onEvent(ConfigChangedEvent.OnConfigChangedEvent e) {
- if (Cowmoonication.MODID.equals(e.modID)) {
+ if (Cowlection.MODID.equals(e.modID)) {
syncFromGui();
}
}
diff --git a/src/main/java/eu/olli/cowmoonication/config/MooGuiConfig.java b/src/main/java/eu/olli/cowlection/config/MooGuiConfig.java
index a89556d..3692e48 100644
--- a/src/main/java/eu/olli/cowmoonication/config/MooGuiConfig.java
+++ b/src/main/java/eu/olli/cowlection/config/MooGuiConfig.java
@@ -1,8 +1,8 @@
-package eu.olli.cowmoonication.config;
+package eu.olli.cowlection.config;
-import eu.olli.cowmoonication.Cowmoonication;
-import eu.olli.cowmoonication.search.GuiTooltip;
-import eu.olli.cowmoonication.util.Utils;
+import eu.olli.cowlection.Cowlection;
+import eu.olli.cowlection.search.GuiTooltip;
+import eu.olli.cowlection.util.Utils;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.GuiTextField;
@@ -27,10 +27,10 @@ public class MooGuiConfig extends GuiConfig {
public MooGuiConfig(GuiScreen parent) {
super(parent,
getConfigElements(),
- Cowmoonication.MODID,
+ Cowlection.MODID,
false,
false,
- EnumChatFormatting.BOLD + "Configuration for " + Cowmoonication.MODNAME);
+ EnumChatFormatting.BOLD + "Configuration for " + Cowlection.MODNAME);
titleLine2 = EnumChatFormatting.GRAY + Utils.toRealPath(MooConfig.getConfig().getConfigFile());
}
diff --git a/src/main/java/eu/olli/cowmoonication/config/MooGuiFactory.java b/src/main/java/eu/olli/cowlection/config/MooGuiFactory.java
index dbdb139..f876ec5 100644
--- a/src/main/java/eu/olli/cowmoonication/config/MooGuiFactory.java
+++ b/src/main/java/eu/olli/cowlection/config/MooGuiFactory.java
@@ -1,4 +1,4 @@
-package eu.olli.cowmoonication.config;
+package eu.olli.cowlection.config;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
diff --git a/src/main/java/eu/olli/cowmoonication/data/DataHelper.java b/src/main/java/eu/olli/cowlection/data/DataHelper.java
index f09f298..4fa2f35 100644
--- a/src/main/java/eu/olli/cowmoonication/data/DataHelper.java
+++ b/src/main/java/eu/olli/cowlection/data/DataHelper.java
@@ -1,4 +1,4 @@
-package eu.olli.cowmoonication.data;
+package eu.olli.cowlection.data;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/main/java/eu/olli/cowmoonication/data/Friend.java b/src/main/java/eu/olli/cowlection/data/Friend.java
index 69741e2..42c45e8 100644
--- a/src/main/java/eu/olli/cowmoonication/data/Friend.java
+++ b/src/main/java/eu/olli/cowlection/data/Friend.java
@@ -1,4 +1,4 @@
-package eu.olli.cowmoonication.data;
+package eu.olli.cowlection.data;
import java.util.Objects;
import java.util.UUID;
diff --git a/src/main/java/eu/olli/cowmoonication/data/HySkyBlockStats.java b/src/main/java/eu/olli/cowlection/data/HySkyBlockStats.java
index 21e1f89..45727fc 100644
--- a/src/main/java/eu/olli/cowmoonication/data/HySkyBlockStats.java
+++ b/src/main/java/eu/olli/cowlection/data/HySkyBlockStats.java
@@ -1,8 +1,8 @@
-package eu.olli.cowmoonication.data;
+package eu.olli.cowlection.data;
import com.mojang.realmsclient.util.Pair;
import com.mojang.util.UUIDTypeAdapter;
-import eu.olli.cowmoonication.util.Utils;
+import eu.olli.cowlection.util.Utils;
import java.util.List;
import java.util.Map;
diff --git a/src/main/java/eu/olli/cowmoonication/data/HyStalkingData.java b/src/main/java/eu/olli/cowlection/data/HyStalkingData.java
index fdb5543..a592f2a 100644
--- a/src/main/java/eu/olli/cowmoonication/data/HyStalkingData.java
+++ b/src/main/java/eu/olli/cowlection/data/HyStalkingData.java
@@ -1,6 +1,6 @@
-package eu.olli.cowmoonication.data;
+package eu.olli.cowlection.data;
-import eu.olli.cowmoonication.util.Utils;
+import eu.olli.cowlection.util.Utils;
import org.apache.commons.lang3.StringUtils;
public class HyStalkingData {
diff --git a/src/main/java/eu/olli/cowmoonication/data/LogEntry.java b/src/main/java/eu/olli/cowlection/data/LogEntry.java
index e258105..2ccca3d 100644
--- a/src/main/java/eu/olli/cowmoonication/data/LogEntry.java
+++ b/src/main/java/eu/olli/cowlection/data/LogEntry.java
@@ -1,4 +1,4 @@
-package eu.olli.cowmoonication.data;
+package eu.olli.cowlection.data;
import net.minecraft.util.EnumChatFormatting;
import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/src/main/java/eu/olli/cowmoonication/data/SlothStalkingData.java b/src/main/java/eu/olli/cowlection/data/SlothStalkingData.java
index 6fc7639..6c6085e 100644
--- a/src/main/java/eu/olli/cowmoonication/data/SlothStalkingData.java
+++ b/src/main/java/eu/olli/cowlection/data/SlothStalkingData.java
@@ -1,4 +1,4 @@
-package eu.olli.cowmoonication.data;
+package eu.olli.cowlection.data;
public class SlothStalkingData {
private String username;
diff --git a/src/main/java/eu/olli/cowmoonication/handler/FriendsHandler.java b/src/main/java/eu/olli/cowlection/handler/FriendsHandler.java
index 8d714a1..a51fcd4 100644
--- a/src/main/java/eu/olli/cowmoonication/handler/FriendsHandler.java
+++ b/src/main/java/eu/olli/cowlection/handler/FriendsHandler.java
@@ -1,13 +1,13 @@
-package eu.olli.cowmoonication.handler;
+package eu.olli.cowlection.handler;
import com.google.gson.JsonParseException;
import com.google.gson.reflect.TypeToken;
-import eu.olli.cowmoonication.Cowmoonication;
-import eu.olli.cowmoonication.command.exception.ApiContactException;
-import eu.olli.cowmoonication.data.Friend;
-import eu.olli.cowmoonication.util.ApiUtils;
-import eu.olli.cowmoonication.util.GsonUtils;
-import eu.olli.cowmoonication.util.TickDelay;
+import eu.olli.cowlection.Cowlection;
+import eu.olli.cowlection.command.exception.ApiContactException;
+import eu.olli.cowlection.data.Friend;
+import eu.olli.cowlection.util.ApiUtils;
+import eu.olli.cowlection.util.GsonUtils;
+import eu.olli.cowlection.util.TickDelay;
import io.netty.util.internal.ConcurrentSet;
import net.minecraft.command.PlayerNotFoundException;
import net.minecraft.event.ClickEvent;
@@ -30,12 +30,12 @@ import java.util.stream.Collectors;
public class FriendsHandler {
private static final long UPDATE_FREQUENCY_DEFAULT = TimeUnit.HOURS.toMillis(15);
private static final long UPDATE_FREQUENCY_MINIMUM = TimeUnit.MINUTES.toMillis(5);
- private final Cowmoonication main;
+ private final Cowlection main;
private Set<Friend> bestFriends = new ConcurrentSet<>();
private File bestFriendsFile;
private UpdateStatus updateStatus;
- public FriendsHandler(Cowmoonication main, File friendsFile) {
+ public FriendsHandler(Cowlection main, File friendsFile) {
this.main = main;
this.bestFriendsFile = friendsFile;
this.updateStatus = UpdateStatus.IDLE;
diff --git a/src/main/java/eu/olli/cowmoonication/handler/PlayerCache.java b/src/main/java/eu/olli/cowlection/handler/PlayerCache.java
index fd1062d..abaff0a 100644
--- a/src/main/java/eu/olli/cowmoonication/handler/PlayerCache.java
+++ b/src/main/java/eu/olli/cowlection/handler/PlayerCache.java
@@ -1,7 +1,7 @@
-package eu.olli.cowmoonication.handler;
+package eu.olli.cowlection.handler;
import com.google.common.collect.EvictingQueue;
-import eu.olli.cowmoonication.Cowmoonication;
+import eu.olli.cowlection.Cowlection;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -11,9 +11,9 @@ public class PlayerCache {
private final EvictingQueue<String> nameCache = EvictingQueue.create(50);
@SuppressWarnings("UnstableApiUsage")
private final EvictingQueue<String> bestFriendCache = EvictingQueue.create(50);
- private final Cowmoonication main;
+ private final Cowlection main;
- public PlayerCache(Cowmoonication main) {
+ public PlayerCache(Cowlection main) {
this.main = main;
}
diff --git a/src/main/java/eu/olli/cowmoonication/listener/ChatListener.java b/src/main/java/eu/olli/cowlection/listener/ChatListener.java
index d308988..2532156 100644
--- a/src/main/java/eu/olli/cowmoonication/listener/ChatListener.java
+++ b/src/main/java/eu/olli/cowlection/listener/ChatListener.java
@@ -1,8 +1,8 @@
-package eu.olli.cowmoonication.listener;
+package eu.olli.cowlection.listener;
-import eu.olli.cowmoonication.Cowmoonication;
-import eu.olli.cowmoonication.config.MooConfig;
-import eu.olli.cowmoonication.util.Utils;
+import eu.olli.cowlection.Cowlection;
+import eu.olli.cowlection.config.MooConfig;
+import eu.olli.cowlection.util.Utils;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiChat;
import net.minecraft.client.gui.GuiControls;
@@ -31,11 +31,11 @@ public class ChatListener {
private static final Pattern LOGIN_LOGOUT_NOTIFICATION = Pattern.compile("^(?<type>§aFriend|§2Guild) > §r(?<rank>§[0-9a-f])(?<playerName>[\\w]+)(?<joinLeaveSuffix> §r§e(?<joinedLeft>joined|left)\\.)§r$");
private static final Pattern CHAT_MESSAGE_RECEIVED_PATTERN = Pattern.compile("^(?:Party|Guild) > (?:\\[.*?] )?(?<playerName>\\w+)(?: \\[.*?])?: ");
private static final Pattern PRIVATE_MESSAGE_RECEIVED_PATTERN = Pattern.compile("^From (?:\\[.*?] )?(\\w+): ");
- private final Cowmoonication main;
+ private final Cowlection main;
private String lastTypedChars = "";
private String lastPMSender;
- public ChatListener(Cowmoonication main) {
+ public ChatListener(Cowlection main) {
this.main = main;
}
@@ -83,7 +83,7 @@ public class ChatListener {
if (Utils.isValidUuid(moo)) {
MooConfig.moo = moo;
main.getConfig().syncFromFields();
- main.getChatHelper().sendMessage(EnumChatFormatting.GREEN, "Added updated API key in " + Cowmoonication.MODNAME + " config!");
+ main.getChatHelper().sendMessage(EnumChatFormatting.GREEN, "Added updated API key in " + Cowlection.MODNAME + " config!");
}
}
}
diff --git a/src/main/java/eu/olli/cowmoonication/listener/PlayerListener.java b/src/main/java/eu/olli/cowlection/listener/PlayerListener.java
index afa6c31..c68d814 100644
--- a/src/main/java/eu/olli/cowmoonication/listener/PlayerListener.java
+++ b/src/main/java/eu/olli/cowlection/listener/PlayerListener.java
@@ -1,9 +1,9 @@
-package eu.olli.cowmoonication.listener;
+package eu.olli.cowlection.listener;
-import eu.olli.cowmoonication.Cowmoonication;
-import eu.olli.cowmoonication.config.MooConfig;
-import eu.olli.cowmoonication.util.TickDelay;
-import eu.olli.cowmoonication.util.Utils;
+import eu.olli.cowlection.Cowlection;
+import eu.olli.cowlection.config.MooConfig;
+import eu.olli.cowlection.util.TickDelay;
+import eu.olli.cowlection.util.Utils;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.inventory.ContainerChest;
@@ -29,14 +29,14 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class PlayerListener {
- private final Cowmoonication main;
+ private final Cowlection main;
private final NumberFormat numberFormatter;
/**
* timestamp example: 4/20/20 4:20 AM
*/
private final Pattern SB_TIMESTAMP_PATTERN = Pattern.compile("^(\\d{1,2})/(\\d{1,2})/(\\d{2}) (\\d{1,2}):(\\d{2}) (AM|PM)$");
- public PlayerListener(Cowmoonication main) {
+ public PlayerListener(Cowlection main) {
this.main = main;
numberFormatter = NumberFormat.getNumberInstance(Locale.US);
numberFormatter.setMaximumFractionDigits(0);
diff --git a/src/main/java/eu/olli/cowmoonication/search/GuiDateField.java b/src/main/java/eu/olli/cowlection/search/GuiDateField.java
index 136e4ac..bb08a02 100644
--- a/src/main/java/eu/olli/cowmoonication/search/GuiDateField.java
+++ b/src/main/java/eu/olli/cowlection/search/GuiDateField.java
@@ -1,4 +1,4 @@
-package eu.olli.cowmoonication.search;
+package eu.olli.cowlection.search;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.GuiTextField;
diff --git a/src/main/java/eu/olli/cowmoonication/search/GuiSearch.java b/src/main/java/eu/olli/cowlection/search/GuiSearch.java
index d0c9597..d693e59 100644
--- a/src/main/java/eu/olli/cowmoonication/search/GuiSearch.java
+++ b/src/main/java/eu/olli/cowlection/search/GuiSearch.java
@@ -1,11 +1,11 @@
-package eu.olli.cowmoonication.search;
+package eu.olli.cowlection.search;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.mojang.realmsclient.util.Pair;
-import eu.olli.cowmoonication.Cowmoonication;
-import eu.olli.cowmoonication.config.MooConfig;
-import eu.olli.cowmoonication.data.LogEntry;
-import eu.olli.cowmoonication.util.Utils;
+import eu.olli.cowlection.Cowlection;
+import eu.olli.cowlection.config.MooConfig;
+import eu.olli.cowlection.data.LogEntry;
+import eu.olli.cowlection.util.Utils;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.*;
import net.minecraft.client.renderer.GlStateManager;
@@ -49,7 +49,7 @@ public class GuiSearch extends GuiScreen {
*/
private final ExecutorService executorService = new ThreadPoolExecutor(0, 1,
60L, TimeUnit.SECONDS,
- new LinkedBlockingQueue<>(), new ThreadFactoryBuilder().setNameFormat(Cowmoonication.MODID + "-logfilesearcher-%d").build());
+ new LinkedBlockingQueue<>(), new ThreadFactoryBuilder().setNameFormat(Cowlection.MODID + "-logfilesearcher-%d").build());
// data
private String searchQuery;
private boolean chatOnly;
diff --git a/src/main/java/eu/olli/cowmoonication/search/GuiTooltip.java b/src/main/java/eu/olli/cowlection/search/GuiTooltip.java
index 9fed357..f76bf2d 100644
--- a/src/main/java/eu/olli/cowmoonication/search/GuiTooltip.java
+++ b/src/main/java/eu/olli/cowlection/search/GuiTooltip.java
@@ -1,4 +1,4 @@
-package eu.olli.cowmoonication.search;
+package eu.olli.cowlection.search;
import net.minecraft.client.gui.Gui;
import net.minecraft.client.gui.GuiButton;
diff --git a/src/main/java/eu/olli/cowmoonication/search/LogFilesSearcher.java b/src/main/java/eu/olli/cowlection/search/LogFilesSearcher.java
index 04ee88a..7aeb2aa 100644
--- a/src/main/java/eu/olli/cowmoonication/search/LogFilesSearcher.java
+++ b/src/main/java/eu/olli/cowlection/search/LogFilesSearcher.java
@@ -1,7 +1,7 @@
-package eu.olli.cowmoonication.search;
+package eu.olli.cowlection.search;
-import eu.olli.cowmoonication.config.MooConfig;
-import eu.olli.cowmoonication.data.LogEntry;
+import eu.olli.cowlection.config.MooConfig;
+import eu.olli.cowlection.data.LogEntry;
import net.minecraft.util.EnumChatFormatting;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.ImmutableTriple;
diff --git a/src/main/java/eu/olli/cowmoonication/util/ApiUtils.java b/src/main/java/eu/olli/cowlection/util/ApiUtils.java
index 317ed80..b0a4cce 100644
--- a/src/main/java/eu/olli/cowmoonication/util/ApiUtils.java
+++ b/src/main/java/eu/olli/cowlection/util/ApiUtils.java
@@ -1,15 +1,15 @@
-package eu.olli.cowmoonication.util;
+package eu.olli.cowlection.util;
import com.google.gson.JsonArray;
import com.google.gson.JsonParser;
import com.mojang.util.UUIDTypeAdapter;
-import eu.olli.cowmoonication.Cowmoonication;
-import eu.olli.cowmoonication.command.exception.ThrowingConsumer;
-import eu.olli.cowmoonication.config.MooConfig;
-import eu.olli.cowmoonication.data.Friend;
-import eu.olli.cowmoonication.data.HySkyBlockStats;
-import eu.olli.cowmoonication.data.HyStalkingData;
-import eu.olli.cowmoonication.data.SlothStalkingData;
+import eu.olli.cowlection.Cowlection;
+import eu.olli.cowlection.command.exception.ThrowingConsumer;
+import eu.olli.cowlection.config.MooConfig;
+import eu.olli.cowlection.data.Friend;
+import eu.olli.cowlection.data.HySkyBlockStats;
+import eu.olli.cowlection.data.HyStalkingData;
+import eu.olli.cowlection.data.SlothStalkingData;
import org.apache.http.HttpStatus;
import java.io.BufferedReader;
@@ -119,7 +119,7 @@ public class ApiUtils {
HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
connection.setConnectTimeout(5000);
connection.setReadTimeout(5000);
- connection.addRequestProperty("User-Agent", "Forge Mod " + Cowmoonication.MODNAME + "/" + Cowmoonication.VERSION + " (" + Cowmoonication.GITURL + ")");
+ connection.addRequestProperty("User-Agent", "Forge Mod " + Cowlection.MODNAME + "/" + Cowlection.VERSION + " (" + Cowlection.GITURL + ")");
connection.getResponseCode();
if (connection.getResponseCode() == HttpStatus.SC_NO_CONTENT) { // http status 204
diff --git a/src/main/java/eu/olli/cowmoonication/util/ChatHelper.java b/src/main/java/eu/olli/cowlection/util/ChatHelper.java
index b0196e4..202390f 100644
--- a/src/main/java/eu/olli/cowmoonication/util/ChatHelper.java
+++ b/src/main/java/eu/olli/cowlection/util/ChatHelper.java
@@ -1,4 +1,4 @@
-package eu.olli.cowmoonication.util;
+package eu.olli.cowlection.util;
import net.minecraft.client.Minecraft;
import net.minecraft.util.ChatComponentText;
diff --git a/src/main/java/eu/olli/cowmoonication/util/GsonUtils.java b/src/main/java/eu/olli/cowlection/util/GsonUtils.java
index c448e0e..ece3faf 100644
--- a/src/main/java/eu/olli/cowmoonication/util/GsonUtils.java
+++ b/src/main/java/eu/olli/cowlection/util/GsonUtils.java
@@ -1,4 +1,4 @@
-package eu.olli.cowmoonication.util;
+package eu.olli.cowlection.util;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
diff --git a/src/main/java/eu/olli/cowmoonication/util/ImageUtils.java b/src/main/java/eu/olli/cowlection/util/ImageUtils.java
index cd224e8..d6283bd 100644
--- a/src/main/java/eu/olli/cowmoonication/util/ImageUtils.java
+++ b/src/main/java/eu/olli/cowlection/util/ImageUtils.java
@@ -1,7 +1,7 @@
-package eu.olli.cowmoonication.util;
+package eu.olli.cowlection.util;
import com.mojang.authlib.minecraft.MinecraftProfileTexture;
-import eu.olli.cowmoonication.Cowmoonication;
+import eu.olli.cowlection.Cowlection;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ThreadDownloadImageData;
import net.minecraft.util.ResourceLocation;
@@ -26,7 +26,7 @@ public class ImageUtils {
BufferedImage minionSkinTierBadge = minionSkinImage.getSubimage(43, 3, 2, 2);
// reference image for tier badges: each tier is 2x2 pixel
- ResourceLocation tierBadgesLocation = new ResourceLocation(Cowmoonication.MODID, "minion-tier-badges.png");
+ ResourceLocation tierBadgesLocation = new ResourceLocation(Cowlection.MODID, "minion-tier-badges.png");
try (InputStream tierBadgesStream = Minecraft.getMinecraft().getResourceManager().getResource(tierBadgesLocation).getInputStream()) {
BufferedImage tierBadges = ImageIO.read(tierBadgesStream);
diff --git a/src/main/java/eu/olli/cowmoonication/util/MooChatComponent.java b/src/main/java/eu/olli/cowlection/util/MooChatComponent.java
index a489391..0c6a141 100644
--- a/src/main/java/eu/olli/cowmoonication/util/MooChatComponent.java
+++ b/src/main/java/eu/olli/cowlection/util/MooChatComponent.java
@@ -1,4 +1,4 @@
-package eu.olli.cowmoonication.util;
+package eu.olli.cowlection.util;
import net.minecraft.event.ClickEvent;
import net.minecraft.event.HoverEvent;
diff --git a/src/main/java/eu/olli/cowmoonication/util/TickDelay.java b/src/main/java/eu/olli/cowlection/util/TickDelay.java
index d5d164a..9692ce7 100644
--- a/src/main/java/eu/olli/cowmoonication/util/TickDelay.java
+++ b/src/main/java/eu/olli/cowlection/util/TickDelay.java
@@ -1,4 +1,4 @@
-package eu.olli.cowmoonication.util;
+package eu.olli.cowlection.util;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
diff --git a/src/main/java/eu/olli/cowmoonication/util/Utils.java b/src/main/java/eu/olli/cowlection/util/Utils.java
index 8d846f3..92f4c9e 100644
--- a/src/main/java/eu/olli/cowmoonication/util/Utils.java
+++ b/src/main/java/eu/olli/cowlection/util/Utils.java
@@ -1,4 +1,4 @@
-package eu.olli.cowmoonication.util;
+package eu.olli.cowlection.util;
import com.mojang.realmsclient.util.Pair;
import net.minecraft.util.EnumChatFormatting;
diff --git a/src/main/java/eu/olli/cowmoonication/util/VersionChecker.java b/src/main/java/eu/olli/cowlection/util/VersionChecker.java
index 902d1e0..8f05beb 100644
--- a/src/main/java/eu/olli/cowmoonication/util/VersionChecker.java
+++ b/src/main/java/eu/olli/cowlection/util/VersionChecker.java
@@ -1,7 +1,7 @@
-package eu.olli.cowmoonication.util;
+package eu.olli.cowlection.util;
-import eu.olli.cowmoonication.Cowmoonication;
-import eu.olli.cowmoonication.config.MooConfig;
+import eu.olli.cowlection.Cowlection;
+import eu.olli.cowlection.config.MooConfig;
import net.minecraft.client.Minecraft;
import net.minecraft.event.ClickEvent;
import net.minecraft.event.HoverEvent;
@@ -23,17 +23,17 @@ public class VersionChecker {
* Cooldown between to update checks in minutes
*/
private static final int CHECK_COOLDOWN = 15;
- private static final String CHANGELOG_URL = Cowmoonication.GITURL + "blob/master/CHANGELOG.md";
- private final Cowmoonication main;
+ private static final String CHANGELOG_URL = Cowlection.GITURL + "blob/master/CHANGELOG.md";
+ private final Cowlection main;
private long lastCheck;
private String newVersion;
private String downloadUrl;
- public VersionChecker(Cowmoonication main) {
+ public VersionChecker(Cowlection main) {
this.main = main;
this.lastCheck = Minecraft.getSystemTime();
newVersion = "[newVersion]";
- downloadUrl = Cowmoonication.GITURL + "releases";
+ downloadUrl = Cowlection.GITURL + "releases";
}
public boolean runUpdateCheck(boolean isCommandTriggered) {
@@ -61,7 +61,7 @@ public class VersionChecker {
ForgeVersion.CheckResult versionResult = ForgeVersion.getResult(Loader.instance().activeModContainer());
if (versionResult.target != null) {
newVersion = versionResult.target.toString();
- downloadUrl = Cowmoonication.GITURL + "releases/download/v" + newVersion + "/" + Cowmoonication.MODNAME.replace(" ", "") + "-" + newVersion + ".jar";
+ downloadUrl = Cowlection.GITURL + "releases/download/v" + newVersion + "/" + Cowlection.MODNAME.replace(" ", "") + "-" + newVersion + ".jar";
}
IChatComponent statusMsg = null;
@@ -69,7 +69,7 @@ public class VersionChecker {
if (isCommandTriggered) {
if (versionResult.status == ForgeVersion.Status.UP_TO_DATE) {
// up to date
- statusMsg = new ChatComponentText("\u2714 You're running the latest version (" + Cowmoonication.VERSION + ").").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GREEN));
+ statusMsg = new ChatComponentText("\u2714 You're running the latest version (" + Cowlection.VERSION + ").").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GREEN));
} else if (versionResult.status == ForgeVersion.Status.PENDING) {
// pending
statusMsg = new ChatComponentText("\u279C " + "Version check either failed or is still running.").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.YELLOW))
@@ -94,12 +94,12 @@ public class VersionChecker {
// outdated
IChatComponent spacer = new ChatComponentText(" ").setChatStyle(new ChatStyle().setParentStyle(null));
- IChatComponent text = new ChatComponentText("\u279C New version of " + EnumChatFormatting.DARK_GREEN + Cowmoonication.MODNAME + " " + EnumChatFormatting.GREEN + "available (" + Cowmoonication.VERSION + " \u27A1 " + newVersion + ")\n").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GREEN));
+ IChatComponent text = new ChatComponentText("\u279C New version of " + EnumChatFormatting.DARK_GREEN + Cowlection.MODNAME + " " + EnumChatFormatting.GREEN + "available (" + Cowlection.VERSION + " \u27A1 " + newVersion + ")\n").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GREEN));
IChatComponent download = new ChatComponentText("[Download]").setChatStyle(new ChatStyle()
.setColor(EnumChatFormatting.DARK_GREEN).setBold(true)
.setChatClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, downloadUrl))
- .setChatHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ChatComponentText(EnumChatFormatting.YELLOW + "Download the latest version of " + Cowmoonication.MODNAME))));
+ .setChatHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ChatComponentText(EnumChatFormatting.YELLOW + "Download the latest version of " + Cowlection.MODNAME))));
IChatComponent changelog = new ChatComponentText("[Changelog]").setChatStyle(new ChatStyle()
.setColor(EnumChatFormatting.DARK_AQUA).setBold(true)
diff --git a/src/main/resources/assets/cowlection/lang/en_US.lang b/src/main/resources/assets/cowlection/lang/en_US.lang
new file mode 100644
index 0000000..eadc42a
--- /dev/null
+++ b/src/main/resources/assets/cowlection/lang/en_US.lang
@@ -0,0 +1,19 @@
+cowlection.config.doUpdateCheck=Check for updates
+cowlection.config.doUpdateCheck.tooltip=Check for mod updates?
+cowlection.config.showBestFriendNotifications=Show best friend notifications
+cowlection.config.showBestFriendNotifications.tooltip=Set to true to receive best friends' login/logout messages, set to false hide them.
+cowlection.config.showFriendNotifications=Show friend notifications
+cowlection.config.showFriendNotifications.tooltip=Set to true to receive friends' login/logout messages, set to false hide them.
+cowlection.config.showGuildNotifications=Show guild notifications
+cowlection.config.showGuildNotifications.tooltip=Set to true to receive guild members' login/logout messages, set to false hide them.
+cowlection.config.showAdvancedTooltips=Show advanced tooltips
+cowlection.config.showAdvancedTooltips.tooltip=Set to true to show advanced tooltips, set to false show default tooltips.
+cowlection.config.numeralSystem=Numeral system
+cowlection.config.numeralSystem.tooltip=Use Roman or Arabic numeral system?
+cowlection.config.tabCompletableNamesCommands=Commands with Tab-completable usernames
+cowlection.config.tabCompletableNamesCommands.tooltip=List of commands with a username argument that should be Tab-completable.\nRequires game restart to take effect!
+cowlection.config.logsDirs=Directories with Minecraft log files
+cowlection.config.logsDirs.tooltip=List of directories containing Minecraft log files
+cowlection.config.defaultStartDate=Start date for log file search
+cowlection.config.defaultStartDate.tooltip=§eCan be either a §6number§e (e.g. "§63§e" means "§6start searching 3 months ago§e"),\n§eor alternatively a §6fixed date §e(§6yyyy-mm-dd§e)
+cowlection.commands.generic.exception=%s
diff --git a/src/main/resources/assets/cowmoonication/minion-tier-badges.png b/src/main/resources/assets/cowlection/minion-tier-badges.png
index 23918f5..23918f5 100644
--- a/src/main/resources/assets/cowmoonication/minion-tier-badges.png
+++ b/src/main/resources/assets/cowlection/minion-tier-badges.png
Binary files differ
diff --git a/src/main/resources/assets/cowmoonication/lang/en_US.lang b/src/main/resources/assets/cowmoonication/lang/en_US.lang
deleted file mode 100644
index 3c861fd..0000000
--- a/src/main/resources/assets/cowmoonication/lang/en_US.lang
+++ /dev/null
@@ -1,19 +0,0 @@
-cowmoonication.config.doUpdateCheck=Check for updates
-cowmoonication.config.doUpdateCheck.tooltip=Check for mod updates?
-cowmoonication.config.showBestFriendNotifications=Show best friend notifications
-cowmoonication.config.showBestFriendNotifications.tooltip=Set to true to receive best friends' login/logout messages, set to false hide them.
-cowmoonication.config.showFriendNotifications=Show friend notifications
-cowmoonication.config.showFriendNotifications.tooltip=Set to true to receive friends' login/logout messages, set to false hide them.
-cowmoonication.config.showGuildNotifications=Show guild notifications
-cowmoonication.config.showGuildNotifications.tooltip=Set to true to receive guild members' login/logout messages, set to false hide them.
-cowmoonication.config.showAdvancedTooltips=Show advanced tooltips
-cowmoonication.config.showAdvancedTooltips.tooltip=Set to true to show advanced tooltips, set to false show default tooltips.
-cowmoonication.config.numeralSystem=Numeral system
-cowmoonication.config.numeralSystem.tooltip=Use Roman or Arabic numeral system?
-cowmoonication.config.tabCompletableNamesCommands=Commands with Tab-completable usernames
-cowmoonication.config.tabCompletableNamesCommands.tooltip=List of commands with a username argument that should be Tab-completable.\nRequires game restart to take effect!
-cowmoonication.config.logsDirs=Directories with Minecraft log files
-cowmoonication.config.logsDirs.tooltip=List of directories containing Minecraft log files
-cowmoonication.config.defaultStartDate=Start date for log file search
-cowmoonication.config.defaultStartDate.tooltip=§eCan be either a §6number§e (e.g. "§63§e" means "§6start searching 3 months ago§e"),\n§eor alternatively a §6fixed date §e(§6yyyy-mm-dd§e)
-cowmoonication.commands.generic.exception=%s
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index bbd28d9..b57f8a4 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -1,11 +1,11 @@
[{
"modid": "${modid}",
"name": "${modname}",
- "description": "Adding various things related to communication.",
+ "description": "Adds a collection of various useful things.",
"version": "${version}",
"mcversion": "${mcversion}",
"url": "${giturl}",
- "updateUrl": "https://raw.githubusercontent.com/cow-mc/Cowmoonication/master/update.json",
+ "updateUrl": "https://raw.githubusercontent.com/cow-mc/Cowlection/master/update.json",
"authorList": ["Cow"],
"logoFile": "",
"screenshots": [],