mirror of
https://github.com/GTNewHorizons/Mantle.git
synced 2026-11-18 19:29:32 +00:00
Allow for a custom fontrenderer for a book in general and propagate it to draw calls instead of having 3 places where the fontrenderer is declared
This commit is contained in:
1 parent
34e251b49b
commit
e3abffafea
7 files changed
+28
-20
No files matched your search
@@ -1,6 +1,7 @@
|
||||
package slimeknights.mantle.client.book.data;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.stats.StatFileWriter;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
@@ -31,6 +32,7 @@ public class BookData implements IDataItem {
|
||||
public transient AppearanceData appearance = new AppearanceData();
|
||||
public transient ArrayList<ItemStackData.ItemLink> itemLinks = new ArrayList<>();
|
||||
public transient HashMap<String, String> strings = new HashMap<>();
|
||||
public transient FontRenderer fontRenderer;
|
||||
|
||||
protected final transient ArrayList<BookTransformer> transformers = new ArrayList<>();
|
||||
|
||||
|
||||
@@ -85,7 +85,10 @@ public class GuiBook extends GuiScreen implements IProgressMeter {
|
||||
@Override
|
||||
@SuppressWarnings("ForLoopReplaceableByForEach")
|
||||
public void drawScreen(int mouseX, int mouseY, float partialTicks) {
|
||||
FontRenderer font = mc.fontRendererObj;
|
||||
FontRenderer fontRenderer = book.fontRenderer;
|
||||
if(fontRenderer == null) {
|
||||
fontRenderer = mc.fontRendererObj;
|
||||
}
|
||||
|
||||
if(loadingAchievements) {
|
||||
this.drawDefaultBackground();
|
||||
@@ -99,8 +102,8 @@ public class GuiBook extends GuiScreen implements IProgressMeter {
|
||||
}
|
||||
|
||||
if(debug) {
|
||||
drawRect(0, 0, font.getStringWidth("DEBUG") + 4, font.FONT_HEIGHT + 4, 0x55000000);
|
||||
font.drawString("DEBUG", 2, 2, 0xFFFFFFFF);
|
||||
drawRect(0, 0, fontRenderer.getStringWidth("DEBUG") + 4, fontRenderer.FONT_HEIGHT + 4, 0x55000000);
|
||||
fontRenderer.drawString("DEBUG", 2, 2, 0xFFFFFFFF);
|
||||
}
|
||||
|
||||
GlStateManager.enableAlpha();
|
||||
@@ -135,17 +138,17 @@ public class GuiBook extends GuiScreen implements IProgressMeter {
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
|
||||
float scale = font.getStringWidth(book.appearance.title) <= 67 ? 2.5F : 2F;
|
||||
float scale = fontRenderer.getStringWidth(book.appearance.title) <= 67 ? 2.5F : 2F;
|
||||
|
||||
GlStateManager.scale(scale, scale, 1F);
|
||||
font.drawString(book.appearance.title, (width / 2) / scale + 3 - font.getStringWidth(book.appearance.title) / 2, (height / 2 - font.FONT_HEIGHT / 2) / scale - 4, 0xAE8000, true);
|
||||
fontRenderer.drawString(book.appearance.title, (width / 2) / scale + 3 - fontRenderer.getStringWidth(book.appearance.title) / 2, (height / 2 - fontRenderer.FONT_HEIGHT / 2) / scale - 4, 0xAE8000, true);
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
if(!book.appearance.subtitle.isEmpty()) {
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.scale(1.5F, 1.5F, 1F);
|
||||
font.drawString(book.appearance.subtitle, (width / 2) / 1.5F + 7 - font.getStringWidth(book.appearance.subtitle) / 2, (height / 2 + 100 - font.FONT_HEIGHT * 2) / 1.5F, 0xAE8000, true);
|
||||
fontRenderer.drawString(book.appearance.subtitle, (width / 2) / 1.5F + 7 - fontRenderer.getStringWidth(book.appearance.subtitle) / 2, (height / 2 + 100 - fontRenderer.FONT_HEIGHT * 2) / 1.5F, 0xAE8000, true);
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
} else {
|
||||
@@ -166,7 +169,7 @@ public class GuiBook extends GuiScreen implements IProgressMeter {
|
||||
|
||||
if(book.appearance.drawPageNumbers) {
|
||||
String pNum = (page - 1) * 2 + 2 + "";
|
||||
font.drawString(pNum, PAGE_WIDTH / 2 - font.getStringWidth(pNum) / 2, PAGE_HEIGHT + 15, 0xFFAAAAAA, false);
|
||||
fontRenderer.drawString(pNum, PAGE_WIDTH / 2 - fontRenderer.getStringWidth(pNum) / 2, PAGE_HEIGHT + 15, 0xFFAAAAAA, false);
|
||||
}
|
||||
|
||||
int mX = (int) ((Mouse
|
||||
@@ -179,7 +182,7 @@ public class GuiBook extends GuiScreen implements IProgressMeter {
|
||||
BookElement element = leftElements.get(i);
|
||||
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
element.draw(mX, mY, partialTicks);
|
||||
element.draw(mX, mY, partialTicks, fontRenderer);
|
||||
}
|
||||
|
||||
// Not foreach to prevent conmodification crashes
|
||||
@@ -187,7 +190,7 @@ public class GuiBook extends GuiScreen implements IProgressMeter {
|
||||
BookElement element = leftElements.get(i);
|
||||
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
element.drawOverlay(mX, mY, partialTicks);
|
||||
element.drawOverlay(mX, mY, partialTicks, fontRenderer);
|
||||
}
|
||||
|
||||
GlStateManager.popMatrix();
|
||||
@@ -209,7 +212,7 @@ public class GuiBook extends GuiScreen implements IProgressMeter {
|
||||
|
||||
if(book.appearance.drawPageNumbers) {
|
||||
String pNum = (page - 1) * 2 + 3 + "";
|
||||
font.drawString(pNum, PAGE_WIDTH / 2 - font.getStringWidth(pNum) / 2, PAGE_HEIGHT + 15, 0xFFAAAAAA, false);
|
||||
fontRenderer.drawString(pNum, PAGE_WIDTH / 2 - fontRenderer.getStringWidth(pNum) / 2, PAGE_HEIGHT + 15, 0xFFAAAAAA, false);
|
||||
}
|
||||
|
||||
int mX = (int) ((Mouse
|
||||
@@ -222,7 +225,7 @@ public class GuiBook extends GuiScreen implements IProgressMeter {
|
||||
BookElement element = rightElements.get(i);
|
||||
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
element.draw(mX, mY, partialTicks);
|
||||
element.draw(mX, mY, partialTicks, fontRenderer);
|
||||
}
|
||||
|
||||
// Not foreach to prevent conmodification crashes
|
||||
@@ -230,7 +233,7 @@ public class GuiBook extends GuiScreen implements IProgressMeter {
|
||||
BookElement element = rightElements.get(i);
|
||||
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
element.drawOverlay(mX, mY, partialTicks);
|
||||
element.drawOverlay(mX, mY, partialTicks, fontRenderer);
|
||||
}
|
||||
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
@@ -20,7 +20,6 @@ public abstract class BookElement extends Gui {
|
||||
public GuiBook parent;
|
||||
|
||||
protected Minecraft mc = Minecraft.getMinecraft();
|
||||
protected FontRenderer fontRenderer = mc.fontRendererObj;
|
||||
protected TextureManager renderEngine = mc.renderEngine;
|
||||
|
||||
public int x, y;
|
||||
@@ -30,9 +29,9 @@ public abstract class BookElement extends Gui {
|
||||
this.y = y;
|
||||
}
|
||||
|
||||
public abstract void draw(int mouseX, int mouseY, float partialTicks);
|
||||
public abstract void draw(int mouseX, int mouseY, float partialTicks, FontRenderer fontRenderer);
|
||||
|
||||
public void drawOverlay(int mouseX, int mouseY, float partialTicks) {
|
||||
public void drawOverlay(int mouseX, int mouseY, float partialTicks, FontRenderer fontRenderer) {
|
||||
}
|
||||
|
||||
public void mouseClicked(int mouseX, int mouseY, int mouseButton) {
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package slimeknights.mantle.client.gui.book.element;
|
||||
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
@@ -53,7 +54,7 @@ public class ElementImage extends SizedBookElement {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void draw(int mouseX, int mouseY, float partialTicks) {
|
||||
public void draw(int mouseX, int mouseY, float partialTicks, FontRenderer fontRenderer) {
|
||||
renderEngine.bindTexture(image.location);
|
||||
|
||||
float r = ((colorMultiplier >> 16) & 0xff) / 255.F;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package slimeknights.mantle.client.gui.book.element;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.stats.Achievement;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
@@ -26,7 +27,7 @@ public class ElementSection extends BookElement {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void draw(int mouseX, int mouseY, float partialTicks) {
|
||||
public void draw(int mouseX, int mouseY, float partialTicks, FontRenderer fontRenderer) {
|
||||
boolean unlocked = section.isUnlocked(parent.statFile);
|
||||
boolean hover = mouseX > x && mouseY > y && mouseX < x + WIDTH && mouseY < y + HEIGHT;
|
||||
|
||||
@@ -50,7 +51,7 @@ public class ElementSection extends BookElement {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawOverlay(int mouseX, int mouseY, float partialTicks) {
|
||||
public void drawOverlay(int mouseX, int mouseY, float partialTicks, FontRenderer fontRenderer) {
|
||||
if(section != null && !section
|
||||
.isUnlocked(parent.statFile) && mouseX > x && mouseY > y && mouseX < x + WIDTH && mouseY < y + HEIGHT) {
|
||||
List<String> l = new ArrayList<>();
|
||||
|
||||
@@ -3,6 +3,7 @@ package slimeknights.mantle.client.gui.book.element;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.renderer.BlockModelRenderer;
|
||||
import net.minecraft.client.renderer.EntityRenderer;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
@@ -68,7 +69,7 @@ public class ElementStructure extends SizedBookElement {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void draw(int mouseX, int mouseY, float partialTicks) {
|
||||
public void draw(int mouseX, int mouseY, float partialTicks, FontRenderer fontRenderer) {
|
||||
GlStateManager.pushMatrix();
|
||||
|
||||
GlStateManager.translate(xTranslate, yTranslate, 500F);
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package slimeknights.mantle.client.gui.book.element;
|
||||
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -25,7 +26,7 @@ public class ElementText extends SizedBookElement {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void draw(int mouseX, int mouseY, float partialTicks) {
|
||||
public void draw(int mouseX, int mouseY, float partialTicks, FontRenderer fontRenderer) {
|
||||
String action = TextDataRenderer.drawText(x, y, width, height, text, mouseX, mouseY, fontRenderer);
|
||||
|
||||
if(doAction) {
|
||||
|
||||
Reference in new issue
Block a user