Repo-Mirror/Custom-Fishing
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/Custom-Fishing.git synced 2026-01-04 15:41:35 +00:00
Code Issues Releases Activity

Improve locales

Browse Source
This commit is contained in:
XiaoMoMi
2024-07-30 15:07:04 +08:00
parent abeccdf870
commit 5b9c65caf7
6 changed files with 42 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/java/net/momirealms/customfishing/bukkit/config/BukkitConfigManager.java
View File

@@ -22,6 +22,7 @@ import dev.dejvokep.boostedyaml.YamlDocument;
import dev.dejvokep.boostedyaml.block.implementation.Section;
import dev.dejvokep.boostedyaml.dvs.versioning.BasicVersioning;
import dev.dejvokep.boostedyaml.libs.org.snakeyaml.engine.v2.common.ScalarStyle;
import dev.dejvokep.boostedyaml.libs.org.snakeyaml.engine.v2.exceptions.ConstructorException;
import dev.dejvokep.boostedyaml.libs.org.snakeyaml.engine.v2.nodes.Tag;
import dev.dejvokep.boostedyaml.settings.dumper.DumperSettings;
import dev.dejvokep.boostedyaml.settings.general.GeneralSettings;
@@ -71,6 +72,7 @@ import net.momirealms.customfishing.common.helper.AdventureHelper;
import net.momirealms.customfishing.common.helper.VersionHelper;
import net.momirealms.customfishing.common.item.AbstractItem;
import net.momirealms.customfishing.common.item.Item;
import net.momirealms.customfishing.common.locale.TranslationManager;
import net.momirealms.customfishing.common.util.*;
import org.bukkit.*;
import org.bukkit.block.BlockFace;
@@ -259,6 +261,8 @@ public class BukkitConfigManager extends ConfigManager {
}
}
}
TranslationManager.forceLocale(TranslationManager.parseLocale(config.getString("force-locale", "")));
}
private void loadConfigs() {
@@ -279,11 +283,15 @@ public class BukkitConfigManager extends ConfigManager {
if (subFile.isDirectory()) {
fileDeque.push(subFile);
} else if (subFile.isFile() && subFile.getName().endsWith(".yml")) {
YamlDocument document = plugin.getConfigManager().loadData(subFile);
for (Map.Entry<String, Object> entry : document.getStringRouteMappedValues(false).entrySet()) {
if (entry.getValue() instanceof Section section) {
type.parse(entry.getKey(), section, nodes);
try {
YamlDocument document = plugin.getConfigManager().loadData(subFile);
for (Map.Entry<String, Object> entry : document.getStringRouteMappedValues(false).entrySet()) {
if (entry.getValue() instanceof Section section) {
type.parse(entry.getKey(), section, nodes);
}
}
} catch (ConstructorException e) {
plugin.getPluginLogger().warn("Could not load config file: " + subFile.getAbsolutePath() + ". Is it a corrupted file?");
}
}
}

15
core/src/main/java/net/momirealms/customfishing/bukkit/integration/BukkitIntegrationManager.java
View File

@@ -90,7 +90,7 @@ public class BukkitIntegrationManager implements IntegrationManager {
if (isHooked("NeigeItems")) {
registerItemProvider(new NeigeItemsItemProvider());
}
if (isHooked("MythicMobs")) {
if (isHooked("MythicMobs", "5")) {
registerItemProvider(new MythicMobsItemProvider());
registerEntityProvider(new MythicEntityProvider());
}
@@ -127,7 +127,7 @@ public class BukkitIntegrationManager implements IntegrationManager {
registerSeasonProvider(new RealisticSeasonsProvider());
} else if (isHooked("AdvancedSeasons")) {
registerSeasonProvider(new AdvancedSeasonsProvider());
} else if (isHooked("CustomCrops")) {
} else if (isHooked("CustomCrops", "3.4", "3.5", "3.6")) {
registerSeasonProvider(new CustomCropsSeasonProvider());
}
if (isHooked("Vault")) {
@@ -162,12 +162,15 @@ public class BukkitIntegrationManager implements IntegrationManager {
return false;
}
private boolean isHooked(String hooked, String versionPrefix) {
private boolean isHooked(String hooked, String... versionPrefix) {
Plugin p = Bukkit.getPluginManager().getPlugin(hooked);
if (p != null) {
if (p.getDescription().getVersion().startsWith(versionPrefix)) {
plugin.getPluginLogger().info(hooked + " hooked!");
return true;
String ver = p.getDescription().getVersion();
for (String prefix : versionPrefix) {
if (ver.startsWith(prefix)) {
plugin.getPluginLogger().info(hooked + " hooked!");
return true;
}
}
}
return false;

2
core/src/main/resources/config.yml
View File

@@ -7,6 +7,8 @@ debug: false
metrics: true
# Check updates
update-checker: true
# Force locale, for instance zh_cn
force-locale: ''
# Mechanic settings
mechanics: