diff options
| author | Moulberry <james.jenour@student.scotch.wa.edu.au> | 2020-10-03 06:09:28 +1000 |
|---|---|---|
| committer | Moulberry <james.jenour@student.scotch.wa.edu.au> | 2020-10-03 06:09:28 +1000 |
| commit | 275fe45caa8eb1048914d864aafae21f3f3a1157 (patch) | |
| tree | 87fe9a8e5f996c7cbc6fc81f2f522561ceb96992 /src/main/java/io/github/moulberry/notenoughupdates/TradeWindow.java | |
| parent | bb067068aabda36f8ba74b34a68856e19139beb9 (diff) | |
| download | notenoughupdates-275fe45caa8eb1048914d864aafae21f3f3a1157.tar.gz notenoughupdates-275fe45caa8eb1048914d864aafae21f3f3a1157.tar.bz2 notenoughupdates-275fe45caa8eb1048914d864aafae21f3f3a1157.zip | |
1.3.3-ALPA
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/TradeWindow.java')
| -rw-r--r-- | src/main/java/io/github/moulberry/notenoughupdates/TradeWindow.java | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/TradeWindow.java b/src/main/java/io/github/moulberry/notenoughupdates/TradeWindow.java index 1669d617..6bdf2c5d 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/TradeWindow.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/TradeWindow.java @@ -58,6 +58,7 @@ public class TradeWindow { private static int lastBackpackY; public static boolean tradeWindowActive() { + if(!NotEnoughUpdates.INSTANCE.isOnSkyblock()) return false; if(!NotEnoughUpdates.INSTANCE.manager.config.useCustomTrade.value) return false; GuiScreen guiScreen = Minecraft.getMinecraft().currentScreen; @@ -110,14 +111,17 @@ public class TradeWindow { StringBuilder sb = new StringBuilder(); for(int index = 0; index < clean.length(); index++) { char c = clean.charAt(index); - if("0123456789".indexOf(c) >= 0) { + if("0123456789.".indexOf(c) >= 0) { sb.append(c); } else { switch(c) { + case 'K': case 'k': mult = 1000; break; + case 'M': case 'm': mult = 1000000; break; + case 'B': case 'b': mult = 1000000000; break; default: @@ -127,7 +131,7 @@ public class TradeWindow { } } try { - int coins = Integer.parseInt(sb.toString())*mult; + int coins = (int)(Float.parseFloat(sb.toString())*mult); topItemsStack.putIfAbsent("TRADE_COINS", stack); @@ -318,14 +322,17 @@ public class TradeWindow { StringBuilder sb = new StringBuilder(); for(int index = 0; index < clean.length(); index++) { char c = clean.charAt(index); - if("0123456789".indexOf(c) >= 0) { + if("0123456789.".indexOf(c) >= 0) { sb.append(c); } else { switch(c) { + case 'K': case 'k': mult = 1000; break; + case 'M': case 'm': mult = 1000000; break; + case 'B': case 'b': mult = 1000000000; break; default: @@ -335,7 +342,7 @@ public class TradeWindow { } } try { - int coins = Integer.parseInt(sb.toString())*mult; + int coins = (int)(Float.parseFloat(sb.toString())*mult); List<Integer> list = ourTradeMap.computeIfAbsent(coins, k -> new ArrayList<>()); list.add(containerIndex); @@ -413,14 +420,17 @@ public class TradeWindow { StringBuilder sb = new StringBuilder(); for(int index = 0; index < clean.length(); index++) { char c = clean.charAt(index); - if("0123456789".indexOf(c) >= 0) { + if("0123456789.".indexOf(c) >= 0) { sb.append(c); } else { switch(c) { + case 'K': case 'k': mult = 1000; break; + case 'M': case 'm': mult = 1000000; break; + case 'B': case 'b': mult = 1000000000; break; default: @@ -430,7 +440,7 @@ public class TradeWindow { } } try { - int coins = Integer.parseInt(sb.toString())*mult; + int coins = (int)(Float.parseFloat(sb.toString())*mult); List<Integer> list = theirTradeMap.computeIfAbsent(coins, k -> new ArrayList<>()); list.add(containerIndex); |