mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-22 13:09:59 +00:00
Add I18n accessor, fix up some mod log messages, make the EnumExtender work.
This commit is contained in:
1 parent
334d925972
commit
a4f2802306
10 files changed
+97
-33
No files matched your search
@@ -0,0 +1,41 @@
|
||||
package net.minecraftforge.fml;
|
||||
|
||||
import org.apache.logging.log4j.message.Message;
|
||||
import org.apache.logging.log4j.util.StringBuilderFormattable;
|
||||
|
||||
import java.util.function.Consumer;
|
||||
|
||||
public class AdvancedLogMessageAdapter implements Message, StringBuilderFormattable {
|
||||
private static final Object[] EMPTY = new Object[0];
|
||||
|
||||
private final Consumer<StringBuilder> logMessageBuilder;
|
||||
|
||||
public AdvancedLogMessageAdapter(final Consumer<StringBuilder> logMessageBuilder) {
|
||||
this.logMessageBuilder = logMessageBuilder;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getFormattedMessage() {
|
||||
return "";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getFormat() {
|
||||
return "";
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object[] getParameters() {
|
||||
return EMPTY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Throwable getThrowable() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void formatTo(final StringBuilder buffer) {
|
||||
logMessageBuilder.accept(buffer);
|
||||
}
|
||||
}
|
||||
@@ -22,7 +22,6 @@ package net.minecraftforge.fml;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.Lists;
|
||||
import net.minecraftforge.common.ForgeVersion;
|
||||
import net.minecraftforge.fml.ModList;
|
||||
|
||||
import java.text.MessageFormat;
|
||||
import java.util.Arrays;
|
||||
@@ -47,7 +46,7 @@ public class BrandingControl
|
||||
brd.add("Forge " + ForgeVersion.getVersion());
|
||||
int tModCount = ModList.get().size();
|
||||
|
||||
brd.add(MessageFormat.format("{0,choice,0#No mods|1#1 mod|1<{0} mods} loaded", tModCount));
|
||||
brd.add(MessageFormat.format(ForgeI18n.getPattern("fml.menu.loadingmods"), tModCount));
|
||||
brandings = brd.build();
|
||||
brandingsNoMC = brandings.subList(1, brandings.size());
|
||||
}
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
package net.minecraftforge.fml;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public class ForgeI18n {
|
||||
private static Map<String,String> i18n;
|
||||
|
||||
static String getPattern(final String patternName) {
|
||||
return i18n.get(patternName);
|
||||
}
|
||||
|
||||
public static void loadLanguageData(final Map<String, String> properties) {
|
||||
i18n = properties;
|
||||
}
|
||||
}
|
||||
@@ -46,7 +46,8 @@ public class ResourcePackLoader
|
||||
|
||||
public static IResourcePack getResourcePackFor(String modId)
|
||||
{
|
||||
return modResourcePacks.get(ModList.get().getModFileById(modId).getFile());
|
||||
if (modId == "forge") return forgePack;
|
||||
else return modResourcePacks.get(ModList.get().getModFileById(modId).getFile());
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
|
||||
@@ -30,7 +30,7 @@ import net.minecraftforge.fml.ModContainer;
|
||||
import net.minecraftforge.fml.client.IDisplayableError;
|
||||
import net.minecraftforge.fml.client.gui.GuiDupesFound;
|
||||
|
||||
public class DuplicateModsFoundException extends LoaderException implements IDisplayableError
|
||||
public class DuplicateModsFoundException extends LoaderException
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
public SetMultimap<ModContainer, File> dupes;
|
||||
@@ -38,22 +38,4 @@ public class DuplicateModsFoundException extends LoaderException implements IDis
|
||||
public DuplicateModsFoundException(SetMultimap<ModContainer, File> dupes) {
|
||||
this.dupes = dupes;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void printStackTrace(WrappedPrintStream stream)
|
||||
{
|
||||
stream.println("Duplicate Mods:");
|
||||
for (Entry<ModContainer, File> e : dupes.entries())
|
||||
{
|
||||
stream.println(String.format("\t%s : %s", e.getKey().getModId(), e.getValue().getAbsolutePath()));
|
||||
}
|
||||
stream.println("");
|
||||
}
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public GuiScreen createGui()
|
||||
{
|
||||
return new GuiDupesFound(this);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user