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

Read Mekset as UTF8 #6087

Merged
merged 2 commits into from
Oct 12, 2024
Merged

Read Mekset as UTF8 #6087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05b7d92
fix diacritics lookup: read the mekset as UTF 8
SJuliez Oct 11, 2024
281736f
fix mekset error
SJuliez Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions megamek/data/images/units/mekset.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1323,9 +1323,9 @@ exact "Tornado PA(L) G13 [Small Laser](Sqd5)" "battle armor/TornadoPAL_5.png"
exact "Tornado PA(L) G14(Sqd5)" "battle armor/TornadoPAL_5.png"
exact "Tornado PA(L) G17(Sqd5)" "battle armor/TornadoPAL_5.png"
exact "Tornado PA(L) P12 'Hurricane'(Sqd5)" "battle armor/TornadoPAL_5.png"
exact "Hurricane PA(L) P17 'Hurricane'(Sqd6) "battle armor/TornadoPAL_6.png"
exact "Hurricane PA(L) P17 'Hurricane'(Sqd4) "battle armor/TornadoPAL_4.png"
exact "Hurricane PA(L) P17 'Hurricane'(Sqd5) "battle armor/TornadoPAL_5.png"
exact "Hurricane PA(L) P17 'Hurricane'(Sqd6)" "battle armor/TornadoPAL_6.png"
exact "Hurricane PA(L) P17 'Hurricane'(Sqd4)" "battle armor/TornadoPAL_4.png"
exact "Hurricane PA(L) P17 'Hurricane'(Sqd5)" "battle armor/TornadoPAL_5.png"
#Tortoise_II
chassis "Tortoise II" "battle armor/TortoiseII_4.png"
exact "Tortoise II (aSRM)(Sqd4)" "battle armor/TortoiseII_4.png"
Expand Down
129 changes: 65 additions & 64 deletions megamek/src/megamek/client/ui/swing/tileset/MekTileset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@
import java.io.FileReader;
import java.io.IOException;
import java.io.Reader;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Objects;

import megamek.common.*;
Expand Down Expand Up @@ -203,18 +205,17 @@
*/
public MekEntry entryFor(Entity entity, int secondaryPos) {
// Some entities (QuadVees, LAMs) use different sprites depending on mode.
String mode = entity.getTilesetModeString().toUpperCase();

String mode = entity.getTilesetModeString().toUpperCase(Locale.ROOT);
String addendum = (secondaryPos == -1) ? "" : "_" + secondaryPos;

// first, check for exact matches
if (exact.containsKey(entity.getShortNameRaw().toUpperCase() + mode + addendum)) {
return exact.get(entity.getShortNameRaw().toUpperCase() + mode + addendum);
if (exact.containsKey(entity.getShortNameRaw().toUpperCase(Locale.ROOT) + mode + addendum)) {
return exact.get(entity.getShortNameRaw().toUpperCase(Locale.ROOT) + mode + addendum);
}

// second, check for chassis matches
if (chassis.containsKey(entity.getFullChassis().toUpperCase() + mode + addendum)) {
return chassis.get(entity.getFullChassis().toUpperCase() + mode + addendum);
if (chassis.containsKey(entity.getFullChassis().toUpperCase(Locale.ROOT) + mode + addendum)) {
return chassis.get(entity.getFullChassis().toUpperCase(Locale.ROOT) + mode + addendum);
}

// last, the generic model
Expand Down Expand Up @@ -367,7 +368,7 @@

public void loadFromFile(String filename) throws IOException {
logger.info("Loading unit icons from {}", filename);
try (Reader r = new BufferedReader(new FileReader(new MegaMekFile(dir, filename).getFile()))) {
try (Reader r = new BufferedReader(new FileReader(new MegaMekFile(dir, filename).getFile(), StandardCharsets.UTF_8))) {
StandardTextfileStreamTokenizer tokenizer = new StandardTextfileStreamTokenizer(r);
while (true) {
List<String> tokens = tokenizer.getLineTokens();
Expand All @@ -381,74 +382,74 @@
logger.error("... failed: {}.", e.getMessage(), e);
}
} else if (tokens.get(0).equals(CHASSIS_KEY)) {
chassis.put(tokens.get(1).toUpperCase(), new MekEntry(tokens.get(2)));
chassis.put(tokens.get(1).toUpperCase(Locale.ROOT), new MekEntry(tokens.get(2)));
} else {
exact.put(tokens.get(1).toUpperCase(), new MekEntry(tokens.get(2)));
exact.put(tokens.get(1).toUpperCase(Locale.ROOT), new MekEntry(tokens.get(2)));
}
} else {
logger.warn("Malformed line in {}: {}", filename, tokens.toString());
}
}
}

default_ultra_light = exact.get(ULTRA_LIGHT_STRING.toUpperCase());
default_light = exact.get(LIGHT_STRING.toUpperCase());
default_medium = exact.get(MEDIUM_STRING.toUpperCase());
default_heavy = exact.get(HEAVY_STRING.toUpperCase());
default_assault = exact.get(ASSAULT_STRING.toUpperCase());
default_super_heavy_mek = exact.get(SUPER_HEAVY_MEK_STRING.toUpperCase());
default_quad = exact.get(QUAD_STRING.toUpperCase());
default_quadvee = exact.get(QUADVEE_STRING.toUpperCase());
default_quadvee_vehicle = exact.get(QUADVEE_VEHICLE_STRING.toUpperCase());
default_lam_mek = exact.get(LAM_MEK_STRING.toUpperCase());
default_lam_airmek = exact.get(LAM_AIRMEK_STRING.toUpperCase());
default_lam_fighter = exact.get(LAM_FIGHTER_STRING.toUpperCase());
default_tripod = exact.get(TRIPOD_STRING.toUpperCase());
default_tracked = exact.get(TRACKED_STRING.toUpperCase());
default_tracked_heavy = exact.get(TRACKED_HEAVY_STRING.toUpperCase());
default_tracked_assault = exact.get(TRACKED_ASSAULT_STRING.toUpperCase());
default_wheeled = exact.get(WHEELED_STRING.toUpperCase());
default_wheeled_heavy = exact.get(WHEELED_HEAVY_STRING.toUpperCase());
default_hover = exact.get(HOVER_STRING.toUpperCase());
default_naval = exact.get(NAVAL_STRING.toUpperCase());
default_submarine = exact.get(SUBMARINE_STRING.toUpperCase());
default_hydrofoil = exact.get(HYDROFOIL_STRING.toUpperCase());
default_vtol = exact.get(VTOL_STRING.toUpperCase());
default_inf = exact.get(INF_STRING.toUpperCase());
default_ba = exact.get(BA_STRING.toUpperCase());
default_proto = exact.get(PROTO_STRING.toUpperCase());
default_gun_emplacement = exact.get(GUN_EMPLACEMENT_STRING.toUpperCase());
default_wige = exact.get(WIGE_STRING.toUpperCase());
default_aero = exact.get(AERO_STRING.toUpperCase());
default_small_craft_aero = exact.get(SMALL_CRAFT_AERO_STRING.toUpperCase());
default_dropship_aero = exact.get(DROPSHIP_AERO_STRING.toUpperCase());
default_dropship_aero_0 = exact.get(DROPSHIP_AERO_STRING_0.toUpperCase());
default_dropship_aero_1 = exact.get(DROPSHIP_AERO_STRING_1.toUpperCase());
default_dropship_aero_2 = exact.get(DROPSHIP_AERO_STRING_2.toUpperCase());
default_dropship_aero_3 = exact.get(DROPSHIP_AERO_STRING_3.toUpperCase());
default_dropship_aero_4 = exact.get(DROPSHIP_AERO_STRING_4.toUpperCase());
default_dropship_aero_5 = exact.get(DROPSHIP_AERO_STRING_5.toUpperCase());
default_dropship_aero_6 = exact.get(DROPSHIP_AERO_STRING_6.toUpperCase());
default_small_craft_sphere = exact.get(SMALL_CRAFT_SPHERE_STRING.toUpperCase());
default_dropship_sphere = exact.get(DROPSHIP_SPHERE_STRING.toUpperCase());
default_dropship_sphere_0 = exact.get(DROPSHIP_SPHERE_STRING_0.toUpperCase());
default_dropship_sphere_1 = exact.get(DROPSHIP_SPHERE_STRING_1.toUpperCase());
default_dropship_sphere_2 = exact.get(DROPSHIP_SPHERE_STRING_2.toUpperCase());
default_dropship_sphere_3 = exact.get(DROPSHIP_SPHERE_STRING_3.toUpperCase());
default_dropship_sphere_4 = exact.get(DROPSHIP_SPHERE_STRING_4.toUpperCase());
default_dropship_sphere_5 = exact.get(DROPSHIP_SPHERE_STRING_5.toUpperCase());
default_dropship_sphere_6 = exact.get(DROPSHIP_SPHERE_STRING_6.toUpperCase());
default_jumpship = exact.get(JUMPSHIP_STRING.toUpperCase());
default_warship = exact.get(WARSHIP_STRING.toUpperCase());
default_space_station = exact.get(SPACE_STATION_STRING.toUpperCase());
default_fighter_squadron = exact.get(FIGHTER_SQUADRON_STRING.toUpperCase());
default_tele_missile = exact.get(TELE_MISSILE_STRING.toUpperCase());
default_unknown = exact.get(UNKNOWN_STRING.toUpperCase());
default_ultra_light = exact.get(ULTRA_LIGHT_STRING.toUpperCase(Locale.ROOT));
default_light = exact.get(LIGHT_STRING.toUpperCase(Locale.ROOT));
default_medium = exact.get(MEDIUM_STRING.toUpperCase(Locale.ROOT));
default_heavy = exact.get(HEAVY_STRING.toUpperCase(Locale.ROOT));
default_assault = exact.get(ASSAULT_STRING.toUpperCase(Locale.ROOT));
default_super_heavy_mek = exact.get(SUPER_HEAVY_MEK_STRING.toUpperCase(Locale.ROOT));
default_quad = exact.get(QUAD_STRING.toUpperCase(Locale.ROOT));
default_quadvee = exact.get(QUADVEE_STRING.toUpperCase(Locale.ROOT));
default_quadvee_vehicle = exact.get(QUADVEE_VEHICLE_STRING.toUpperCase(Locale.ROOT));
default_lam_mek = exact.get(LAM_MEK_STRING.toUpperCase(Locale.ROOT));
default_lam_airmek = exact.get(LAM_AIRMEK_STRING.toUpperCase(Locale.ROOT));
default_lam_fighter = exact.get(LAM_FIGHTER_STRING.toUpperCase(Locale.ROOT));
default_tripod = exact.get(TRIPOD_STRING.toUpperCase(Locale.ROOT));
default_tracked = exact.get(TRACKED_STRING.toUpperCase(Locale.ROOT));
default_tracked_heavy = exact.get(TRACKED_HEAVY_STRING.toUpperCase(Locale.ROOT));
default_tracked_assault = exact.get(TRACKED_ASSAULT_STRING.toUpperCase(Locale.ROOT));
default_wheeled = exact.get(WHEELED_STRING.toUpperCase(Locale.ROOT));
default_wheeled_heavy = exact.get(WHEELED_HEAVY_STRING.toUpperCase(Locale.ROOT));
default_hover = exact.get(HOVER_STRING.toUpperCase(Locale.ROOT));
default_naval = exact.get(NAVAL_STRING.toUpperCase(Locale.ROOT));
default_submarine = exact.get(SUBMARINE_STRING.toUpperCase(Locale.ROOT));
default_hydrofoil = exact.get(HYDROFOIL_STRING.toUpperCase(Locale.ROOT));
default_vtol = exact.get(VTOL_STRING.toUpperCase(Locale.ROOT));
default_inf = exact.get(INF_STRING.toUpperCase(Locale.ROOT));
default_ba = exact.get(BA_STRING.toUpperCase(Locale.ROOT));
default_proto = exact.get(PROTO_STRING.toUpperCase(Locale.ROOT));
default_gun_emplacement = exact.get(GUN_EMPLACEMENT_STRING.toUpperCase(Locale.ROOT));
default_wige = exact.get(WIGE_STRING.toUpperCase(Locale.ROOT));
default_aero = exact.get(AERO_STRING.toUpperCase(Locale.ROOT));
default_small_craft_aero = exact.get(SMALL_CRAFT_AERO_STRING.toUpperCase(Locale.ROOT));
default_dropship_aero = exact.get(DROPSHIP_AERO_STRING.toUpperCase(Locale.ROOT));
default_dropship_aero_0 = exact.get(DROPSHIP_AERO_STRING_0.toUpperCase(Locale.ROOT));
default_dropship_aero_1 = exact.get(DROPSHIP_AERO_STRING_1.toUpperCase(Locale.ROOT));
default_dropship_aero_2 = exact.get(DROPSHIP_AERO_STRING_2.toUpperCase(Locale.ROOT));
default_dropship_aero_3 = exact.get(DROPSHIP_AERO_STRING_3.toUpperCase(Locale.ROOT));
default_dropship_aero_4 = exact.get(DROPSHIP_AERO_STRING_4.toUpperCase(Locale.ROOT));
default_dropship_aero_5 = exact.get(DROPSHIP_AERO_STRING_5.toUpperCase(Locale.ROOT));
default_dropship_aero_6 = exact.get(DROPSHIP_AERO_STRING_6.toUpperCase(Locale.ROOT));
default_small_craft_sphere = exact.get(SMALL_CRAFT_SPHERE_STRING.toUpperCase(Locale.ROOT));
default_dropship_sphere = exact.get(DROPSHIP_SPHERE_STRING.toUpperCase(Locale.ROOT));
default_dropship_sphere_0 = exact.get(DROPSHIP_SPHERE_STRING_0.toUpperCase(Locale.ROOT));
default_dropship_sphere_1 = exact.get(DROPSHIP_SPHERE_STRING_1.toUpperCase(Locale.ROOT));
default_dropship_sphere_2 = exact.get(DROPSHIP_SPHERE_STRING_2.toUpperCase(Locale.ROOT));
default_dropship_sphere_3 = exact.get(DROPSHIP_SPHERE_STRING_3.toUpperCase(Locale.ROOT));
default_dropship_sphere_4 = exact.get(DROPSHIP_SPHERE_STRING_4.toUpperCase(Locale.ROOT));
default_dropship_sphere_5 = exact.get(DROPSHIP_SPHERE_STRING_5.toUpperCase(Locale.ROOT));
default_dropship_sphere_6 = exact.get(DROPSHIP_SPHERE_STRING_6.toUpperCase(Locale.ROOT));
default_jumpship = exact.get(JUMPSHIP_STRING.toUpperCase(Locale.ROOT));
default_warship = exact.get(WARSHIP_STRING.toUpperCase(Locale.ROOT));
default_space_station = exact.get(SPACE_STATION_STRING.toUpperCase(Locale.ROOT));
default_fighter_squadron = exact.get(FIGHTER_SQUADRON_STRING.toUpperCase(Locale.ROOT));
default_tele_missile = exact.get(TELE_MISSILE_STRING.toUpperCase(Locale.ROOT));
default_unknown = exact.get(UNKNOWN_STRING.toUpperCase(Locale.ROOT));
}

boolean hasOnlyChassisMatch(Entity entity) {
return !exact.containsKey(entity.getShortNameRaw().toUpperCase())
&& chassis.containsKey(entity.getShortNameRaw().toUpperCase());
return !exact.containsKey(entity.getShortNameRaw().toUpperCase(Locale.ROOT))
&& chassis.containsKey(entity.getShortNameRaw().toUpperCase(Locale.ROOT));
}

/**
Expand All @@ -472,7 +473,7 @@
File fin = new MegaMekFile(dir, imageFile).getFile();
image = ImageUtil.loadImageFromFile(fin.toString());
if (image == null) {
logger.warn("Received null image from ImageUtil.loadImageFromFile! File: %s", fin);

Check failure

Code scanning / CodeQL

Insertion of sensitive information into log files High

This
potentially sensitive information
Loading
is written to a log file.
}
}
}
Expand Down
Loading