mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 20:52:34 +00:00
Improve missing mod dependency error screen (#4762)
This commit is contained in:
9 files changed
+214
-56
No files matched your search
@@ -19,9 +19,13 @@
|
||||
|
||||
package net.minecraftforge.fml.client;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.resources.I18n;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraftforge.fml.common.Loader;
|
||||
import net.minecraftforge.fml.common.MissingModsException;
|
||||
import net.minecraftforge.fml.common.ModContainer;
|
||||
import net.minecraftforge.fml.common.versioning.ArtifactVersion;
|
||||
import net.minecraftforge.fml.common.versioning.DefaultArtifactVersion;
|
||||
|
||||
@@ -38,31 +42,49 @@ public class GuiModsMissing extends GuiErrorBase
|
||||
public void drawScreen(int mouseX, int mouseY, float partialTicks)
|
||||
{
|
||||
this.drawDefaultBackground();
|
||||
int offset = Math.max(85 - modsMissing.missingMods.size() * 10, 10);
|
||||
String modMissingDependenciesText = I18n.format("fml.messages.mod.missing.dependencies", TextFormatting.BOLD + modsMissing.getModName() + TextFormatting.RESET);
|
||||
List<MissingModsException.MissingModInfo> missingModsVersions = modsMissing.getMissingModInfos();
|
||||
int offset = Math.max(85 - missingModsVersions.size() * 10, 10);
|
||||
String modMissingDependenciesText = I18n.format("fml.messages.mod.missing.dependencies.compatibility", TextFormatting.BOLD + modsMissing.getModName() + TextFormatting.RESET);
|
||||
this.drawCenteredString(this.fontRenderer, modMissingDependenciesText, this.width / 2, offset, 0xFFFFFF);
|
||||
offset+=10;
|
||||
String fixMissingDependenciesText = I18n.format("fml.messages.mod.missing.dependencies.fix", modsMissing.getModName());
|
||||
this.drawCenteredString(this.fontRenderer, fixMissingDependenciesText, this.width / 2, offset, 0xFFFFFF);
|
||||
offset+=5;
|
||||
for (ArtifactVersion v : modsMissing.missingMods)
|
||||
for (MissingModsException.MissingModInfo versionInfo : missingModsVersions)
|
||||
{
|
||||
offset+=10;
|
||||
if (v instanceof DefaultArtifactVersion)
|
||||
ArtifactVersion acceptedVersion = versionInfo.getAcceptedVersion();
|
||||
String acceptedModId = acceptedVersion.getLabel();
|
||||
ArtifactVersion currentVersion = versionInfo.getCurrentVersion();
|
||||
String missingReason;
|
||||
if (currentVersion == null)
|
||||
{
|
||||
DefaultArtifactVersion dav = (DefaultArtifactVersion)v;
|
||||
missingReason = I18n.format("fml.messages.mod.missing.dependencies.missing");
|
||||
}
|
||||
else
|
||||
{
|
||||
missingReason = I18n.format("fml.messages.mod.missing.dependencies.you.have", currentVersion.getVersionString());
|
||||
}
|
||||
String acceptedModVersionString = acceptedVersion.getRangeString();
|
||||
if (acceptedVersion instanceof DefaultArtifactVersion)
|
||||
{
|
||||
DefaultArtifactVersion dav = (DefaultArtifactVersion)acceptedVersion;
|
||||
if (dav.getRange() != null)
|
||||
{
|
||||
String message = String.format(TextFormatting.BOLD + "%s " + TextFormatting.RESET + "%s", v.getLabel(), dav.getRange().toStringFriendly());
|
||||
this.drawCenteredString(this.fontRenderer, message, this.width / 2, offset, 0xEEEEEE);
|
||||
continue;
|
||||
acceptedModVersionString = dav.getRange().toStringFriendly();
|
||||
}
|
||||
}
|
||||
this.drawCenteredString(this.fontRenderer, String.format(TextFormatting.BOLD + "%s" + TextFormatting.RESET + " : %s", v.getLabel(), v.getRangeString()), this.width / 2, offset, 0xEEEEEE);
|
||||
ModContainer acceptedMod = Loader.instance().getIndexedModList().get(acceptedModId);
|
||||
String acceptedModName = acceptedMod != null ? acceptedMod.getName() : acceptedModId;
|
||||
String versionInfoText = String.format(TextFormatting.BOLD + "%s " + TextFormatting.RESET + "%s (%s)", acceptedModName, acceptedModVersionString, missingReason);
|
||||
String message;
|
||||
if (versionInfo.isRequired())
|
||||
{
|
||||
message = I18n.format("fml.messages.mod.missing.dependencies.requires", versionInfoText);
|
||||
}
|
||||
else
|
||||
{
|
||||
message = I18n.format("fml.messages.mod.missing.dependencies.compatible.with", versionInfoText);
|
||||
}
|
||||
offset += 10;
|
||||
this.drawCenteredString(this.fontRenderer, message, this.width / 2, offset, 0xEEEEEE);
|
||||
}
|
||||
offset+=20;
|
||||
String seeLogText = I18n.format("fml.messages.mod.missing.dependencies.see.log", GuiErrorBase.logFile.getName());
|
||||
this.drawCenteredString(this.fontRenderer, seeLogText, this.width / 2, offset, 0xFFFFFF);
|
||||
super.drawScreen(mouseX, mouseY, partialTicks);
|
||||
}
|
||||
}
|
||||
@@ -19,6 +19,8 @@
|
||||
|
||||
package net.minecraftforge.fml.client;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
@@ -52,15 +54,17 @@ public class GuiModsMissingForServer extends GuiScreen
|
||||
public void drawScreen(int mouseX, int mouseY, float partialTicks)
|
||||
{
|
||||
this.drawDefaultBackground();
|
||||
int offset = Math.max(85 - modsMissing.missingMods.size() * 10, 10);
|
||||
List<MissingModsException.MissingModInfo> missingModsVersions = modsMissing.getMissingModInfos();
|
||||
int offset = Math.max(85 - missingModsVersions.size() * 10, 10);
|
||||
this.drawCenteredString(this.fontRenderer, "Forge Mod Loader could not connect to this server", this.width / 2, offset, 0xFFFFFF);
|
||||
offset += 10;
|
||||
this.drawCenteredString(this.fontRenderer, "The mods and versions listed below could not be found", this.width / 2, offset, 0xFFFFFF);
|
||||
offset += 10;
|
||||
this.drawCenteredString(this.fontRenderer, "They are required to play on this server", this.width / 2, offset, 0xFFFFFF);
|
||||
offset += 5;
|
||||
for (ArtifactVersion v : modsMissing.missingMods)
|
||||
for (MissingModsException.MissingModInfo info : missingModsVersions)
|
||||
{
|
||||
ArtifactVersion v = info.getAcceptedVersion();
|
||||
offset += 10;
|
||||
this.drawCenteredString(this.fontRenderer, String.format("%s : %s", v.getLabel(), v.getRangeString()), this.width / 2, offset, 0xEEEEEE);
|
||||
}
|
||||
|
||||
@@ -26,6 +26,7 @@ import net.minecraft.client.resources.I18n;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraftforge.fml.common.Loader;
|
||||
import net.minecraftforge.fml.common.MissingModsException;
|
||||
import net.minecraftforge.fml.common.ModContainer;
|
||||
import net.minecraftforge.fml.common.MultipleModsErrored;
|
||||
import net.minecraftforge.fml.common.WrongMinecraftVersionException;
|
||||
import net.minecraftforge.fml.common.versioning.ArtifactVersion;
|
||||
@@ -51,12 +52,12 @@ public class GuiMultipleModsErrored extends GuiErrorBase
|
||||
public void initGui()
|
||||
{
|
||||
super.initGui();
|
||||
int additionalSize = missingModsExceptions.isEmpty()||wrongMinecraftExceptions.isEmpty() ? 20 : 55;
|
||||
for(MissingModsException exception : missingModsExceptions)
|
||||
int additionalSize = missingModsExceptions.isEmpty() || wrongMinecraftExceptions.isEmpty() ? 20 : 55;
|
||||
for (MissingModsException exception : missingModsExceptions)
|
||||
{
|
||||
additionalSize+=exception.missingMods.size()*10;
|
||||
additionalSize += exception.getMissingModInfos().size() * 10;
|
||||
}
|
||||
list = new GuiList(wrongMinecraftExceptions.size()*10+missingModsExceptions.size()*15+additionalSize);
|
||||
list = new GuiList(wrongMinecraftExceptions.size() * 10 + missingModsExceptions.size() * 15 + additionalSize);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -139,26 +140,50 @@ public class GuiMultipleModsErrored extends GuiErrorBase
|
||||
}
|
||||
if (!missingModsExceptions.isEmpty())
|
||||
{
|
||||
renderer.drawString(TextFormatting.UNDERLINE + I18n.format("fml.messages.mod.missing.dependencies.multiple"), this.left, offset, 0xFFFFFF);
|
||||
renderer.drawString(I18n.format("fml.messages.mod.missing.dependencies.multiple.issues"), this.left, offset, 0xFFFFFF);
|
||||
offset+=15;
|
||||
for (MissingModsException exception : missingModsExceptions)
|
||||
{
|
||||
renderer.drawString(I18n.format("fml.messages.mod.missing.dependencies.fix", TextFormatting.BOLD + exception.getModName() + TextFormatting.RESET), this.left, offset, 0xFFFFFF);
|
||||
for (ArtifactVersion v : exception.missingMods)
|
||||
renderer.drawString(exception.getModName() + ":", this.left, offset, 0xFFFFFF);
|
||||
for (MissingModsException.MissingModInfo versionInfo : exception.getMissingModInfos())
|
||||
{
|
||||
offset+=10;
|
||||
if (v instanceof DefaultArtifactVersion)
|
||||
ArtifactVersion acceptedVersion = versionInfo.getAcceptedVersion();
|
||||
String acceptedModId = acceptedVersion.getLabel();
|
||||
ArtifactVersion currentVersion = versionInfo.getCurrentVersion();
|
||||
String missingReason;
|
||||
if (currentVersion == null)
|
||||
{
|
||||
DefaultArtifactVersion dav = (DefaultArtifactVersion)v;
|
||||
missingReason = I18n.format("fml.messages.mod.missing.dependencies.missing");
|
||||
}
|
||||
else
|
||||
{
|
||||
missingReason = I18n.format("fml.messages.mod.missing.dependencies.you.have", currentVersion.getVersionString());
|
||||
}
|
||||
String acceptedModVersionString = acceptedVersion.getRangeString();
|
||||
if (acceptedVersion instanceof DefaultArtifactVersion)
|
||||
{
|
||||
DefaultArtifactVersion dav = (DefaultArtifactVersion)acceptedVersion;
|
||||
if (dav.getRange() != null)
|
||||
{
|
||||
String message = String.format(TextFormatting.BOLD + "%s " + TextFormatting.RESET + "%s", v.getLabel(), dav.getRange().toStringFriendly());
|
||||
renderer.drawString(message, this.left, offset, 0xEEEEEE);
|
||||
continue;
|
||||
acceptedModVersionString = dav.getRange().toStringFriendly();
|
||||
}
|
||||
}
|
||||
renderer.drawString(String.format(TextFormatting.BOLD + "%s" + TextFormatting.RESET + " : %s", v.getLabel(), v.getRangeString()), this.left, offset, 0xEEEEEE);
|
||||
ModContainer acceptedMod = Loader.instance().getIndexedModList().get(acceptedModId);
|
||||
String acceptedModName = acceptedMod != null ? acceptedMod.getName() : acceptedModId;
|
||||
String versionInfoText = String.format(TextFormatting.BOLD + "%s " + TextFormatting.RESET + "%s (%s)", acceptedModName, acceptedModVersionString, missingReason);
|
||||
String message;
|
||||
if (versionInfo.isRequired())
|
||||
{
|
||||
message = I18n.format("fml.messages.mod.missing.dependencies.requires", versionInfoText);
|
||||
}
|
||||
else
|
||||
{
|
||||
message = I18n.format("fml.messages.mod.missing.dependencies.compatible.with", versionInfoText);
|
||||
}
|
||||
offset += 10;
|
||||
renderer.drawString(message, this.left, offset, 0xEEEEEE);
|
||||
}
|
||||
|
||||
offset += 15;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user