diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch index b633eff2f9..738665cae5 100644 --- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -133,7 +133,7 @@ this.field_71437_Z.func_71263_m(); + if (field_71461_s != null) + { -+ this.field_71461_s.func_73719_c("Shutting down internal server..."); ++ this.field_71461_s.func_73719_c(I18n.func_135052_a("forge.client.shutdown.internal")); + } + while (!field_71437_Z.func_71241_aa()) + { diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java index b960a3118d..8bf0092d3c 100644 --- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java +++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java @@ -47,6 +47,7 @@ import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.resources.I18n; import net.minecraft.client.settings.GameSettings; import net.minecraftforge.client.IItemRenderer.ItemRenderType; import net.minecraftforge.client.event.DrawBlockHighlightEvent; @@ -425,9 +426,9 @@ public class ForgeHooksClient if (status == BETA || status == BETA_OUTDATED) { // render a warning at the top of the screen, - String line = EnumChatFormatting.RED + "WARNING:" + EnumChatFormatting.RESET + " Forge Beta,"; + String line = I18n.format("forge.update.beta.1", EnumChatFormatting.RED, EnumChatFormatting.RESET); gui.drawString(font, line, (width - font.getStringWidth(line)) / 2, 4 + (0 * (font.FONT_HEIGHT + 1)), -1); - line = "Major issues may arise, verify before reporting."; + line = I18n.format("forge.update.beta.2"); gui.drawString(font, line, (width - font.getStringWidth(line)) / 2, 4 + (1 * (font.FONT_HEIGHT + 1)), -1); } @@ -438,7 +439,7 @@ public class ForgeHooksClient //case UP_TO_DATE: line = "Forge up to date"}; break; //case AHEAD: line = "Using non-recommended Forge build, issues may arise."}; break; case OUTDATED: - case BETA_OUTDATED: line = "New Forge version available: " + ForgeVersion.getTarget(); break; + case BETA_OUTDATED: line = I18n.format("forge.update.newversion", ForgeVersion.getTarget()); break; default: break; } diff --git a/src/main/resources/assets/forge/lang/en_US.lang b/src/main/resources/assets/forge/lang/en_US.lang index 0110b4dc4f..6a02f70d9c 100644 --- a/src/main/resources/assets/forge/lang/en_US.lang +++ b/src/main/resources/assets/forge/lang/en_US.lang @@ -3,4 +3,8 @@ commands.forge.usage.tracking=Use /forge track . Valid types ar commands.forge.tps.summary=%s : Mean tick time: %d ms. Mean TPS: %d commands.forge.tracking.te.enabled=Tile Entity tracking enabled for %d seconds. -forge.texture.preload.warning=Warning: Texture %s not preloaded, will cause render glitches! \ No newline at end of file +forge.texture.preload.warning=Warning: Texture %s not preloaded, will cause render glitches! +forge.client.shutdown.internal=Shutting down internal server... +forge.update.newversion=New Forge version available: %s +forge.update.beta.1=%sWARNING: %sForge Beta +forge.update.beta.2=Major issues may arise, verify before reporting. \ No newline at end of file