From 4655b12ae7cf1735bc951343fe2bc9679d7cb529 Mon Sep 17 00:00:00 2001
From: bowser0000 <bowser0000@gmail.com>
Date: Sun, 2 Aug 2020 16:19:03 -0400
Subject: Force US locale, fix Sea Witch string
---
me/Danker/TheMod.java | 7 ++++---
me/Danker/commands/LootCommand.java | 3 ++-
2 files changed, 6 insertions(+), 4 deletions(-)
(limited to 'me')
diff --git a/me/Danker/TheMod.java b/me/Danker/TheMod.java
index 6f7d525..6ed6c44 100644
--- a/me/Danker/TheMod.java
+++ b/me/Danker/TheMod.java
@@ -7,6 +7,7 @@ import java.awt.TrayIcon;
import java.text.NumberFormat;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -61,7 +62,7 @@ import net.minecraftforge.fml.common.versioning.DefaultArtifactVersion;
public class TheMod
{
public static final String MODID = "Danker's Skyblock Mod";
- public static final String VERSION = "1.6";
+ public static final String VERSION = "1.6.1";
static double checkItemsNow = 0;
static double itemsChecked = 0;
@@ -385,7 +386,7 @@ public class TheMod
cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
increaseEmpSC();
}
- if (message.contains("It looks like you've disrupted Sea Witch's brewing session")) {
+ if (message.contains("It looks like you've disrupted the Sea Witch's brewing session. Watch out, she's furious")) {
lc.seaWitches++;
lc.seaCreatures++;
cf.writeIntConfig("fishing", "seaWitch", lc.seaWitches);
@@ -512,7 +513,7 @@ public class TheMod
String timeBetween = "Never";
String bossesBetween = "Never";
double timeNow = System.currentTimeMillis() / 1000;
- NumberFormat nf = NumberFormat.getIntegerInstance();
+ NumberFormat nf = NumberFormat.getIntegerInstance(Locale.US);
if (ds.display.equals("wolf")) {
if (lc.wolfTime == -1) {
diff --git a/me/Danker/commands/LootCommand.java b/me/Danker/commands/LootCommand.java
index 392e06c..5853cee 100644
--- a/me/Danker/commands/LootCommand.java
+++ b/me/Danker/commands/LootCommand.java
@@ -1,6 +1,7 @@
package me.Danker.commands;
import java.text.NumberFormat;
+import java.util.Locale;
import net.minecraft.command.CommandBase;
import net.minecraft.command.CommandException;
@@ -130,7 +131,7 @@ public class LootCommand extends CommandBase {
double timeNow = System.currentTimeMillis() / 1000;
String timeBetween;
String bossesBetween;
- NumberFormat nf = NumberFormat.getIntegerInstance();
+ NumberFormat nf = NumberFormat.getIntegerInstance(Locale.US);
if (arg1[0].equalsIgnoreCase("wolf")) {
if (wolfTime == -1) {
timeBetween = "Never";
--
cgit