Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Removed bad localization system

Browse Source
This commit is contained in:
Auxilor
2021-07-16 18:40:52 +02:00
committed by Auxilor
parent d73c665d20
commit 255bb4b38e
8 changed files with 4 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
eco-core/core-backend/src/main/java/com/willfp/eco/internal/i18n/EcoLocalizedMessage.java
View File

@@ -1,22 +0,0 @@
package com.willfp.eco.internal.i18n;
import com.willfp.eco.core.EcoPlugin;
import org.jetbrains.annotations.NotNull;
public class EcoLocalizedMessage extends EcoLocalizedString {
/**
* Create a localized message.
*
* @param plugin The plugin.
* @param id The message id.
*/
public EcoLocalizedMessage(@NotNull final EcoPlugin plugin,
@NotNull final String id) {
super(plugin, id);
}
@Override
public String toString() {
return this.getPlugin().getLangYml().getMessage(this.getId());
}
}

32
eco-core/core-backend/src/main/java/com/willfp/eco/internal/i18n/EcoLocalizedString.java
View File

@@ -1,32 +0,0 @@
package com.willfp.eco.internal.i18n;
import com.willfp.eco.core.EcoPlugin;
import com.willfp.eco.core.PluginDependent;
import lombok.Getter;
import org.jetbrains.annotations.NotNull;
public class EcoLocalizedString extends PluginDependent<EcoPlugin> {
/**
* The message ID.
*/
@Getter
private final String id;
/**
* Create a localized message.
*
* @param plugin The plugin.
* @param id The message id.
*/
public EcoLocalizedString(@NotNull final EcoPlugin plugin,
@NotNull final String id) {
super(plugin);
this.id = id;
}
@Override
public String toString() {
return this.getPlugin().getLangYml().getString(id);
}
}

26
eco-core/core-backend/src/main/java/com/willfp/eco/internal/i18n/LocalizationUtils.java
View File

@@ -1,26 +0,0 @@
package com.willfp.eco.internal.i18n;
import com.willfp.eco.core.EcoPlugin;
import lombok.experimental.UtilityClass;
import org.apache.commons.lang.Validate;
import org.bukkit.NamespacedKey;
import org.jetbrains.annotations.NotNull;
@UtilityClass
public class LocalizationUtils {
public EcoLocalizedString getStringFromKey(@NotNull final NamespacedKey key) {
Validate.isTrue(EcoPlugin.getPluginNames().contains(key.getNamespace()));
EcoPlugin source = EcoPlugin.getPlugin(key.getNamespace());
assert source != null;
String message = source.getLangYml().getStringOrNull("messages." + key.getKey());
if (message == null) {
return new EcoLocalizedString(source, key.getKey());
} else {
return new EcoLocalizedMessage(source, key.getKey());
}
}
}

7
eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoHandler.java
View File

@@ -26,12 +26,10 @@ import com.willfp.eco.internal.factory.EcoMetadataValueFactory;
import com.willfp.eco.internal.factory.EcoNamespacedKeyFactory;
import com.willfp.eco.internal.factory.EcoRunnableFactory;
import com.willfp.eco.internal.gui.EcoGUIFactory;
import com.willfp.eco.internal.i18n.LocalizationUtils;
import com.willfp.eco.internal.integrations.PlaceholderIntegrationPAPI;
import com.willfp.eco.internal.logging.EcoLogger;
import com.willfp.eco.internal.proxy.EcoProxyFactory;
import com.willfp.eco.internal.scheduling.EcoScheduler;
import org.bukkit.NamespacedKey;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
@@ -124,11 +122,6 @@ public final class EcoHandler extends EcoSpigotPlugin implements Handler {
return new EcoProxyFactory(plugin);
}
@Override
public String getLocalizedString(@NotNull final NamespacedKey key) {
return LocalizationUtils.getStringFromKey(key).toString();
}
@Override
public void addNewPlugin(@NotNull final EcoPlugin plugin) {
Plugins.LOADED_ECO_PLUGINS.put(plugin.getName().toLowerCase(), plugin);