New translation key format

Author: mineLdiver

src/test/java/net/modificationstation/sltest/achievement/AchievementListener.java

@@ -18,8 +18,8 @@ public class AchievementListener {
     @EventListener
     public void registerAchievements(AchievementRegisterEvent event) {
         testAchievementPage = new AchievementPageTest(NAMESPACE.id("testPage"));
-        testAchievement = new Achievement(69696969, "sltest:testAchievement", 0, 0, ItemListener.testItem, null);
-        testAchievementChild = new Achievement(69696970, "sltest:testAchievementChild", 0, 2, Item.GOLDEN_APPLE, testAchievement);
+        testAchievement = new Achievement(69696969, "sltest.testAchievement", 0, 0, ItemListener.testItem, null);
+        testAchievementChild = new Achievement(69696970, "sltest.testAchievementChild", 0, 2, Item.GOLDEN_APPLE, testAchievement);
         event.achievements.add(testAchievement);
         event.achievements.add(testAchievementChild);
         testAchievementPage.addAchievements(testAchievement, testAchievementChild);

src/test/java/net/modificationstation/sltest/option/OptionListener.java

@@ -4,16 +4,14 @@
 import net.fabricmc.api.Environment;
 import net.mine_diver.unsafeevents.listener.EventListener;
 import net.minecraft.client.option.KeyBinding;
-import net.modificationstation.sltest.SLTest;
 import net.modificationstation.stationapi.api.client.event.option.KeyBindingRegisterEvent;
-import net.modificationstation.stationapi.api.client.option.StationKeyBinding;
 
 public class OptionListener {
 
     @Environment(EnvType.CLIENT)
     @EventListener
     public void registerKeyBindings(KeyBindingRegisterEvent event) {
-        testBind = new StationKeyBinding(SLTest.NAMESPACE.id("test_bind"), SLTest.NAMESPACE.id("testBind"), 21);
+        testBind = new KeyBinding("key.sltest.testBind", 21);
         event.keyBindings.add(testBind);
     }
 

src/test/resources/assets/sltest/stationapi/lang/en_US.lang

@@ -1,20 +1,20 @@
-item.testItem.name=Test Item
-item.idkSomething.name=IDK Something
-key.testBind=Diamonds!
-tile.testBlock.name=Test Block
-tile.testAnimatedBlock0.name=Test Animated Block
-tile.testAnimatedBlock1.name=Charged Animated Block
-item.testPickaxe.name=Test Pickaxe
-tile.farlands_block.name=FarLands Block
-item.nbt_item.name=NBT Item
-tile.freezer.name=Freezer
-tile.altar.name=Altar
-item.ironOre.name=Iron Chunk
-item.generatedItem.name=Generated Item
-tile.variationBlock.name=Variation Block
-item.variationBlockIdle.name=Variation Block Idle
-item.variationBlockPassive.name=Variation Block Passive
-item.variationBlockActive.name=Variation Block Active
-item.test_shears.name=Test Shears
-item.pacifist_sword.name=Pacifist Sword
-item.dull_pickaxe.name=Dull Pickaxe
+item.@.testItem.name=Test Item
+item.@.idkSomething.name=IDK Something
+key.@.testBind=Diamonds!
+tile.@.testBlock.name=Test Block
+tile.@.testAnimatedBlock0.name=Test Animated Block
+tile.@.testAnimatedBlock1.name=Charged Animated Block
+item.@.testPickaxe.name=Test Pickaxe
+tile.@.farlands_block.name=FarLands Block
+item.@.nbt_item.name=NBT Item
+tile.@.freezer.name=Freezer
+tile.@.altar.name=Altar
+item.@.ironOre.name=Iron Chunk
+item.@.generatedItem.name=Generated Item
+tile.@.variationBlock.name=Variation Block
+item.@.variationBlockIdle.name=Variation Block Idle
+item.@.variationBlockPassive.name=Variation Block Passive
+item.@.variationBlockActive.name=Variation Block Active
+item.@.test_shears.name=Test Shears
+item.@.pacifist_sword.name=Pacifist Sword
+item.@.dull_pickaxe.name=Dull Pickaxe

src/test/resources/assets/sltest/stationapi/lang/stats_US.lang

@@ -1,5 +1,5 @@
-stationapi\:achievementPage.testPage=Test Page
-achievement.testAchievement=Test Achievement!
-achievement.testAchievement.desc=Descriptive description!
-achievement.testAchievementChild=Test Achievement Child!
-achievement.testAchievementChild.desc=Descriptive description child!
+gui.stationapi.achievementPage.@.testPage=Test Page
+achievement.@.testAchievement=Test Achievement!
+achievement.@.testAchievement.desc=Descriptive description!
+achievement.@.testAchievementChild=Test Achievement Child!
+achievement.@.testAchievementChild.desc=Descriptive description child!

station-achievements-v0/src/main/java/net/modificationstation/stationapi/api/client/gui/screen/achievement/AchievementPage.java

@@ -53,11 +53,11 @@ public static int getPageCount() {
         return PAGES.size();
     }
 
-    private final Identifier id;
+    private final String translationKey;
     private final List<Achievement> achievements = new ArrayList<>();
 
     public AchievementPage(Identifier id) {
-        this.id = id;
+        translationKey = id.namespace + "." + id.path;
         addPage(this);
     }
 
@@ -77,7 +77,7 @@ public int getBackgroundTexture(Random random, int column, int row, int randomiz
 
     @Override
     public String name() {
-        return id.toString();
+        return translationKey;
     }
 
     public List<Achievement> getAchievements() {

station-achievements-v0/src/main/java/net/modificationstation/stationapi/impl/client/gui/screen/achievement/AchievementPageImpl.java

@@ -9,32 +9,24 @@
 import net.modificationstation.stationapi.api.client.event.gui.screen.achievement.AchievementsScreenEvent;
 import net.modificationstation.stationapi.api.client.gui.screen.achievement.AchievementPage;
 import net.modificationstation.stationapi.api.event.achievement.AchievementRegisterEvent;
-import net.modificationstation.stationapi.api.event.mod.InitEvent;
 import net.modificationstation.stationapi.api.mod.entrypoint.Entrypoint;
 import net.modificationstation.stationapi.api.mod.entrypoint.EventBusPolicy;
-import net.modificationstation.stationapi.api.resource.language.LanguageManager;
-import net.modificationstation.stationapi.api.util.Namespace;
-import net.modificationstation.stationapi.api.util.Null;
-import org.apache.logging.log4j.Logger;
 
 import java.util.List;
 
+import static net.modificationstation.stationapi.api.StationAPI.NAMESPACE;
+
 @Entrypoint(eventBus = @EventBusPolicy(registerInstance = false))
 @EventListener(phase = StationAPI.INTERNAL_PHASE)
 public class AchievementPageImpl {
-    @Entrypoint.Namespace
-    public static final Namespace NAMESPACE = Null.get();
-    @Entrypoint.Logger
-    public static final Logger LOGGER = Null.get();
-
     @EventListener
     private static void replaceBackgroundTexture(AchievementsScreenEvent.BackgroundTextureRender event) {
         event.backgroundTexture = AchievementPage.getCurrentPage().getBackgroundTexture(event.random, event.column, event.row, event.randomizedRow, event.backgroundTexture);
     }
 
     @EventListener
     private static void registerAchievements(AchievementRegisterEvent event) {
-        AchievementPage page = new AchievementPage(StationAPI.NAMESPACE.id("minecraft"));
+        AchievementPage page = new AchievementPage(NAMESPACE.id("minecraft"));
         //noinspection unchecked
         page.addAchievements(((List<Achievement>) Achievements.ACHIEVEMENTS).toArray(Achievement[]::new));
     }
@@ -59,10 +51,4 @@ private static boolean checkHidden(Achievement achievement) {
         return !((Minecraft) FabricLoader.getInstance().getGameInstance()).field_2773.method_1988(achievement)
                 && achievement.parent != null && checkHidden(achievement.parent);
     }
-
-    @EventListener
-    private static void registerLang(InitEvent event) {
-        LOGGER.info("Adding lang folder...");
-        LanguageManager.addPath("/assets/" + NAMESPACE + "/lang", StationAPI.NAMESPACE);
-    }
 }

station-achievements-v0/src/main/java/net/modificationstation/stationapi/mixin/achievement/client/AchievementsScreenMixin.java

@@ -58,7 +58,7 @@ private void stationapi_buttonClickedNextPrev(ButtonWidget button, CallbackInfo
     )
     private void stationapi_doDrawTitle(CallbackInfo ci) {
         if (AchievementPage.getPageCount() > 1) this.textRenderer.draw(
-                I18n.getTranslation("stationapi:achievementPage." + AchievementPage.getCurrentPageName()),
+                I18n.getTranslation("gui." + NAMESPACE + ".achievementPage." + AchievementPage.getCurrentPageName()),
                 this.width / 2 - 69, this.height / 2 + 80, 0
         );
     }

station-achievements-v0/src/main/resources/assets/station-achievements-v0/lang/stats_US.lang

@@ -0,0 +1,2 @@
+# Achievement pages
+gui.stationapi.achievementPage.stationapi.minecraft=Minecraft

station-achievements-v0/src/main/resources/assets/station-achievements-v0/stationapi/lang/stats_US.lang

@@ -13,7 +13,7 @@ default Block setTranslationKey(Namespace namespace, String translationKey) {
     }
 
     default Block setTranslationKey(Identifier translationKey) {
-        return Util.assertImpl();
+        return setTranslationKey(translationKey.namespace, translationKey.path);
     }
 
     default boolean onBonemealUse(World world, int x, int y, int z, BlockState state) {