Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Chinese language support #4

Merged
merged 8 commits into from
Dec 27, 2021
Merged

Chinese language support #4

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fea95b4
Chinese language support
LingMuQingYu Dec 27, 2021
b13ad41
add UTF8Control
LingMuQingYu Dec 27, 2021
f55a1bc
Fixed "Waiting for F3+C" display issue
LingMuQingYu Dec 27, 2021
db25e74
Fixed "en_US" format issue
LingMuQingYu Dec 27, 2021
0eeb34d
Re-added OpenSans font for compatible languages
Ninjabrain1 Dec 27, 2021
e8a9049
Delete en_US language file (duplicate of default)
Ninjabrain1 Dec 27, 2021
ee47e90
Reverted title to "Ninjabrain Bot"
Ninjabrain1 Dec 27, 2021
f0e215b
Changed locale from US to system default
Ninjabrain1 Dec 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/ninjabrainbot/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@
import ninjabrainbot.io.KeyboardListener;
import ninjabrainbot.io.NinjabrainBotPreferences;
import ninjabrainbot.io.UpdateChecker;
import ninjabrainbot.util.I18n;
import ninjabrainbot.util.Profiler;

import java.util.Arrays;
import java.util.Locale;

public class Main {

public static final String VERSION = "1.1.0";
Expand Down Expand Up @@ -41,6 +45,13 @@ public class Main {
// [x] Sigma toggle

public static void main(String[] args) {
System.out.println(Arrays.toString(args));
for (String arg : args) {
if ("-dev=true".equals(arg)) {
I18n.setDev(true);
}
}
System.out.println("lang info: " + I18n.get("lang"));
Profiler.start("Initialize preferences");
preferences = new NinjabrainBotPreferences();
Profiler.stopAndStart("Calculate approximated density");
Expand Down
25 changes: 17 additions & 8 deletions src/ninjabrainbot/calculator/ChunkPrediction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import ninjabrainbot.Main;
import ninjabrainbot.io.NinjabrainBotPreferences;
import ninjabrainbot.util.I18n;

public class ChunkPrediction extends Chunk {

Expand All @@ -30,24 +31,32 @@ public ChunkPrediction() {
}

public String format() {
switch (Main.preferences.strongholdDisplayType.get()) {
final String key = Main.preferences.strongholdDisplayType.get();
switch (key) {
case NinjabrainBotPreferences.FOURFOUR:
return String.format(Locale.US, "Location: (%d, %d), %d blocks away ", fourfour_x, fourfour_z, distance);
return I18n.get("location_blocks", fourfour_x, fourfour_z, distance);
case NinjabrainBotPreferences.EIGHTEIGHT:
return String.format(Locale.US, "Location: (%d, %d), %d blocks away ", fourfour_x + 4, fourfour_z + 4, distance);
case NinjabrainBotPreferences.CHUNK:
return String.format(Locale.US, "Chunk: (%d, %d), %d blocks away ", x, z, distance);
return I18n.get("location_blocks",fourfour_x + 4, fourfour_z + 4, distance);
default:
break;
}
return String.format(Locale.US, "Chunk: (%d, %d), %d blocks away ", x, z, distance);
if (key.equals(NinjabrainBotPreferences.CHUNK)) {
return String.format(Locale.US, I18n.get("chunk_blocks"), x, z, distance);
}
return String.format(Locale.US, I18n.get("chunk_blocks"), x, z, distance);
}

public String formatLocation() {
switch (Main.preferences.strongholdDisplayType.get()) {
final String key = Main.preferences.strongholdDisplayType.get();
switch (key) {
case NinjabrainBotPreferences.FOURFOUR:
return String.format(Locale.US, "(%d, %d)", fourfour_x, fourfour_z);
case NinjabrainBotPreferences.EIGHTEIGHT:
return String.format(Locale.US, "(%d, %d)", fourfour_x + 4, fourfour_z + 4);
case NinjabrainBotPreferences.CHUNK:
default:
break;
}
if (key.equals(NinjabrainBotPreferences.CHUNK)) {
return String.format(Locale.US, "(%d, %d)", x, z);
}
return String.format(Locale.US, "(%d, %d)", x, z);
Expand Down