Font
This commit is contained in:
parent
90d49c67b2
commit
048cdd0a02
BIN
desktopRuntime/resources/assets/eagler/gui/arial.png
Normal file
BIN
desktopRuntime/resources/assets/eagler/gui/arial.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 4.2 KiB |
Binary file not shown.
56097
javascript/classes.js
56097
javascript/classes.js
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
@ -14,6 +14,7 @@ import dev.resent.util.render.Color;
|
||||||
import dev.resent.util.render.RenderUtils;
|
import dev.resent.util.render.RenderUtils;
|
||||||
import net.lax1dude.eaglercraft.v1_8.Keyboard;
|
import net.lax1dude.eaglercraft.v1_8.Keyboard;
|
||||||
import net.lax1dude.eaglercraft.v1_8.Mouse;
|
import net.lax1dude.eaglercraft.v1_8.Mouse;
|
||||||
|
import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
|
||||||
import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.gui.FontRenderer;
|
import net.minecraft.client.gui.FontRenderer;
|
||||||
|
@ -248,11 +249,8 @@ public class ClickGUI extends GuiScreen {
|
||||||
|
|
||||||
public void onGuiClosed() {
|
public void onGuiClosed() {
|
||||||
Keyboard.enableRepeatEvents(true);
|
Keyboard.enableRepeatEvents(true);
|
||||||
introAnimation.setDirection(Direction.BACKWARDS);
|
|
||||||
if(introAnimation.isDone(Direction.BACKWARDS)) {
|
|
||||||
mc.displayGuiScreen(null);
|
|
||||||
}
|
|
||||||
mc.gameSettings.saveOptions();
|
mc.gameSettings.saveOptions();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -204,6 +204,7 @@ public class Minecraft implements IThreadListener {
|
||||||
public EffectRenderer effectRenderer;
|
public EffectRenderer effectRenderer;
|
||||||
private final Session session;
|
private final Session session;
|
||||||
private boolean isGamePaused;
|
private boolean isGamePaused;
|
||||||
|
public FontRenderer resentFont;
|
||||||
public FontRenderer fontRendererObj;
|
public FontRenderer fontRendererObj;
|
||||||
public FontRenderer standardGalacticFontRenderer;
|
public FontRenderer standardGalacticFontRenderer;
|
||||||
public GuiScreen currentScreen;
|
public GuiScreen currentScreen;
|
||||||
|
@ -377,12 +378,17 @@ public class Minecraft implements IThreadListener {
|
||||||
this.mcSoundHandler = new SoundHandler(this.mcResourceManager, this.gameSettings);
|
this.mcSoundHandler = new SoundHandler(this.mcResourceManager, this.gameSettings);
|
||||||
this.mcResourceManager.registerReloadListener(this.mcSoundHandler);
|
this.mcResourceManager.registerReloadListener(this.mcSoundHandler);
|
||||||
this.mcMusicTicker = new MusicTicker(this);
|
this.mcMusicTicker = new MusicTicker(this);
|
||||||
|
this.resentFont = new FontRenderer(this.gameSettings, new ResourceLocation("eagler:gui/arial.png"), this.renderEngine, false);
|
||||||
this.fontRendererObj = new EaglerFontRenderer(this.gameSettings, new ResourceLocation("textures/font/ascii.png"), this.renderEngine, false);
|
this.fontRendererObj = new EaglerFontRenderer(this.gameSettings, new ResourceLocation("textures/font/ascii.png"), this.renderEngine, false);
|
||||||
|
|
||||||
if (this.gameSettings.language != null) {
|
if (this.gameSettings.language != null) {
|
||||||
this.fontRendererObj.setUnicodeFlag(this.isUnicode());
|
this.fontRendererObj.setUnicodeFlag(this.isUnicode());
|
||||||
this.fontRendererObj.setBidiFlag(this.mcLanguageManager.isCurrentLanguageBidirectional());
|
this.fontRendererObj.setBidiFlag(this.mcLanguageManager.isCurrentLanguageBidirectional());
|
||||||
|
this.resentFont.setUnicodeFlag(this.isUnicode());
|
||||||
|
this.resentFont.setBidiFlag(this.mcLanguageManager.isCurrentLanguageBidirectional());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.mcResourceManager.registerReloadListener(this.resentFont);
|
||||||
this.standardGalacticFontRenderer = new EaglerFontRenderer(this.gameSettings, new ResourceLocation("textures/font/ascii_sga.png"), this.renderEngine, false);
|
this.standardGalacticFontRenderer = new EaglerFontRenderer(this.gameSettings, new ResourceLocation("textures/font/ascii_sga.png"), this.renderEngine, false);
|
||||||
this.mcResourceManager.registerReloadListener(this.fontRendererObj);
|
this.mcResourceManager.registerReloadListener(this.fontRendererObj);
|
||||||
this.mcResourceManager.registerReloadListener(this.standardGalacticFontRenderer);
|
this.mcResourceManager.registerReloadListener(this.standardGalacticFontRenderer);
|
||||||
|
|
|
@ -3,6 +3,7 @@ package net.minecraft.client.gui;
|
||||||
import dev.resent.ui.ClientButton;
|
import dev.resent.ui.ClientButton;
|
||||||
import dev.resent.util.render.RenderUtils;
|
import dev.resent.util.render.RenderUtils;
|
||||||
import net.lax1dude.eaglercraft.v1_8.profile.GuiScreenEditProfile;
|
import net.lax1dude.eaglercraft.v1_8.profile.GuiScreenEditProfile;
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.util.EnumChatFormatting;
|
import net.minecraft.util.EnumChatFormatting;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
|
||||||
|
@ -22,7 +23,7 @@ public class GuiMainMenu extends GuiScreen {
|
||||||
this.mc.getTextureManager().bindTexture(new ResourceLocation("eagler:gui/background.webp"));
|
this.mc.getTextureManager().bindTexture(new ResourceLocation("eagler:gui/background.webp"));
|
||||||
Gui.drawModalRectWithCustomSizedTexture(0, 0, 0.0f, 0.0f, this.width, this.height, this.width + 21, this.height + 50);
|
Gui.drawModalRectWithCustomSizedTexture(0, 0, 0.0f, 0.0f, this.width, this.height, this.width + 21, this.height + 50);
|
||||||
final String s1 = "Copyright " + EnumChatFormatting.RED + EnumChatFormatting.BOLD + "M" + EnumChatFormatting.RESET + "ojang AB";
|
final String s1 = "Copyright " + EnumChatFormatting.RED + EnumChatFormatting.BOLD + "M" + EnumChatFormatting.RESET + "ojang AB";
|
||||||
this.drawString(this.fontRendererObj, s1, this.width - this.fontRendererObj.getStringWidth(s1) - 2, this.height - 10, -1);
|
this.drawString(Minecraft.getMinecraft().resentFont, s1, this.width - Minecraft.getMinecraft().resentFont.getStringWidth(s1) - 2, this.height - 10, -1);
|
||||||
RenderUtils.drawCenteredScaledString("" + EnumChatFormatting.AQUA + EnumChatFormatting.BOLD + "Resent", this.width / 2, this.height / 2 - 50, -1, 3f);
|
RenderUtils.drawCenteredScaledString("" + EnumChatFormatting.AQUA + EnumChatFormatting.BOLD + "Resent", this.width / 2, this.height / 2 - 50, -1, 3f);
|
||||||
super.drawScreen(mouseX, mouseY, partialTicks);
|
super.drawScreen(mouseX, mouseY, partialTicks);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user