Lang Refactor#3246
Conversation
…yo/space-tooltip-refactor # Conflicts: # src/generated/resources/assets/gtceu/lang/en_ud.json # src/generated/resources/assets/gtceu/lang/en_us.json # src/main/java/com/gregtechceu/gtceu/api/cover/filter/TagFilter.java # src/main/java/com/gregtechceu/gtceu/api/machine/SimpleTieredMachine.java # src/main/java/com/gregtechceu/gtceu/client/TooltipsHandler.java # src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java # src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java # src/main/java/com/gregtechceu/gtceu/common/data/machines/GTResearchMachines.java # src/main/java/com/gregtechceu/gtceu/common/machine/electric/BlockBreakerMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/electric/FisherMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/electric/ItemCollectorMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/electric/MinerMachine.java # src/main/java/com/gregtechceu/gtceu/data/lang/ArmorLang.java # src/main/java/com/gregtechceu/gtceu/data/lang/CommandLang.java # src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java # src/main/java/com/gregtechceu/gtceu/data/lang/MaterialLang.java
…chCEu/GregTech-Modern into yo/space-tooltip-refactor # Conflicts: # src/main/java/com/gregtechceu/gtceu/data/lang/ConfigurationLang.java # src/main/java/com/gregtechceu/gtceu/data/lang/CoverLang.java
4679868 to
d7a80ec
Compare
7ed21a9 to
aacf2e3
Compare
… into yo/space-tooltip-refactor # Conflicts: # src/generated/resources/assets/gtceu/lang/en_ud.json # src/generated/resources/assets/gtceu/lang/en_us.json # src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java
| * @param key Base key of the multi lang. E.g. "terminal.fluid_prospector.tier". | ||
| * @return Returns all translation components from a multi lang's sub-keys | ||
| */ | ||
| public static List<MutableComponent> getMultiLang(String key) { |
There was a problem hiding this comment.
if you change this to return a Component[] you won't need to call toArray(Component[]::new) every time you use it :3
There was a problem hiding this comment.
you can also keep the original method and just add a wrapper that does the array conversion
| var damage = getPartDamage(stack); | ||
| tooltipComponents | ||
| .add(Component.translatable("metaitem.tool.tooltip.durability", maxDurability - damage, maxDurability)); | ||
| .add(Component.translatable("item.tool.tooltip.durability", maxDurability - damage, maxDurability)); |
There was a problem hiding this comment.
yes its only used by TurbineRotorBehavior anyways
|
all of the already resolved comments are me marking what I'd like stuff be changed to later, you can ignore them for now if you so choose |
screret
left a comment
There was a problem hiding this comment.
oh, before I forget:
change the recipe type lang keys to recipe_type.gtceu.type, because currently they're just gtceu.type, which is probably the worst possible design decision.
you could put then in the new pr when we make it :) |
…ategory lang, coil lang formatting, spotless
…large boiler tooltips, start tooltips for multiblocks
Co-authored-by: screret <68943070+screret@users.noreply.github.com>
…factor # Conflicts: # gradle/forge.versions.toml # src/generated/resources/assets/gtceu/lang/en_ud.json # src/generated/resources/assets/gtceu/lang/en_us.json # src/main/java/com/gregtechceu/gtceu/api/block/PipeBlock.java # src/main/java/com/gregtechceu/gtceu/api/capability/IPropertyFluidFilter.java # src/main/java/com/gregtechceu/gtceu/api/item/IGTTool.java # src/main/java/com/gregtechceu/gtceu/api/item/PipeBlockItem.java # src/main/java/com/gregtechceu/gtceu/api/item/component/ThermalFluidStats.java # src/main/java/com/gregtechceu/gtceu/api/machine/SimpleTieredMachine.java # src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipeType.java # src/main/java/com/gregtechceu/gtceu/api/registry/registrate/GTRegistrate.java # src/main/java/com/gregtechceu/gtceu/client/TooltipsHandler.java # src/main/java/com/gregtechceu/gtceu/common/CommonProxy.java # src/main/java/com/gregtechceu/gtceu/common/block/CoilBlock.java # src/main/java/com/gregtechceu/gtceu/common/block/FluidPipeBlock.java # src/main/java/com/gregtechceu/gtceu/common/block/LaserPipeBlock.java # src/main/java/com/gregtechceu/gtceu/common/block/OpticalPipeBlock.java # src/main/java/com/gregtechceu/gtceu/common/data/GCYMRecipeTypes.java # src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java # src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java # src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeTypes.java # src/main/java/com/gregtechceu/gtceu/common/data/machines/GCYMMachines.java # src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMachineUtils.java # src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMultiMachines.java # src/main/java/com/gregtechceu/gtceu/common/data/machines/GTResearchMachines.java # src/main/java/com/gregtechceu/gtceu/common/item/armor/NanoMuscleSuite.java # src/main/java/com/gregtechceu/gtceu/common/item/armor/QuarkTechSuite.java # src/main/java/com/gregtechceu/gtceu/common/machine/electric/BlockBreakerMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/electric/ConverterMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/electric/FisherMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/electric/ItemCollectorMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/electric/MinerMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/electric/TransformerMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/electric/WorldAcceleratorMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/DiodePartMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/storage/DrumMachine.java # src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java # src/main/java/com/gregtechceu/gtceu/core/mixins/top/ConfigMixin.java # src/main/java/com/gregtechceu/gtceu/data/GregTechDatagen.java # src/main/java/com/gregtechceu/gtceu/data/lang/BlockLang.java # src/main/java/com/gregtechceu/gtceu/data/lang/ConfigurationLang.java # src/main/java/com/gregtechceu/gtceu/data/lang/IntegrationLang.java # src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java # src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java # src/main/java/com/gregtechceu/gtceu/data/lang/MachineLang.java # src/main/java/com/gregtechceu/gtceu/data/lang/MaterialLangGenerator.java # src/main/java/com/gregtechceu/gtceu/data/lang/ToolLang.java # src/main/java/com/gregtechceu/gtceu/integration/jade/provider/SteamBoilerBlockProvider.java # src/main/java/com/gregtechceu/gtceu/integration/top/provider/HazardCleanerInfoProvider.java # src/main/java/com/gregtechceu/gtceu/integration/top/provider/SteamBoilerInfoProvider.java # src/main/resources/assets/gtceu/lang/ja_jp.json # src/main/resources/assets/gtceu/lang/ru_ru.json # src/main/resources/assets/gtceu/lang/uk_ua.json # src/main/resources/assets/gtceu/lang/zh_cn.json # src/main/resources/assets/gtceu/lang/zh_tw.json # src/main/resources/gtceu.mixins.json



What
Refactors a majority of where we generate lang keys.
Implementation Details
Removed all of the lang generated values from LangHandler, and moved them into dedicated classes, went through each class and sectioned each lang by relation to each other.
Outcome
The overall structure should be easier to navigate where a lang key would be. All language keys should be intact.
Fixed some minor lang keys, will comb through all lang keys in a later pr