[Books] Reverted add/renaming tooltip layer to preserve backwards compatibility

This commit is contained in:
Arthur Uzulin committed 2018-07-28 21:01:14 +10:00
1 parent 05e219ac85
commit 35e592fc1c
5 files changed
+3 -22

No files matched your search

@@ -253,14 +253,6 @@ public class GuiBook extends GuiScreen {
element.drawOverlay(mX, mY, partialTicks, fontRenderer);
}
// Not foreach to prevent conmodification crashes
for(int i = 0; i < leftElements.size(); i++) {
BookElement element = leftElements.get(i);
GlStateManager.color(1F, 1F, 1F, 1F);
element.drawTooltips(mX, mY, partialTicks, fontRenderer);
}
GlStateManager.popMatrix();
}
@@ -303,14 +295,6 @@ public class GuiBook extends GuiScreen {
element.drawOverlay(mX, mY, partialTicks, fontRenderer);
}
// Not foreach to prevent conmodification crashes
for(int i = 0; i < rightElements.size(); i++) {
BookElement element = rightElements.get(i);
GlStateManager.color(1F, 1F, 1F, 1F);
element.drawTooltips(mX, mY, partialTicks, fontRenderer);
}
GlStateManager.popMatrix();
}
}
@@ -37,9 +37,6 @@ public abstract class BookElement extends Gui {
public void drawOverlay(int mouseX, int mouseY, float partialTicks, FontRenderer fontRenderer) {
}
public void drawTooltips(int mouseX, int mouseY, float partialTicks, FontRenderer fontRenderer) {
}
public void mouseClicked(int mouseX, int mouseY, int mouseButton) {
}
@@ -96,7 +96,7 @@ public class ElementItem extends SizedBookElement {
}
@Override
public void drawTooltips(int mouseX, int mouseY, float partialTicks, FontRenderer fontRenderer) {
public void drawOverlay(int mouseX, int mouseY, float partialTicks, FontRenderer fontRenderer) {
if(isHovered(mouseX, mouseY) && currentItem < itemCycle.size()) {
if(tooltip != null) {
drawHoveringText(tooltip, mouseX, mouseY, fontRenderer);
@@ -74,7 +74,7 @@ public class ElementSection extends SizedBookElement {
}
@Override
public void drawTooltips(int mouseX, int mouseY, float partialTicks, FontRenderer fontRenderer) {
public void drawOverlay(int mouseX, int mouseY, float partialTicks, FontRenderer fontRenderer) {
if(section != null && isHovered(mouseX, mouseY)) {
List<String> text = new ArrayList<>();
text.add(section.getTitle());
@@ -44,7 +44,7 @@ public class ElementText extends SizedBookElement {
}
@Override
public void drawTooltips(int mouseX, int mouseY, float partialTicks, FontRenderer fontRenderer) {
public void drawOverlay(int mouseX, int mouseY, float partialTicks, FontRenderer fontRenderer) {
if(tooltip.size() > 0){
TextDataRenderer.drawTooltip(tooltip, mouseX, mouseY, fontRenderer);
tooltip.clear();