From f2491933b535c6355d4c2840accb3d0d97c93c03 Mon Sep 17 00:00:00 2001 From: Ranzu <66495944+Ranzuu@users.noreply.github.com> Date: Wed, 21 Jan 2026 14:26:05 +0100 Subject: [PATCH] Gui title localization/lang sort --- .../amunra/tile/TileEntityARChest.java | 3 +- .../amunra/tile/TileEntityGravitation.java | 2 +- .../amunra/tile/TileEntityHydroponics.java | 2 +- .../tile/TileEntityIsotopeGenerator.java | 2 +- .../tile/TileEntityMothershipEngineIon.java | 2 +- .../amunra/tile/TileEntityShuttleDock.java | 2 +- .../resources/assets/amunra/lang/de_DE.lang | 15 ++-- .../resources/assets/amunra/lang/en_US.lang | 78 +++++++++---------- .../resources/assets/amunra/lang/pl_PL.lang | 16 ++-- .../resources/assets/amunra/lang/ru_RU.lang | 17 ++-- 10 files changed, 69 insertions(+), 70 deletions(-) diff --git a/src/main/java/de/katzenpapst/amunra/tile/TileEntityARChest.java b/src/main/java/de/katzenpapst/amunra/tile/TileEntityARChest.java index 3fd14115..1743f7e4 100755 --- a/src/main/java/de/katzenpapst/amunra/tile/TileEntityARChest.java +++ b/src/main/java/de/katzenpapst/amunra/tile/TileEntityARChest.java @@ -18,6 +18,7 @@ import de.katzenpapst.amunra.block.BlockARChest; import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class TileEntityARChest extends TileEntity implements IInventory { @@ -430,7 +431,7 @@ public void invalidate() { @Override public String getInventoryName() { - return this.getBlockType().getLocalizedName(); + return GCCoreUtil.translate("gui.title." + this.getBlockType().getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/de/katzenpapst/amunra/tile/TileEntityGravitation.java b/src/main/java/de/katzenpapst/amunra/tile/TileEntityGravitation.java index 87a5ece7..150982cc 100755 --- a/src/main/java/de/katzenpapst/amunra/tile/TileEntityGravitation.java +++ b/src/main/java/de/katzenpapst/amunra/tile/TileEntityGravitation.java @@ -280,7 +280,7 @@ public void setInventorySlotContents(int index, ItemStack stack) { @Override public String getInventoryName() { - return GCCoreUtil.translate("tile.gravity.name"); + return GCCoreUtil.translate("gui.title.gravity"); } @Override diff --git a/src/main/java/de/katzenpapst/amunra/tile/TileEntityHydroponics.java b/src/main/java/de/katzenpapst/amunra/tile/TileEntityHydroponics.java index 6182df4f..b4c92993 100755 --- a/src/main/java/de/katzenpapst/amunra/tile/TileEntityHydroponics.java +++ b/src/main/java/de/katzenpapst/amunra/tile/TileEntityHydroponics.java @@ -90,7 +90,7 @@ public boolean shouldPullOxygen() { @Override public String getInventoryName() { - return GCCoreUtil.translate("tile.hydroponics.name"); + return GCCoreUtil.translate("gui.title.hydroponics"); } @Override diff --git a/src/main/java/de/katzenpapst/amunra/tile/TileEntityIsotopeGenerator.java b/src/main/java/de/katzenpapst/amunra/tile/TileEntityIsotopeGenerator.java index 2f3978cf..fad8ea5c 100755 --- a/src/main/java/de/katzenpapst/amunra/tile/TileEntityIsotopeGenerator.java +++ b/src/main/java/de/katzenpapst/amunra/tile/TileEntityIsotopeGenerator.java @@ -276,7 +276,7 @@ public void setInventorySlotContents(int index, ItemStack stack) { @Override public String getInventoryName() { - return GCCoreUtil.translate("tile." + this.getSubBlock().getUnlocalizedName() + ".name"); + return GCCoreUtil.translate("gui.title." + this.getSubBlock().getUnlocalizedName()); } @Override diff --git a/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineIon.java b/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineIon.java index 990fae82..b80c032b 100755 --- a/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineIon.java +++ b/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineIon.java @@ -90,7 +90,7 @@ public void beginTransit(final long duration) { @Override public String getInventoryName() { - return GCCoreUtil.translate("tile.mothershipEngineIon.name"); + return GCCoreUtil.translate("gui.title.mothershipEngineIon"); } @Override diff --git a/src/main/java/de/katzenpapst/amunra/tile/TileEntityShuttleDock.java b/src/main/java/de/katzenpapst/amunra/tile/TileEntityShuttleDock.java index 79f69734..2b42286e 100755 --- a/src/main/java/de/katzenpapst/amunra/tile/TileEntityShuttleDock.java +++ b/src/main/java/de/katzenpapst/amunra/tile/TileEntityShuttleDock.java @@ -584,7 +584,7 @@ public void onDestroy(final TileEntity callingBlock) { @Override public String getInventoryName() { - return GCCoreUtil.translate("tile.shuttleDock.name"); + return GCCoreUtil.translate("gui.title.shuttleDock"); } @Override diff --git a/src/main/resources/assets/amunra/lang/de_DE.lang b/src/main/resources/assets/amunra/lang/de_DE.lang index d353cbf9..1f3055b9 100755 --- a/src/main/resources/assets/amunra/lang/de_DE.lang +++ b/src/main/resources/assets/amunra/lang/de_DE.lang @@ -129,7 +129,6 @@ tile.isotopeGeneratorBasic.name=Radioisotopengenerator tile.isotopeGeneratorAdvanced.name=Verbesserter Radioisotopengenerator tile.isotopeGenerator.description=Erzeugt elektrische Energie aus der Wärme, die beim Zerfall des enthaltenen radioaktiven Materials entsteht. Der Energieertrag hängt dabei von der Außentemperatur ab, je wärmer es ist, desto weniger Energie wird produziert. Durch die hohe Halbwertszeit des verwendeten Isotops kann dieser Generator als unerschöpflich betrachtet werden. - item.baseItem.compressedGold.name=Gepresstes Gold item.baseItem.goldFoil.name=Goldfolie item.baseItem.transformer.name=Transformator @@ -273,8 +272,6 @@ gui.message.energy_usage=Energieverbrauch info.message.celestialbodysearch.none=Keine Himmelskörper gefunden, auf die '%s' zutrifft info.message.celestialbodysearch.some=Es wurden %s Himmelskörper zu '%s' gefunden: - - gui.message.misc.planet=Planet gui.message.misc.star=Stern gui.message.misc.moon=Mond @@ -286,7 +283,13 @@ gui.message.misc.yes=ja gui.message.misc.no=nein gui.message.misc.unit.ticks=Ticks +gui.title.gravity=Gravitationsgenerator +gui.title.isotopeGeneratorBasic=Radioisotopengenerator +gui.title.isotopeGeneratorAdvanced=Verbesserter Radioisotopengenerator +gui.title.mothershipEngineIon=Ionentriebwerk +gui.title.hydroponics=Hydrokultur-Einheit +gui.title.aluChest=Aluminiumtruhe +gui.title.steelChest=Stahltruhe +gui.title.shuttleDock=Shuttle-Dock -mothership.default.name=Mutterschiff %s - - +mothership.default.name=Mutterschiff %s \ No newline at end of file diff --git a/src/main/resources/assets/amunra/lang/en_US.lang b/src/main/resources/assets/amunra/lang/en_US.lang index bea415c6..0e982f0b 100755 --- a/src/main/resources/assets/amunra/lang/en_US.lang +++ b/src/main/resources/assets/amunra/lang/en_US.lang @@ -1,3 +1,5 @@ +itemGroup.AmunRaTab=Amun-Ra + planet.starAmun=Amun star.starRa=Ra planet.osiris=Osiris @@ -80,14 +82,10 @@ tile.aluChest.name=Aluminum Chest tile.aluChest.description=Same capacity as a wooden chest. Can be combined into a double chest. tile.steelChest.name=Steel Chest tile.steelChest.description=Twice the capacity of a wooden chest, but cannot be combined into a double chest. - - tile.oldConcreteOre.0.name=Urbolite tile.oldConcrete.name=Urbolite tile.oldConcreteOre.oreSteel.name=Steel-bearing Urbolite tile.oldConcreteOre.oreBone.name=Fossiliferous Urbolite - - tile.baseBlockCrystal.0.name=Glowing Coral tile.glowCoral.name=Glowing Coral tile.obsidianbrick.name=Obsidian Brick @@ -110,19 +108,14 @@ tile.asteroidMultiOre1.0.name=Ore tile.basaltMultiOre.0.name=Ore tile.hardClayMultiOre.0.name=Ore tile.obsidianMultiOre.0.name=Ore - tile.basePlant.0.name=Tall Redgrass tile.methaneTallGrass.name=Tall Redgrass - tile.blockFake.0.name=Fake Block - tile.bossSpawner.0.name=Boss Spawner - tile.baseFalling.0.name=Falling Block tile.basaltregolith.name=Basalt Regolith tile.obsidianGravel.name=Obsidian Gravel tile.obsidianSand.name=Obsidian Sand - tile.baseGrass.0.name=Redgrass tile.methanegrass.name=Redgrass tile.vacuumRedGrass.name=Pale Redgrass @@ -151,21 +144,18 @@ tile.hydroponics.harvest=Harvest tile.hydroponics.fertilize=Fertilize tile.hydroponics.noplant=No Plant tile.hydroponics.plantstatus=Plant status - - tile.machines1.0.name=Radioisotope Generator tile.isotopeGeneratorBasic.name=Radioisotope Generator tile.isotopeGeneratorAdvanced.name=Advanced Radioisotope Generator tile.isotopeGenerator.description=Generates electrical power from the heat created by the decay of integrated nuclear material. The rate of energy production depends on the outside temperature, the hotter it is, the less power is generated. Due to the high half-life of the used isotope, this generator can be assumed inexhaustible. - item.baseItem.name=Resource item.baseItem.compressedGold.name=Compressed Gold item.baseItem.goldFoil.name=Gold Foil item.baseItem.transformer.name=Transformer item.baseItem.waferEnder.name=Ender Wafer item.baseItem.porcodonMeat.name=Porcodon Meat -item.porcodonMeat.description=Smells like gasoline. + item.baseItem.laserDiode.name=Laser Diode item.baseItem.cryoDiode.name=Cryo Diode item.baseItem.cryoCrystal.name=Chionite @@ -184,7 +174,6 @@ item.baseItem.uranMesh.name=Uranium-Lithium Mesh item.baseItem.shuttleTank.name=Shuttle Fuel Tank item.baseItem.dockDoor.name=Dock Door item.baseItem.dockGangway.name=Dock Gangway -item.schematic.schematicShuttle.name=Shuttle Schematic item.baseItem.darkShard.name=Dark Matter Shard item.baseItem.naniteCluster.name=Nanite Cluster item.baseItem.naniteCluster.description=These nanites seem inactive, but still functional @@ -192,22 +181,26 @@ item.baseItem.naniteControl.name=Nanite Control Module item.baseItem.mummyDust.name=Mummy Dust item.baseItem.gravityBlockDisabler.name=Artificial Gravity Disruptor item.baseItem.gravityBlockDisabler.description=When active, this will prevent Artificial Gravity Generators from affecting you. - - item.baseItem.dustMote.name=Dust +item.baseItem.thermalController.name=Portable Thermal Regulator +item.baseItem.tricorder.name=Multi-Sensor +item.baseItem.tricorder.description=Measures and displays certain data of the dimension you are in. +item.baseItem.tricorder.message.gravity=Gravity: %s m/s² +item.baseItem.tricorder.message.temperature=Thermal Level: %s +item.baseItem.tricorder.message.solar=Solar Level: %s +item.baseItem.tricorder.message.atmosphere=Atmospheric Gasses: %s +item.baseItem.tricorder.message.daylength=Day Length: %s +item.baseItem.tricorder.message.unknown=Unknown +item.baseItem.tricorder.message.unknownGas=Unknown Gas +item.baseItem.tricorder.message.none=None +item.schematic.schematicShuttle.name=Shuttle Schematic +item.porcodonMeat.description=Smells like gasoline. item.battery-lithium.name=Lithium Battery item.battery-quantum.name=Quantum Battery item.battery-ender.name=Advanced Battery item.battery-nuclear.name=Nuclear Battery item.raygun.name=Blaster item.cryogun.name=Freeze Ray -entity.robotVillager.name=Robot Villager -entity.porcodon.name=Porcodon -entity.sentryRobot.name=Sentry -entity.osirisBoss.name=Undead Pharaoh -entity.alienVillagerAR.name=Gastropod Villager -entity.alienBug.name=Pincer Bug -entity.GalacticraftAmunRa.Shuttle.name=Shuttle Rocket item.itemShuttle.name=Shuttle Rocket item.thermalSuit.name=Thermoregulation Armor Piece item.thermalSuit.thermalLevel.name=Thermal Level: %s @@ -215,17 +208,6 @@ item.thermalSuit.helmet.name=Thermoregulation Helmet item.thermalSuit.chest.name=Thermoregulation Chest item.thermalSuit.boots.name=Thermoregulation Boots item.thermalSuit.legs.name=Thermoregulation Leggings -item.baseItem.thermalController.name=Portable Thermal Regulator -item.baseItem.tricorder.name=Multi-Sensor -item.baseItem.tricorder.description=Measures and displays certain data of the dimension you are in. -item.baseItem.tricorder.message.gravity=Gravity: %s m/s² -item.baseItem.tricorder.message.temperature=Thermal Level: %s -item.baseItem.tricorder.message.solar=Solar Level: %s -item.baseItem.tricorder.message.atmosphere=Atmospheric Gasses: %s -item.baseItem.tricorder.message.daylength=Day Length: %s -item.baseItem.tricorder.message.unknown=Unknown -item.baseItem.tricorder.message.unknownGas=Unknown Gas -item.baseItem.tricorder.message.none=None item.nanotool.name=Nanite Multitool item.nanotool.mode-prefix=Mode item.nanotool.mode.workbench=Crafting @@ -237,6 +219,13 @@ item.nanotool.mode.shovel=Shovel item.nanotool.mode.wrench=Wrench item.battery-using-item.powerlevel=Power Source +entity.robotVillager.name=Robot Villager +entity.porcodon.name=Porcodon +entity.sentryRobot.name=Sentry +entity.osirisBoss.name=Undead Pharaoh +entity.alienVillagerAR.name=Gastropod Villager +entity.alienBug.name=Pincer Bug +entity.GalacticraftAmunRa.Shuttle.name=Shuttle Rocket gas.argon.name=Argon gas.helium.name=Helium @@ -250,6 +239,7 @@ profession.refinery.name=Refining Unit profession.ingotcompressor.name=Metal Processing Unit profession.circuitfabricator.name=Circuit Fabricator profession.crafter.name=Crafting Unit + death.attack.wrongAtmoSuffocate=%1$s suffocated in the wrong atmosphere death.attack.fallOffMothership=%1$s was lost in space death.attack.fallOffMothershipIntoPlanet=%1$s crashed into %2$s @@ -257,7 +247,6 @@ death.attack.killedByEngine=%1$s was killed by a mothership engine death.attack.ar_laser=%1$s was hit by a raygun death.attack.ar_heatray=%1$s was vaporized death.attack.ar_coldray=%1$s was frozen solid -itemGroup.AmunRaTab=Amun-Ra gui.message.canCreateMothership.name=A Mothership can be built here! gui.message.tooManyMotherships.name=You cannot create any more Motherships! @@ -305,12 +294,6 @@ gui.checkbox.show_visual_guide=Show Area gui.checkbox.invert_force=Upwards gui.message.force.strength=Strength gui.message.energy_usage=Energy Usage - - -info.message.celestialbodysearch.none=No celestial bodies matching '%s' found -info.message.celestialbodysearch.some=Found %s celestial bodies matching '%s': - - gui.message.misc.generalErrorCaption=Error gui.message.misc.planet=Planet gui.message.misc.star=Star @@ -323,7 +306,16 @@ gui.message.misc.yes=yes gui.message.misc.no=no gui.message.misc.unit.ticks=Ticks +gui.title.gravity=Artificial Gravity Generator +gui.title.isotopeGeneratorBasic=Radioisotope Generator +gui.title.isotopeGeneratorAdvanced=Advanced Radioisotope Generator +gui.title.mothershipEngineIon=Ion Thruster +gui.title.hydroponics=Hydroponics Unit +gui.title.aluChest=Aluminum Chest +gui.title.steelChest=Steel Chest +gui.title.shuttleDock=Shuttle Dock -mothership.default.name=Mothership %s - +info.message.celestialbodysearch.none=No celestial bodies matching '%s' found +info.message.celestialbodysearch.some=Found %s celestial bodies matching '%s': +mothership.default.name=Mothership %s \ No newline at end of file diff --git a/src/main/resources/assets/amunra/lang/pl_PL.lang b/src/main/resources/assets/amunra/lang/pl_PL.lang index a411343b..b2e58ff2 100755 --- a/src/main/resources/assets/amunra/lang/pl_PL.lang +++ b/src/main/resources/assets/amunra/lang/pl_PL.lang @@ -78,7 +78,6 @@ tile.oldConcrete.name=Urbolite tile.oldConcreteOre.oreSteel.name=Stalowe lozyska Urbolite tile.oldConcreteOre.oreBone.name=skamienialosci Urbolite - tile.glowCoral.name=Swiecacy Koral tile.obsidianbrick.name=Cegly Obsydianu tile.obsidianbrick.stairs.name=Schody z Cegiel Obsydianu @@ -98,7 +97,6 @@ tile.oreBone.name=Ruda Skamienialosci tile.methaneTallGrass.name=Wysoka Czerwona Trawa - tile.basaltregolith.name=Bazalt regolitem tile.obsidianGravel.name=Zwir Obsydianu tile.obsidianSand.name=Piasek Obsydianu @@ -129,7 +127,6 @@ tile.isotopeGeneratorBasic.name=Generator radioizotopów tile.isotopeGeneratorAdvanced.name=Zaawansowany Generator Radioizotopów tile.isotopeGenerator.description=Generuje energie elektryczna z ciepla wytwarzanego przez próchnice zintegrowanego materialu jadrowego. Tempo produkcji energii w zaleznosci od temperatury zewnetrznej. Ze wzgledu na wysoka póltrwania uzytego izotopu Generator ten moze zalozyc niewyczerpanie. - item.baseItem.compressedGold.name=Sprezone Zloto item.baseItem.goldFoil.name=Zlota folia item.baseItem.transformer.name=Transformator @@ -274,8 +271,6 @@ gui.message.energy_usage=Energy Usage info.message.celestialbodysearch.none=Brak cial niebieskich '%s' znaleziono info.message.celestialbodysearch.some=Znaleziono %s ciala niebieskie dopasowane '%s': - - gui.message.misc.planet=Planeta gui.message.misc.star=Gwiazda gui.message.misc.moon=Ksiezyc @@ -287,6 +282,13 @@ gui.message.misc.yes=tak gui.message.misc.no=nie gui.message.misc.unit.ticks=Ticks +gui.title.gravity=Artificial Gravity Generator +gui.title.isotopeGeneratorBasic=Generator radioizotopów +gui.title.isotopeGeneratorAdvanced=Zaawansowany Generator Radioizotopów +gui.title.mothershipEngineIon=Silnika Rakietowego Ster Strumieniowy Jon +gui.title.hydroponics=Hydroponics Unit +gui.title.aluChest=Aluminum Chest +gui.title.steelChest=Steel Chest +gui.title.shuttleDock=Shuttle Dock -mothership.default.name=Statek Kosmiczny %s - +mothership.default.name=Statek Kosmiczny %s \ No newline at end of file diff --git a/src/main/resources/assets/amunra/lang/ru_RU.lang b/src/main/resources/assets/amunra/lang/ru_RU.lang index d4d6d313..ce5f241e 100755 --- a/src/main/resources/assets/amunra/lang/ru_RU.lang +++ b/src/main/resources/assets/amunra/lang/ru_RU.lang @@ -82,7 +82,6 @@ tile.oldConcrete.name=Урболит tile.oldConcreteOre.oreSteel.name=Урболит содержащий сталь tile.oldConcreteOre.oreBone.name=Урболит содержащий окаменелости - tile.glowCoral.name=Светящийся коралл tile.obsidianbrick.name=Стена из обсидианового кирпича tile.obsidianbrick.stairs.name=Ступеньки из обсидианового кирпича @@ -102,7 +101,6 @@ tile.oreBone.name=Руда окаменелостей tile.methaneTallGrass.name=Высокая красная трава - tile.basaltregolith.name=Базальтовый реголит tile.obsidianGravel.name=Обсидиановый гравий tile.obsidianSand.name=Обсидиановый песок @@ -133,7 +131,6 @@ tile.isotopeGeneratorBasic.name=Радиоизотопный генератор tile.isotopeGeneratorAdvanced.name=Продвинутый радиоизотопный генератор tile.isotopeGenerator.description=Генерирует електрическую енергию из тепла, которая выделяется при распаде радиоактивного материала. Скорость продукции енергии зависет от температуры среды генератора. Из-за высокого периода полураспада использованного материала, этот генератор можно считать бесконечным. - item.baseItem.compressedGold.name=Сжатое золото item.baseItem.goldFoil.name=Золотая фольга item.baseItem.transformer.name=Трансформатор @@ -277,8 +274,6 @@ gui.message.energy_usage=Энергопотребление info.message.celestialbodysearch.none=Небесных тел подходящих на '%s' не найдено found info.message.celestialbodysearch.some=Найдено %s небесных тел подходящих на '%s': - - gui.message.misc.planet=Планета gui.message.misc.star=Звезда gui.message.misc.moon=Спутник @@ -290,7 +285,13 @@ gui.message.misc.yes=да gui.message.misc.no=нет gui.message.misc.unit.ticks=Такт +gui.title.gravity=Генератор искусственной гравитации +gui.title.isotopeGeneratorBasic=Радиоизотопный генератор +gui.title.isotopeGeneratorAdvanced=Продвинутый радиоизотопный генератор +gui.title.mothershipEngineIon=Ионный двигатель +gui.title.hydroponics=Гидропонная система +gui.title.aluChest=Алюминиевый сундук +gui.title.steelChest=Стальной сундук +gui.title.shuttleDock=Шаттл-док -mothership.default.name=Корабль %s - - +mothership.default.name=Корабль %s \ No newline at end of file