Skip to content

refactor: lang provider #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lonelyicer merged 1 commit into from
Mar 24, 2026
Merged

refactor: lang provider #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions src/generated/resources/assets/mia/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
{
"attribute.name.generic.critical_hit": "Critical Hit",
"attribute.name.generic.critical_hit_damage": "Critical Hit Damage",
"attribute.name.generic.critical_hit": "Critical Hit Chance",
"attribute.name.generic.critical_hit_damage": "Critical Hit Damage",
"biome.mia.great_fault/great_fault": "Great Fault",
"biome.mia.great_fault/the_great_fault": "The Great Fault",
"biome.mia.the_abyss/abyss_dripstone_caves": "Abyss Dripstone Caves",
"biome.mia.the_abyss/abyss_lush_caves": "Abyss Lush Caves",
"biome.mia.the_abyss/abyss_plains": "Abyss Plains",
"biome.mia.the_abyss/dense_skyfog_forest": "Dense Skyfog Forest",
"biome.mia.the_abyss/fossilized_forest": "Fossilized Forest",
"biome.mia.the_abyss/inverted_forest": "Inverted Forest",
"biome.mia.the_abyss/prasiolite_caves": "Prasiolite Caves",
"biome.mia.the_abyss/rich_fossilized_forest": "Rich Fossilized Forest",
"biome.mia.the_abyss/skyfog_forest": "Skyfog Forest",
"biome.mia.the_abyss/temptation_forest": "Temptation Forest",
"biome.mia.the_abyss/the_abyss": "The Abyss",
"biome.mia.the_abyss/under_fossilized_forest": "Under Fossilized Forest",
"block.mia.abyss_andesite": "Abyss Andesite",
"block.mia.abyss_andesite_bricks": "Abyss Andesite Bricks",
"block.mia.abyss_andesite_bricks_slab": "Abyss Andesite Bricks Slab",
Expand Down Expand Up @@ -169,7 +176,7 @@
"block.mia.verdant_trapdoor": "Verdant Trapdoor",
"container.mia.artifact.smithing.title": "Artifact Smithing Table",
"curios.identifier.whistle": "Whistle",
"curios.modifiers.whistle": "Red Whistle Attributes",
"curios.modifiers.whistle": "Whistle Attributes",
"emi.category.mia.lamp_tube": "Laser Catalysis",
"gui.mia.disconnect": "Quit?",
"item.mia.artifact_haste": "Artifact Haste",
Expand Down Expand Up @@ -210,7 +217,7 @@
"key.mia.skill_dial": "Skill Dial",
"mia.configuration.abyss_radius": "Abyss Radius Value",
"mia.configuration.abyss_radius.tooltip": "Setting The Abyss Radius",
"mia.configuration.auto_hook": "auto hook",
"mia.configuration.auto_hook": "Auto Hook",
"mia.configuration.auto_hook.tooltip": "Whether to enable auto hook",
"mia.configuration.cave_explorer_beacon": "Cave Explorer Beacon",
"mia.configuration.cave_explorer_beacon.tooltip": "Cave Explorer Beacon Configuration",
Expand Down Expand Up @@ -265,8 +272,8 @@
"skill.mia.combo_skills": "Combo Skills",
"skill.mia.cooldown": "Cooldown...",
"skill.mia.cooldown_time": "Cooldown T-",
"skill.mia.minute": ":",
"skill.mia.second": " ",
"skill.mia.minute": "m",
"skill.mia.second": "s",
"skill.mia.unskill": "Unskill",
"stat.mia.interact_with_artifact_smithing_table": "Interactions with Artifact Smithing Table",
"subtitle.mia.abyss_portal_ambient": "Abyss Portal: Ambient",
Expand All @@ -287,8 +294,8 @@
"tooltip.mia.artifact_bundle.capacity": "Artifact Capacity: %s",
"tooltip.mia.attribute_modifier": "%s %s",
"tooltip.mia.description.abyss_compass": "It will point the way toward the abyss.",
"tooltip.mia.description.red_whistle": "Red Whistles are novice cave raiders allowed only in the Abyss’s first layer.",
"tooltip.mia.hold_shift": "Hold [%s] to show details",
"tooltip.mia.item.red_whistle": "Red Whistles are novice cave raiders allowed only in the Abyss’s first layer.",
"tooltip.mia.modifiers.artifact_material": "When Applying Artifact: ",
"tooltip.mia.skill.cooldown_value": "Cooldown: %s",
"tooltip.mia.whistle.capacity": "Capacity: %s",
Expand Down
10 changes: 5 additions & 5 deletions src/generated/resources/data/mia/tags/item/artifact_modifiers_material.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"values": [
"minecraft:lapis_lazuli",
"mia:prasiolite_shard",
"minecraft:copper_ingot",
"minecraft:emerald",
"minecraft:iron_ingot",
"minecraft:diamond",
"mia:prasiolite_shard",
"minecraft:gold_ingot",
"minecraft:lapis_lazuli",
"minecraft:netherite_ingot",
"minecraft:emerald",
"minecraft:copper_ingot"
"minecraft:netherite_ingot"
]
}
4 changes: 3 additions & 1 deletion src/main/java/com/altnoir/mia/datagen/MiaBiomeTagsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import net.minecraft.tags.BiomeTags;
import net.minecraft.world.level.biome.Biomes;
import net.neoforged.neoforge.common.data.ExistingFileHelper;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.concurrent.CompletableFuture;
Expand All @@ -18,8 +19,9 @@ public MiaBiomeTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Pr
super(output, provider, MIA.MOD_ID, existingFileHelper);
}

@SuppressWarnings("unchecked")
@Override
protected void addTags(HolderLookup.Provider provider) {
protected void addTags(@NotNull HolderLookup.Provider provider) {
tag(MiaTags.Biomes.HAS_ISLAND)
.add(Biomes.MUSHROOM_FIELDS)
.addTags(BiomeTags.IS_OVERWORLD);
Expand Down
202 changes: 39 additions & 163 deletions src/main/java/com/altnoir/mia/datagen/MiaLangProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
package com.altnoir.mia.datagen;

import com.altnoir.mia.MIA;
import com.altnoir.mia.client.gui.screens.ArtifactSmithingTableScreen;
import com.altnoir.mia.common.block.ArtifactSmithingTableBlock;
import com.altnoir.mia.core.event.client.ClientCurseEvent;
import com.altnoir.mia.core.event.client.ClientTooltipEvent;
import com.altnoir.mia.core.event.client.KeyArrowEvent;
import com.altnoir.mia.init.*;
import com.altnoir.mia.common.item.abs.AbsArtifactBundle;
import com.altnoir.mia.common.item.abs.IArtifactItem;
import com.altnoir.mia.common.item.abs.IArtifactSkill;
import com.altnoir.mia.common.item.abs.IEArtifact;
import com.altnoir.mia.util.FilesHelper;
import com.altnoir.mia.worldgen.biome.MiaBiomes;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.data.PackOutput;
Expand All @@ -31,83 +23,27 @@ public MiaLangProvider(PackOutput output) {

@Override
protected void addTranslations() {
add("itemgroup.mia", "Memento In Abyss");
add("itemgroup.mia_artifact", "Memento In Abyss: Artifact");

//Tooltip start
add(ClientTooltipEvent.TOOLTIP_HOLD_SHIFT, "Hold [%s] to show details");
add(ClientTooltipEvent.TOOLTIP_ATTRIBUTE_MODIFIER, "%s %s");
add(ClientTooltipEvent.TOOLTIP_MODIFIERS_ARTIFACT_MATERIAL, "When Applying Artifact: ");

add("tooltip.mia.whistle.level", "Whistle Level: %s");
add("tooltip.mia.whistle.capacity", "Capacity: %s");
add("tooltip.mia.item.red_whistle", "Red Whistles are novice cave raiders allowed only in the Abyss’s first layer.");

add(IArtifactSkill.TOOLTIP_SKILL_COOLDOWN_VALUE, "Cooldown: %s");

add(IArtifactItem.TOOLTIP_ARTIFACT_WEIGHT, "Weight: %s");
add(IArtifactItem.TOOLTIP_ARTIFACT_GRADE_S, "S");
add(IArtifactItem.TOOLTIP_ARTIFACT_GRADE_A, "A");
add(IArtifactItem.TOOLTIP_ARTIFACT_GRADE_B, "B");
add(IArtifactItem.TOOLTIP_ARTIFACT_GRADE_C, "C");
add(IArtifactItem.TOOLTIP_ARTIFACT_GRADE_D, "D");
add(IArtifactItem.TOOLTIP_ARTIFACT_GRADE_UNKNOWN, "Unknown");

add(IEArtifact.TOOLTIP_ARTIFACT_LEVEL, "Echo: %s/%s");
add(IEArtifact.TOOLTIP_ARTIFACT_MAX, "Echo: MAX");
add(AbsArtifactBundle.TOOLTIP_ARTIFACT_BUNDLE_CAPACITY, "Artifact Capacity: %s");

add("tooltip.mia.description.abyss_compass", "It will point the way toward the abyss.");
//Tooltip end

// Attributes
add("attribute.name.generic.critical_hit", "Critical Hit");
add("attribute.name.generic.critical_hit_damage", "Critical Hit Damage");

// Container
add(ArtifactSmithingTableBlock.TITLE, "Artifact Smithing Table");

// Skill start
add(KeyArrowEvent.SKILL_UNSKILL, "Unskill");
add(KeyArrowEvent.SKILL_COMBO_SKILLS, "Combo Skills");
add(KeyArrowEvent.SKILL_COOLDOWN, "Cooldown...");
add(KeyArrowEvent.SKILL_COOLDOWN_TIME, "Cooldown T-");
add(KeyArrowEvent.SKILL_MINUTE, ":");
add(KeyArrowEvent.SKILL_SECOND, " ");
// Skill end

// kEY start
add(MiaKeyBinding.KEY_CATEGORIES_MIA, "Memento In Abyss");
add(MiaKeyBinding.KEY_SKILL_DIAL, "Skill Dial");
// KEY end

//GUI start
add(ClientCurseEvent.GUI_DISCONNECT, "Quit?");
//GUI end

//Biome start
addBiome(MiaBiomes.THE_ABYSS, "The Abyss");
addBiome(MiaBiomes.ABYSS_PLAINS, "Abyss Plains");
addBiome(MiaBiomes.SKYFOG_FOREST, "Skyfog Forest");
addBiome(MiaBiomes.PRASIOLITE_CAVES, "Prasiolite Caves");
addBiome(MiaBiomes.ABYSS_LUSH_CAVES, "Abyss Lush Caves");
addBiome(MiaBiomes.ABYSS_DRIPSTONE_CAVES, "Abyss Dripstone Caves");

addBiome(MiaBiomes.TEMPTATION_FOREST, "Temptation Forest");
//Biome end
addDefault("interface");
addDefault("tooltip");
addDefault("ponder");

MiaBiomes.BIOMES.forEach(biome -> {
add("biome.mia." + biome.location().getPath(), formatName(biome));
});

MiaPaintingVariants.PAINTING_VARIANTS.forEach(paintingVariant -> {
add("painting.mia." + paintingVariant.location().getPath() + ".title", formatName(paintingVariant.location().getPath()));
add("painting.mia." + paintingVariant.location().getPath() + ".author", "Memento In Abyss");
});

MiaItems.ITEMS.getEntries().stream()
.map(DeferredHolder::get)
.filter(item -> !(item instanceof BlockItem))
.forEach(item -> {
add(item, formatName(BuiltInRegistries.ITEM.getKey(item).getPath()));
});
.forEach(item -> add(item, formatName(BuiltInRegistries.ITEM.getKey(item).getPath())));

MiaBlocks.BLOCKS.getEntries().stream()
.map(DeferredHolder::get)
.forEach(block -> {
add(block, formatName(BuiltInRegistries.BLOCK.getKey(block).getPath()));
});
.forEach(block -> add(block, formatName(BuiltInRegistries.BLOCK.getKey(block).getPath())));

MiaPotions.POTIONS.getEntries().forEach(holder -> {
String name = holder.getId().getPath();
Expand All @@ -118,97 +54,13 @@ protected void addTranslations() {
String name = holder.getId().getPath();
add("stat.mia.interact_with_" + name, "Interactions with " + formatName(name));
});
// Painting Variant
addPainting(MiaPaintingVariants.ABYSS_MAP);
addPainting(MiaPaintingVariants.THE_ABYSS);
addPainting(MiaPaintingVariants.THE_ABYSS_2);
addPainting(MiaPaintingVariants.FOSSIL_TREE);
addPainting(MiaPaintingVariants.FORTITUDE_FLOWER);

// Sounds start
add(MiaSoundsProvider.ABYSS_PORTAL_AMBIENT, "Abyss Portal: Ambient");
add(MiaSoundsProvider.ABYSS_PORTAL_TRAVEL, "Abyss Portal: Travel");
// Sounds end

//Config start
add("mia.configuration.title", "Memento In Abyss Configuration");

// 通用配置
add("mia.configuration.abyss_radius", "Abyss Radius Value");
add("mia.configuration.abyss_radius.tooltip", "Setting The Abyss Radius");

// 服务端配置
add("mia.configuration.curse", "Enable Curse");
add("mia.configuration.curse.tooltip", "Whether to enable the Curse");
add("mia.configuration.curse_god", "Curse the Creative and Spectator");
add("mia.configuration.curse_god.tooltip", "Whether to Curse the Creative and Spectator");

add("mia.configuration.cave_explorer_beacon", "Cave Explorer Beacon");
add("mia.configuration.cave_explorer_beacon.tooltip", "Cave Explorer Beacon Configuration");
add("mia.configuration.cave_explorer_beacon_horizontal", "Horizontal Range");
add("mia.configuration.cave_explorer_beacon_horizontal.tooltip", "Setting The Cave Explorer Beacon Horizontal Range");
add("mia.configuration.cave_explorer_beacon_vertical", "Vertical Range");
add("mia.configuration.cave_explorer_beacon_vertical.tooltip", "Setting The Cave Explorer Beacon Vertical Range");
add("mia.configuration.cave_explorer_beacon_max_vertical", "Max Vertical Range");
add("mia.configuration.cave_explorer_beacon_max_vertical.tooltip", "Setting The Cave Explorer Beacon Max Vertical");

// 客户端配置
add("mia.configuration.curse_icon_position", "Curse Icon Position");
add("mia.configuration.curse_icon_position.tooltip", "Switch Curse Icon Position");
add("mia.configuration.curse_icon_position.middle", "Middle");
add("mia.configuration.curse_icon_position.right", "Right");
add("mia.configuration.curse_icon_position.hidden", "Hidden");
add("mia.configuration.disconnect_button_state", "Disconnect Button State");
add("mia.configuration.disconnect_button_state.tooltip", "Adjust the Disconnect Button");
add("mia.configuration.disconnect_button_state.default", "Default");
add("mia.configuration.disconnect_button_state.disabled", "Disabled");
add("mia.configuration.disconnect_button_state.hidden", "Hidden");

add("mia.configuration.hook", "Hook");
add("mia.configuration.hook.tooltip", "Hook Configuration");

add("mia.configuration.hook_max_distance", "Max Hook Distance");
add("mia.configuration.hook_max_distance.tooltip", "Maximum hook distance in blocks");
add("mia.configuration.hook_stop_distance", "Hook Pull Stop Distance");
add("mia.configuration.hook_stop_distance.tooltip", "Distance at which the hook stops pulling the player");
add("mia.configuration.hook_shoot_velocity", "Hook Shoot Velocity");
add("mia.configuration.hook_shoot_velocity.tooltip", "Hook shoot velocity");
add("mia.configuration.hook_pull_velocity", "Hook Pull Velocity");
add("mia.configuration.hook_pull_velocity.tooltip", "Base pull velocity");
add("mia.configuration.hook_retract_velocity", "Hook Retract Velocity");
add("mia.configuration.hook_retract_velocity.tooltip", "Hook retract velocity");
add("mia.configuration.hook_retract_distance", "Hook Retract Distance");
add("mia.configuration.hook_retract_distance.tooltip", "Distance at which the hook automatically retracts");
add("mia.configuration.hook_jump_boost", "Jump Boost Multiplier");
add("mia.configuration.hook_jump_boost.tooltip", "Jump boost multiplier when using hook");

add("mia.configuration.auto_hook", "auto hook");
add("mia.configuration.auto_hook.tooltip", "Whether to enable auto hook");
//Config end

// Tags start
add("tag.item.curios.whistle", "Whistle");
add("tag.item.mia.fossilized_logs", "Fossilized Logs");
add("tag.item.mia.stripped_fossilized_logs", "Stripped Fossilized Logs");
add("tag.item.mia.skyfog_logs", "Skyfog Logs");
// Tags end

add("pack.mia.music_pack.name", "Memento In Abyss: Music Pack");

//Compat start
add("curios.identifier.whistle", "Whistle");
add("curios.modifiers.whistle", "Red Whistle Attributes");
add("emi.category.mia.lamp_tube", "Laser Catalysis");
//Compat end
}

private void addPainting(ResourceKey<PaintingVariant> key) {
add("painting.mia." + key.location().getPath() + ".title", formatName(key.location().getPath()));
add("painting.mia." + key.location().getPath() + ".author", "Memento In Abyss");
}

private void addBiome(ResourceKey<Biome> biome, String name) {
add("biome.mia." + biome.location().getPath(), name);
}

private void addPotions(String key) {
Expand All @@ -221,6 +73,30 @@ private void addPotions(String key) {
add(key3, "Lingering Potion of " + formatName(key));
}

private void addDefault(String fileName) {
var path = "assets/mia/lang/default/" + fileName + ".json";
var jsonElement = FilesHelper.loadJsonResource(path);
if (jsonElement == null) {
throw new IllegalStateException(String.format("Could not find default lang file: %s", path));
}
var jsonObject = jsonElement.getAsJsonObject();
for (var entry : jsonObject.entrySet()) {
var key = entry.getKey();
var value = entry.getValue().getAsString();
add(key, value);
}
}

private String formatName(ResourceKey<Biome> key) {
var path = key.location().getPath();

int index = path.lastIndexOf('/');
if (index != -1) {
path = path.substring(index + 1);
}
return formatName(path);
}

private String formatName(String name) {
return Arrays.stream(name.split("_"))
.filter(word -> !word.isEmpty())
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/com/altnoir/mia/init/MiaPaintingVariants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@
import net.minecraft.resources.ResourceKey;
import net.minecraft.world.entity.decoration.PaintingVariant;

import java.util.ArrayList;
import java.util.List;

public class MiaPaintingVariants {
public static final List<ResourceKey<PaintingVariant>> PAINTING_VARIANTS = new ArrayList<>();

public static final ResourceKey<PaintingVariant> ABYSS_MAP = create("abyss_map");
public static final ResourceKey<PaintingVariant> THE_ABYSS = create("the_abyss");
public static final ResourceKey<PaintingVariant> THE_ABYSS_2 = create("the_abyss2");
Expand All @@ -22,6 +27,7 @@ public static void bootstrap(BootstrapContext<PaintingVariant> context) {
}

private static void register(BootstrapContext<PaintingVariant> context, ResourceKey<PaintingVariant> key, int width, int height) {
PAINTING_VARIANTS.add(key);
context.register(key, new PaintingVariant(width, height, key.location()));
}

Expand Down
30 changes: 30 additions & 0 deletions src/main/java/com/altnoir/mia/util/FilesHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package com.altnoir.mia.util;

import com.google.gson.JsonElement;
import com.google.gson.internal.Streams;
import com.google.gson.stream.JsonReader;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;

public class FilesHelper {
private static JsonElement loadJson(InputStream inputStream) {
try {
JsonReader reader = new JsonReader(new BufferedReader(new InputStreamReader(inputStream)));
reader.setLenient(true);
JsonElement element = Streams.parse(reader);
reader.close();
inputStream.close();
return element;
} catch (IOException e) {
e.printStackTrace();
}
return null;
}

public static JsonElement loadJsonResource(String filepath) {
return loadJson(ClassLoader.getSystemResourceAsStream(filepath));
}
}
Loading
Loading