Conversation
# Conflicts: # src/main/java/bartworks/common/tileentities/tiered/MTECompressedFluidHatch.java # src/main/java/bartworks/common/tileentities/tiered/MTEHumongousInputHatch.java # src/main/java/bartworks/system/material/BWMetaGeneratedBlocks.java # src/main/java/bartworks/system/material/BWMetaGeneratedItems.java # src/main/java/bartworks/system/material/BWMetaGeneratedOres.java # src/main/java/bartworks/system/material/BWMetaGeneratedSmallOres.java # src/main/java/bartworks/system/material/BWMetaGeneratedWerkstoffBlocks.java # src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java # src/main/java/detrav/net/ProspectingPacket.java # src/main/java/goodgenerator/blocks/tileEntity/AntimatterOutputHatch.java # src/main/java/gregtech/api/enums/Materials.java # src/main/java/gregtech/api/enums/MaterialsBotania.java # src/main/java/gregtech/api/items/MetaGeneratedItemX32.java # src/main/java/gregtech/api/metatileentity/CommonMetaTileEntity.java # src/main/java/gregtech/api/metatileentity/implementations/MTEHatchInput.java # src/main/java/gregtech/api/metatileentity/implementations/MTEHatchInputBus.java # src/main/java/gregtech/api/metatileentity/implementations/MTEHatchOutputBus.java # src/main/java/gregtech/api/metatileentity/implementations/MTEHatchVoidBus.java # src/main/java/gregtech/api/util/GTUtility.java # src/main/java/gregtech/common/OreMixBuilder.java # src/main/java/gregtech/common/blocks/BlockConcretes.java # src/main/java/gregtech/common/blocks/BlockFrameBox.java # src/main/java/gregtech/common/blocks/BlockMetal.java # src/main/java/gregtech/common/blocks/BlockOresAbstract.java # src/main/java/gregtech/common/blocks/BlockReinforced.java # src/main/java/gregtech/common/blocks/ItemOres.java # src/main/java/gregtech/common/items/MetaGeneratedItem03.java # src/main/java/gregtech/common/items/MetaGeneratedItem99.java # src/main/java/gregtech/common/items/behaviors/BehaviourProspecting.java # src/main/java/gregtech/common/tileentities/machines/MTEHatchInputBusME.java # src/main/java/gregtech/common/tileentities/machines/MTEHatchInputME.java # src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java # src/main/java/gtPlusPlus/core/item/circuit/GTPPIntegratedCircuitItem.java # src/main/java/gtPlusPlus/core/material/Material.java # src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java # src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GTPPMTEFluidPipe.java # src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchChiselBus.java # src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchDynamoBuffer.java # src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSolidifier.java # src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSteamBusOutput.java # src/main/java/gtneioreplugin/plugin/gregtech5/PluginGT5Base.java # src/main/java/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java # src/main/java/gtneioreplugin/util/GT5OreLayerHelper.java # src/main/resources/assets/gregtech/lang/en_US.lang
# Conflicts: # src/main/java/gregtech/api/util/GTUtility.java
# Conflicts: # src/main/resources/assets/gregtech/lang/en_US.lang
src/main/java/bartworks/common/tileentities/multis/MTEDeepEarthHeatingPump.java
Outdated
Show resolved
Hide resolved
src/main/java/bartworks/common/tileentities/tiered/MTEDiode.java
Outdated
Show resolved
Hide resolved
...ain/java/bartworks/system/material/werkstoff_loaders/registration/BridgeMaterialsLoader.java
Outdated
Show resolved
Hide resolved
src/main/java/gregtech/common/tileentities/generators/MTEMagicalEnergyAbsorber.java
Show resolved
Hide resolved
src/main/java/gregtech/common/tileentities/storage/MTEDigitalTankBase.java
Outdated
Show resolved
Hide resolved
| public String getLocalizedName() { | ||
| if (materialKeys.size() == 1) return StatCollector.translateToLocal(materialKeys.get(0)); | ||
| String localizedName = String.join( | ||
| ", ", | ||
| materialKeys.stream() | ||
| .map(StatCollector::translateToLocal) | ||
| .toArray(String[]::new)); | ||
| int index = localizedName.lastIndexOf(", "); | ||
| if (index != -1) { | ||
| localizedName = localizedName.substring(0, index) + " & " + localizedName.substring(index + 2); | ||
| } | ||
| return localizedName; | ||
| } |
There was a problem hiding this comment.
This is generally a bad idea, since different languages have different rules for making a list of items. (There's no ampersand in Russian, for instance.)
Also, don't all the ore mixes already have their own translation strings added with .name()? What's this text used for?
There was a problem hiding this comment.
Solutions:
- Hardcoded.
- Add 2 translation keys
- Use the ListFormatter from ICU4J, but the icu4j-core-mojang-51.2.jar from vanilla can't use it, needs updating and shadow jar.
- Only supports Java 22+, use the ListFormat.
|
Once #5210 is merged, I think we can change all the chemical formulas that contain text in them to be lore text instead. That way, there's no need to localize chemical formulas and we have logical separation between text & chemistry. |
...in/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineBase.java
Outdated
Show resolved
Hide resolved
.../java/gregtech/common/tileentities/machines/multi/MTEIndustrialElectromagneticSeparator.java
Show resolved
Hide resolved
...regtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPhAdjustment.java
Show resolved
Hide resolved
src/main/java/gtPlusPlus/core/item/circuit/GTPPIntegratedCircuitItem.java
Outdated
Show resolved
Hide resolved
src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPDrop.java
Outdated
Show resolved
Hide resolved
src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPPropolis.java
Outdated
Show resolved
Hide resolved
these lore texts seem hardcoded. |
the lore text is hardcoded, feel free to add localization, i thought that translating them would change the vibe of the quotes, so i left them in english only |
Translating anything inevitably change the vibe, it may be more appropriate for the translator, rather than yourself, to make the decision on whether to keep the original text, especially for a sentence like this. |
# Conflicts: # src/main/java/gregtech/api/enums/MaterialBuilder.java # src/main/java/gregtech/api/enums/Materials.java # src/main/java/gregtech/api/items/MetaGeneratedItemX32.java # src/main/java/gregtech/common/blocks/BlockFrameBox.java # src/main/java/gregtech/common/items/MetaGeneratedItem99.java # src/main/java/gregtech/loaders/materials/MaterialsInit.java
Discreater
left a comment
There was a problem hiding this comment.
LGTM. Tested in sp & mp. However, I feel that my review alone might not be sufficient. Since GTUtility.trans no longer automatically adds keys, any entries that haven't been localized via addStringLocalization will only display their raw keys. We might need manual testing to identify these cases.
# Conflicts: # src/main/java/gregtech/api/enums/GTValues.java # src/main/java/gregtech/common/tileentities/machines/MTEHatchInputBusME.java # src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java
# Conflicts: # src/main/java/gregtech/api/items/BlockLongDistancePipe.java # src/main/java/gregtech/api/util/GTLanguageManager.java # src/main/java/gregtech/api/util/tooltip/TooltipHelper.java # src/main/resources/assets/gregtech/lang/en_US.lang
|
@iouter can you resolve the merge conflicts? Btw what is the status of this pr? |
# Conflicts: # src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTETieredTank.java # src/main/resources/assets/gregtech/lang/en_US.lang # src/main/resources/assets/miscutils/lang/en_US.lang
done. waiting for more review i guess. |
# Conflicts: # src/main/java/bartworks/common/tileentities/tiered/MTEDiode.java # src/main/java/gregtech/api/enums/GTValues.java # src/main/resources/assets/gregtech/lang/en_US.lang

Line Breaks
Material
Oreprefixes
Fluids
Machines
Authors
GTLanguagerManger (GregTech.lang)
Migration
Language Files Result
Sub-PR