Skip to content

Lang Refactor - #3246

Draft
Spicierspace153 wants to merge 53 commits into
1.20.1from
yo/space-tooltip-refactor
Draft

Spicierspace153 wants to merge 53 commits into
1.20.1from
yo/space-tooltip-refactor

Conversation

@Spicierspace153

@Spicierspace153 Spicierspace153 commented Jun 20, 2025 •

Copy link
Copy Markdown
Contributor

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

YoungOnionMC and others added 14 commits June 19, 2025 19:19
…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
@Spicierspace153
Spicierspace153 requested a review from a team as a code owner June 20, 2025 07:47
@Spicierspace153
Spicierspace153 marked this pull request as draft June 20, 2025 07:47
@JuiceyBeans JuiceyBeans mentioned this pull request Jun 20, 2025
@YoungOnionMC
YoungOnionMC force-pushed the yo/space-tooltip-refactor branch from 4679868 to d7a80ec Compare June 22, 2025 07:45
@YoungOnionMC
YoungOnionMC force-pushed the yo/space-tooltip-refactor branch from 7ed21a9 to aacf2e3 Compare June 23, 2025 05:59
… 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
@YoungOnionMC YoungOnionMC changed the title lang key refactor of doom Lang Refactor Jun 23, 2025
@YoungOnionMC YoungOnionMC added the type: refactor Suggestion to refactor a section of code label Jun 23, 2025
@Spicierspace153
Spicierspace153 marked this pull request as ready for review June 24, 2025 20:36
@YoungOnionMC

Copy link
Copy Markdown
Member

Seems we could, we'd jsut have to change ti from e.g.
@Configurable.Comment("Config options for Tools and Armor")
to
@Configurable.Comment(value = "gtceu.config.armor", localize = true)

@jurrejelle

Copy link
Copy Markdown
Contributor
image

gustovafing and others added 4 commits July 22, 2026 17:52
Co-authored-by: Jurre Groenendijk <jurre@jilles.com>
Co-authored-by: screret <68943070+screret@users.noreply.github.com>
Co-authored-by: YoungOnion <39562198+YoungOnionMC@users.noreply.github.com>
Co-authored-by: YoungOnionMC <youngonionmc@gmail.com>
Co-authored-by: Spicierspace153 <21964509+Spicierspace153@users.noreply.github.com>
Co-authored-by: NegaNote <neganote43@gmail.com>
Co-authored-by: TechLord22 <37029404+TechLord22@users.noreply.github.com>
Co-authored-by: Ghostipedia / Caitlynn <46772882+Ghostipedia@users.noreply.github.com>
Co-authored-by: zetrock1 <144679746+zetrock1@users.noreply.github.com>
Co-authored-by: Ghzdude <44148655+ghzdude@users.noreply.github.com>
Co-authored-by: PureBluez <notpurebluez@gmail.com>
Co-authored-by: brachy <45517902+brachy84@users.noreply.github.com>
Co-authored-by: Tar Laboratories <159147059+TarLaboratories@users.noreply.github.com>
Co-authored-by: Phoenixvine <82596737+Phoenixvine32908@users.noreply.github.com>
Co-authored-by: Bernd <133775547+bernd-sbr@users.noreply.github.com>
Co-authored-by: Mqrius <Nuntius.Marii@Gmail.com>
Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com>
Co-authored-by: Vertyx <therealxkorpion@gmail.com>
Co-authored-by: GreenSkiy <162062941+GreenSkiy@users.noreply.github.com>
Co-authored-by: carbonatek <78877330+carbonatek@users.noreply.github.com>
Co-authored-by: htmlcsjs <46023024+htmlcsjs@users.noreply.github.com>
Co-authored-by: 暮心 <97760035+MuuuShin@users.noreply.github.com>
Co-authored-by: DilithiumThoride <lilithiumathena@gmail.com>
Co-authored-by: dirtcakemc <263226911+dirtcakemc@users.noreply.github.com>
Co-authored-by: 楓 <r0yalist@outlook.com>
Co-authored-by: n1xx1 <me@simonemiraglia.it>
Co-authored-by: TonyCrane <tonycrane@foxmail.com>
Co-authored-by: TarLaboratories <levtaranov3@gmail.com>
Co-authored-by: Oktawia <62563806+GilbertzRivi@users.noreply.github.com>
Co-authored-by: Karthi <75553966+JuiceyBeans@users.noreply.github.com>
Co-authored-by: Ghostipedia <Ghostipedia@gmail.com>
Co-authored-by: Vykonn <79595583+Vykonn@users.noreply.github.com>
Co-authored-by: Jambon123 <68718646+Jambon123@users.noreply.github.com>
Co-authored-by: lolmat13 <b.moya.c09@gmail.com>
Co-authored-by: Reabstraction <107948697+Reabstraction@users.noreply.github.com>
@github-actions github-actions Bot added Tests: Failed Game Tests have failed on this PR Tests: Passed Game Tests have passed on this PR and removed Tests: Passed Game Tests have passed on this PR Tests: Failed Game Tests have failed on this PR labels Sep 23, 2026
@YoungOnionMC
YoungOnionMC force-pushed the yo/space-tooltip-refactor branch from 04ff767 to b093743 Compare October 7, 2026 04:43
gustovafing and others added 3 commits October 6, 2026 23:45
# 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/block/MetaMachineBlock.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/GTRecipeTypes.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/BedrockOreMinerMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/FluidDrillMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/research/HPCAMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/generator/LargeCombustionEngineMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/generator/LargeTurbineMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/FluidHatchPartMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/mui/GTMultiblockTextUtil.java
#	src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java
#	src/main/java/com/gregtechceu/gtceu/data/lang/MachineLang.java
#	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
@github-actions github-actions Bot added Tests: Failed Game Tests have failed on this PR and removed Tests: Passed Game Tests have passed on this PR labels Oct 19, 2026
@github-actions github-actions Bot added Tests: Passed Game Tests have passed on this PR and removed Tests: Failed Game Tests have failed on this PR labels Oct 20, 2026
# 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/common/data/GTItems.java
#	src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMultiMachines.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/DistillationTowerMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/research/ResearchStationMachine.java
#	src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java
@gustovafing
gustovafing force-pushed the yo/space-tooltip-refactor branch from 38880f9 to b6132f2 Compare October 21, 2026 08:43
# 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/GTValues.java
#	src/main/java/com/gregtechceu/gtceu/api/item/armor/ArmorLogicSuite.java
#	src/main/java/com/gregtechceu/gtceu/api/item/component/ElectricStats.java
#	src/main/java/com/gregtechceu/gtceu/common/item/armor/AdvancedNanoMuscleSuite.java
#	src/main/java/com/gregtechceu/gtceu/common/item/armor/AdvancedQuarkTechSuite.java
#	src/main/java/com/gregtechceu/gtceu/common/item/armor/IJetpack.java
#	src/main/java/com/gregtechceu/gtceu/common/item/armor/Jetpack.java
#	src/main/java/com/gregtechceu/gtceu/common/item/armor/NanoMuscleSuite.java
#	src/main/java/com/gregtechceu/gtceu/common/item/armor/NightvisionGoggles.java
#	src/main/java/com/gregtechceu/gtceu/common/item/armor/PowerlessJetpack.java
#	src/main/java/com/gregtechceu/gtceu/common/item/armor/QuarkTechSuite.java
#	src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java
#	src/main/java/com/gregtechceu/gtceu/utils/input/SyncedKeyMappings.java
#	src/main/resources/assets/gtceu/lang/de_de.json
#	src/main/resources/assets/gtceu/lang/ja_jp.json
#	src/main/resources/assets/gtceu/lang/pt_br.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

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.20.1 Release: API - X.0.0 Major Breaking Refactors that MUST be in a API-Breaking Release Tests: Passed Game Tests have passed on this PR type: refactor Suggestion to refactor a section of code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants