Remove font testing

This commit is contained in:
UnknownUser1789 2023-01-24 22:52:32 +00:00
parent aafb54d8e9
commit 195550207f
6 changed files with 28832 additions and 28838 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -41,7 +41,7 @@ public class ClickGUI extends GuiScreen {
int xy = -30; int xy = -30;
sr = new ScaledResolution(mc); sr = new ScaledResolution(mc);
fr = Minecraft.getMinecraft().resentFont; fr = Minecraft.getMinecraft().fontRendererObj;
width = GuiScreen.width - x; width = GuiScreen.width - x;
height = GuiScreen.height - y; height = GuiScreen.height - y;
x = sr.getScaledWidth() / 8 + xo; x = sr.getScaledWidth() / 8 + xo;
@ -108,7 +108,7 @@ public class ClickGUI extends GuiScreen {
int xo = 0; int xo = 0;
int xy = -30; int xy = -30;
fr = Minecraft.getMinecraft().resentFont; fr = Minecraft.getMinecraft().fontRendererObj;
width = GuiScreen.width - x; width = GuiScreen.width - x;
height = GuiScreen.height - y; height = GuiScreen.height - y;
x = sr.getScaledWidth() / 8 + xo; x = sr.getScaledWidth() / 8 + xo;

View File

@ -208,7 +208,6 @@ 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;
@ -382,17 +381,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/ascii.png"), this.renderEngine, false); //this.resentFont = new FontRenderer(this.gameSettings, new ResourceLocation("eagler:gui/ascii.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.setUnicodeFlag(this.isUnicode());
this.resentFont.setBidiFlag(this.mcLanguageManager.isCurrentLanguageBidirectional()); //this.resentFont.setBidiFlag(this.mcLanguageManager.isCurrentLanguageBidirectional());
} }
this.mcResourceManager.registerReloadListener(this.resentFont); //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);

View File

@ -23,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(Minecraft.getMinecraft().resentFont, s1, this.width - Minecraft.getMinecraft().resentFont.getStringWidth(s1) - 2, this.height - 10, -1); this.drawString(Minecraft.getMinecraft().fontRendererObj, s1, this.width - Minecraft.getMinecraft().fontRendererObj.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);
} }