Skip to content

Add a History feature to the questbook #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Aedial wants to merge 4 commits into
base: 1.12
Choose a base branch
from
Open

Add a History feature to the questbook #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c20429
Add a History button, showing finished quest
Aedial May 28, 2026
2e535d1
Restore scroll bar position when using the Back button
Aedial May 28, 2026
8c2aa7c
Handle repeatable quests edge case
Aedial May 29, 2026
1cd9625
Tweak the visuals of Quest History to be more readable
Aedial Jun 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/betterquesting/api/questing/IQuest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import java.util.UUID;

public interface IQuest extends INBTSaveLoad<NBTTagCompound>, INBTProgress<NBTTagCompound>, IPropertyContainer {

EnumQuestState getState(EntityPlayer player);

@Nullable
Expand Down Expand Up @@ -53,6 +52,8 @@ public interface IQuest extends INBTSaveLoad<NBTTagCompound>, INBTProgress<NBTTa

void setClaimed(UUID uuid, long timestamp);

long getLastCompletedAt(UUID uuid);

void resetUser(@Nullable UUID uuid, boolean fullReset);

IDatabaseNBT<ITask, NBTTagList, NBTTagList> getTasks();
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/betterquesting/api/storage/BQ_Settings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ public class BQ_Settings {
public static boolean claimAllConfirmation = true;
public static boolean lockTray = true;
public static boolean viewMode = false;
public static String historyRepeatableFilter = "SHOW_ALL";
public static String historyStandardFilter = "SHOW_ALL";
public static boolean limitBack = false;
public static String defaultVisibility = "NORMAL";

Expand Down
109 changes: 93 additions & 16 deletions src/main/java/betterquesting/api2/client/gui/controls/PanelButton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@ public class PanelButton implements IPanelButton, IGuiPanel, INBTSaveLoad<NBTTag
private final IGuiTexture[] texStates = new IGuiTexture[3];
private IGuiColor[] colStates = new IGuiColor[]{new GuiColorStatic(128, 128, 128, 255), new GuiColorStatic(255, 255, 255, 255), new GuiColorStatic(16777120)};
private IGuiTexture texIcon = null;
private String txtIcon = null;
private IGuiColor colIcon = null;
private int icoPadding = 0;
private int iconAlign = 1;
private List<String> tooltip = null;
private boolean txtShadow = true;
private String btnText;
Expand Down Expand Up @@ -92,11 +94,33 @@ public PanelButton setIcon(IGuiTexture icon, int padding) {

public PanelButton setIcon(IGuiTexture icon, IGuiColor color, int padding) {
this.texIcon = icon;
this.txtIcon = null;
this.colIcon = color;
this.icoPadding = padding * 2;
return this;
}

public PanelButton setIconText(String icon) {
return this.setIconText(icon, 0);
}

public PanelButton setIconText(String icon, int padding) {
return this.setIconText(icon, null, padding);
}

public PanelButton setIconText(String icon, IGuiColor color, int padding) {
this.texIcon = null;
this.txtIcon = icon;
this.colIcon = color;
this.icoPadding = padding * 2;
return this;
}

public PanelButton setIconAlignment(int align) {
this.iconAlign = MathHelper.clamp(align, 0, 2);
return this;
}

public PanelButton setTooltip(List<String> tooltip) {
this.tooltip = tooltip;
return this;
Expand Down Expand Up @@ -155,6 +179,8 @@ public void initPanel() {
@Override
public void drawPanel(int mx, int my, float partialTick) {
IGuiRect bounds = this.getTransform();
FontRenderer font = Minecraft.getMinecraft().fontRenderer;

GlStateManager.pushMatrix();
GlStateManager.color(1F, 1F, 1F, 1F);
this.setHovered(bounds.contains(mx, my));
Expand All @@ -171,38 +197,89 @@ public void drawPanel(int mx, int my, float partialTick) {
t.drawTexture(bounds.getX(), bounds.getY(), bounds.getWidth(), bounds.getHeight(), 0F, partialTick);
}

int isz = getIconWidth(font, bounds);

if (texIcon != null) {
int isz = Math.min(bounds.getHeight() - icoPadding, bounds.getWidth() - icoPadding);

if (isz > 0) {
int iconX = bounds.getX() + getIconOffset(bounds.getWidth(), isz, icoPadding / 2, iconAlign);
int iconY = bounds.getY() + (bounds.getHeight() / 2) - (isz / 2);

if (colIcon != null) {
texIcon.drawTexture(bounds.getX() + (bounds.getWidth() / 2) - (isz / 2), bounds.getY() + (bounds.getHeight() / 2) - (isz / 2), isz, isz, 0F, partialTick, colIcon);
texIcon.drawTexture(iconX, iconY, isz, isz, 0F, partialTick, colIcon);
} else {
texIcon.drawTexture(bounds.getX() + (bounds.getWidth() / 2) - (isz / 2), bounds.getY() + (bounds.getHeight() / 2) - (isz / 2), isz, isz, 0F, partialTick);
texIcon.drawTexture(iconX, iconY, isz, isz, 0F, partialTick);
}
}
} else if (txtIcon != null && txtIcon.length() > 0 && isz > 0) {
int iconX = bounds.getX() + getIconOffset(bounds.getWidth(), isz, icoPadding / 2, iconAlign);
int iconY = getTextOffsetY(bounds);
int iconColor = colIcon != null ? colIcon.getRGB() : colStates[curState].getRGB();

font.drawString(txtIcon, iconX, iconY, iconColor, false);
}

if (btnText != null && btnText.length() > 0) {
drawCenteredString(Minecraft.getMinecraft().fontRenderer, btnText, bounds.getX(), bounds.getY() + bounds.getHeight() / 2 - 4, bounds.getWidth(), colStates[curState].getRGB(), txtShadow, textAlign);
int textX = bounds.getX();
int textWidth = bounds.getWidth();

if (isz > 0) {
int textInset = isz + (icoPadding / 2) + 2;

if (iconAlign == 0) {
textX += textInset;
textWidth -= textInset;
} else if (iconAlign == 2) {
textWidth -= textInset;
}
}

if (textWidth > 0) {
float offset = getTextOffset(font, btnText, textWidth, textAlign);
font.drawString(btnText, textX + offset, getTextOffsetY(bounds), colStates[curState].getRGB(), txtShadow);
}
}

GlStateManager.popMatrix();
}

private static void drawCenteredString(FontRenderer font, String text, int x, int y, int width, int color, boolean shadow, int align) {
private int getIconWidth(FontRenderer font, IGuiRect bounds) {
if (texIcon != null) {
return Math.max(0, Math.min(bounds.getHeight() - icoPadding, bounds.getWidth() - icoPadding));
}

if (txtIcon == null || txtIcon.length() <= 0) {
return 0;
}

return Math.max(0, Math.min(RenderUtils.getStringWidth(txtIcon, font), bounds.getWidth() - icoPadding));
}

private static int getTextOffsetY(IGuiRect bounds) {
return bounds.getY() + bounds.getHeight() / 2 - 4;
}



private static int getIconOffset(int width, int size, int padding, int align) {
switch (align) {
case 0: {
font.drawString(text, x + 4, y, color, shadow);
break;
}
case 2: {
font.drawString(text, x + width - RenderUtils.getStringWidth(text, font) / 2F - 4, y, color, shadow);
break;
}
default: {
font.drawString(text, x + Math.floorDiv(width, 2) - RenderUtils.getStringWidth(text, font) / 2F, y, color, shadow);
}
case 0:
return padding;
case 2:
return width - size - padding;
default:
return (width / 2) - (size / 2);
}
}

private static float getTextOffset(FontRenderer font, String text, int width, int align) {
switch (align) {
case 0:
return 4;
case 2:
return width - RenderUtils.getStringWidth(text, font) / 2F - 4;
default:
return Math.floorDiv(width, 2) - RenderUtils.getStringWidth(text, font) / 2F;
}
}

Expand Down
Loading