Skip to content

Commit a17574a

Browse files
DiscreaterDream-Masterboubou19
authored
Improve localization for loading progress messages in GregTech (#6353)
Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: boubou19 <miisterunknown@gmail.com>
1 parent 633b923 commit a17574a

3 files changed

Lines changed: 11 additions & 5 deletions

File tree

src/main/java/bwcrossmod/cls/CLSCompat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public static void updateDisplay(Werkstoff werkstoff, int pos) {
3535
if (time - lastUpdate >= MINIMAL_UPDATE_INTERVAL) {
3636
try {
3737
ProgressDisplayer
38-
.displayProgress(werkstoff.getDefaultName(), (float) pos / Werkstoff.werkstoffHashSet.size());
38+
.displayProgress(werkstoff.getLocalizedName(), (float) pos / Werkstoff.werkstoffHashSet.size());
3939
} catch (IOException e) {
4040
throw new RuntimeException(e);
4141
}

src/main/java/gregtech/api/util/GTCLSCompat.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@
77
import java.util.function.Consumer;
88
import java.util.function.Function;
99

10+
import net.minecraft.util.StatCollector;
11+
1012
import alexiil.mods.load.MinecraftDisplayer;
1113
import alexiil.mods.load.ProgressDisplayer;
1214
import cpw.mods.fml.common.ProgressManager;
1315
import gregtech.GTMod;
1416
import gregtech.api.enums.Materials;
17+
import gregtech.api.interfaces.IOreMaterial;
1518
import gregtech.common.OreDictEventContainer;
1619
import gregtech.loaders.postload.GTPostLoad;
1720

@@ -88,7 +91,7 @@ public static void stepMaterialsCLS(Collection<OreDictEventContainer> mEvents,
8891
"GregTech materials",
8992
mEvents,
9093
progressBar,
91-
m -> m.mMaterial,
94+
m -> m.mMaterial.getLocalizedName(),
9295
OreDictEventContainer::registerRecipes);
9396
ProgressManager.pop(progressBar);
9497
MinecraftDisplayer.isRegisteringGTmaterials = false;
@@ -101,15 +104,16 @@ public static void doActualRegistrationCLS(ProgressManager.ProgressBar progressB
101104
"Vanilla materials",
102105
replacedVanillaItemsSet,
103106
progressBar,
104-
m -> m.mDefaultLocalName,
107+
IOreMaterial::getLocalizedName,
105108
GTPostLoad::doActualRegistration);
106109
}
107110

108111
public static void pushToDisplayProgress() {
109112
MinecraftDisplayer.isReplacingVanillaMaterials = false;
110113
try {
111-
ProgressDisplayer
112-
.displayProgress("Post Initialization: loading GregTech", MinecraftDisplayer.getLastPercent());
114+
ProgressDisplayer.displayProgress(
115+
StatCollector.translateToLocal("gt.loading.progress.post-init.loading-gt"),
116+
MinecraftDisplayer.getLastPercent());
113117
} catch (IOException e) {
114118
GTMod.GT_FML_LOGGER.error("Exception caught when updating loading screen", e);
115119
}

src/main/resources/assets/gregtech/lang/en_US.lang

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8822,6 +8822,8 @@ gt.item.gravitational_lens.tooltip=Portable gravitational well
88228822
gt.item.planck_manifold.name=Planck-Scale Manifold
88238823
gt.item.planck_manifold.tooltip=The smallest there can be
88248824

8825+
gt.loading.progress.post_init.loading_gt=Post Initialization: loading GregTech
8826+
88258827
# BEC Meta Materials
88268828
gt.item.meta_material.energy_conduit.perfected.name=Perfected Energy Conduit
88278829
gt.item.meta_material.energy_conduit.primitive.name=Primitive Energy Conduit

0 commit comments

Comments
 (0)