Skip to content
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

Add inventory capacity counter #686

Merged
merged 3 commits into from
Jun 20, 2024
Merged

Add inventory capacity counter #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
596dd77
Add inventory capacity counter
BenCheung0422 Jun 18, 2024
0992b43
Update inventory counter design
BenCheung0422 Jun 20, 2024
99d758a
Fix positioning and sizing of inventory counter
BenCheung0422 Jun 20, 2024
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
191 changes: 191 additions & 0 deletions src/client/java/minicraft/screen/ContainerDisplay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,18 @@

import com.studiohartman.jamepad.ControllerButton;
import minicraft.core.Game;
import minicraft.core.Renderer;
import minicraft.core.io.InputHandler;
import minicraft.core.io.Localization;
import minicraft.entity.ItemHolder;
import minicraft.entity.furniture.Chest;
import minicraft.entity.mob.Player;
import minicraft.gfx.Color;
import minicraft.gfx.Font;
import minicraft.gfx.MinicraftImage;
import minicraft.gfx.Rectangle;
import minicraft.gfx.Screen;
import minicraft.gfx.SpriteLinker;
import minicraft.item.Inventory;
import minicraft.item.Item;
import minicraft.item.StackableItem;
Expand All @@ -15,6 +22,9 @@ public class ContainerDisplay extends Display {

private static final int padding = 10;

private final MinicraftImage counterSheet =
Renderer.spriteLinker.getSheet(SpriteLinker.SpriteType.Gui, "inventory_counter");

private Player player;
private Chest chest;

Expand Down Expand Up @@ -68,6 +78,187 @@ public void render(Screen screen) {
if (onScreenKeyboardMenu != null) {
onScreenKeyboardMenu.render(screen);
}

// It would be better if this could be made into InventoryMenu, but not possible at the moment.
if (selection == 0) {
// LHS is focused
Rectangle boundsLeft = menus[0].getBounds();
int sizeLeft = player.getInventory().invSize();
int capLeft = player.getInventory().getMaxSlots();
// Expanded counter
if (sizeLeft < 10) { // At the moment at most just 2 digits and always 2 digits for capacity (no worry yet)
// Background
screen.render(boundsLeft.getRight() + 2 - (23 - 5), boundsLeft.getTop() - 3,
12, 12, 3, 13, counterSheet);
// Skips the middle part as that is for more digits
screen.render(boundsLeft.getRight() + 2 - 15, boundsLeft.getTop() - 3,
20, 12, 15, 13, counterSheet);

// Digits
renderCounterNumber(screen, boundsLeft.getRight() + 2 - 16, boundsLeft.getTop() - 1,
5, 5, 7, sizeLeft, colorByHeaviness(calculateHeaviness(sizeLeft, capLeft), true));
renderCounterNumber(screen, boundsLeft.getRight() + 2 - 10, boundsLeft.getTop() + 3,
0, 4, 5, capLeft, Color.GRAY);
} else {
// Background
screen.render(boundsLeft.getRight() + 2 - 23, boundsLeft.getTop() - 3,
12, 12, 23, 13, counterSheet);

// Digits
renderCounterNumber(screen, boundsLeft.getRight() + 2 - 21, boundsLeft.getTop() - 1,
5, 5, 7, sizeLeft, colorByHeaviness(calculateHeaviness(sizeLeft, capLeft), true));
renderCounterNumber(screen, boundsLeft.getRight() + 2 - 10, boundsLeft.getTop() + 3,
0, 4, 5, capLeft, Color.GRAY);
}

// RHS is not focused
Rectangle boundsRight = menus[1].getBounds();
int sizeRight = chest.getInventory().invSize();
int capRight = chest.getInventory().getMaxSlots();
// Minimized counter
if (sizeRight < 10) { // no worry yet, really
// Background
screen.render(boundsRight.getLeft() + 4, boundsRight.getTop() - 1,
0, 12, 4, 9, counterSheet);
// Skips the middle part as that is for more digits
screen.render(boundsRight.getLeft() + 8, boundsRight.getTop() - 1,
8, 12, 4, 9, counterSheet);

// Digits
renderCounterNumber(screen, boundsRight.getLeft() + 4 + 2, boundsRight.getTop() + 1,
0, 4, 5, sizeRight, fadeColor(colorByHeaviness(calculateHeaviness(sizeRight, capRight), false)));
} else {
// Background
screen.render(boundsRight.getLeft() + 4, boundsRight.getTop() - 1,
0, 12, 12, 9, counterSheet);

// Digits
renderCounterNumber(screen, boundsRight.getLeft() + 4 + 2, boundsRight.getTop() + 1,
0, 4, 5, sizeRight, fadeColor(colorByHeaviness(calculateHeaviness(sizeRight, capRight), false)));
}
} else { // assert selection == 1
// LHS is not focused
Rectangle boundsLeft = menus[0].getBounds();
int sizeLeft = player.getInventory().invSize();
int capLeft = player.getInventory().getMaxSlots();
// Minimized counter
if (sizeLeft < 10) {
// Background
screen.render(boundsLeft.getRight() - 4 - 8, boundsLeft.getTop() - 1,
0, 12, 4, 9, counterSheet);
// Skips the middle part as that is for more digits
screen.render(boundsLeft.getRight() - 4 - 4, boundsLeft.getTop() - 1,
8, 12, 4, 9, counterSheet);

// Digits
renderCounterNumber(screen, boundsLeft.getRight() - 4 - 6, boundsLeft.getTop() + 1,
0, 4, 5, sizeLeft, fadeColor(colorByHeaviness(calculateHeaviness(sizeLeft, capLeft), false)));
} else {
// Background
screen.render(boundsLeft.getRight() - 4 - 12, boundsLeft.getTop() - 1,
0, 12, 12, 9, counterSheet);

// Digits
renderCounterNumber(screen, boundsLeft.getRight() - 4 - 10, boundsLeft.getTop() + 1,
0, 4, 5, sizeLeft, fadeColor(colorByHeaviness(calculateHeaviness(sizeLeft, capLeft), false)));
}

// RHS is focused
Rectangle boundsRight = menus[1].getBounds();
int sizeRight = chest.getInventory().invSize();
int capRight = chest.getInventory().getMaxSlots();
// Expanded counter (background horizontally mirrored)
if (sizeRight < 10) {
// Background
screen.render(boundsRight.getLeft() - 2 + (20 - 5), boundsRight.getTop() - 3,
12, 12, 3, 13, counterSheet, 1);
// Skips the middle part as that is for more digits
screen.render(boundsRight.getLeft() - 2, boundsRight.getTop() - 3,
20, 12, 15, 13, counterSheet, 1);

// Digits
renderCounterNumber(screen, boundsRight.getLeft() - 2 + 11, boundsRight.getTop() - 1,
5, 5, 7, sizeRight, colorByHeaviness(calculateHeaviness(sizeRight, capRight), true));
renderCounterNumber(screen, boundsRight.getLeft(), boundsRight.getTop() + 3,
0, 4, 5, capRight, Color.GRAY);
} else {
// Background
screen.render(boundsRight.getLeft() - 2, boundsRight.getTop() - 3,
12, 12, 23, 13, counterSheet, 1);

// Digits
renderCounterNumber(screen, boundsRight.getLeft() - 2 + 11, boundsRight.getTop() - 1,
5, 5, 7, sizeRight, colorByHeaviness(calculateHeaviness(sizeRight, capRight), true));
renderCounterNumber(screen, boundsRight.getLeft(), boundsRight.getTop() + 3,
0, 4, 5, capRight, Color.GRAY);
}
}
}

// xp, yp - x, y target pixel; ys - y source pixel; w, h - w, h of a digit sprite; n - number to render
private void renderCounterNumber(Screen screen, int xp, int yp, int ys, int w, int h, int n, int color) {
String display = String.valueOf(n);
for (int i = 0; i < display.length(); ++i) {
screen.render(xp + i * w, yp, w * (display.charAt(i) - '0'), ys, w, h, counterSheet, 0, color);
}
}

// Gives a percentage of heaviness according to size and capacity.
// n <= cap && n >= 0 && cap > 0
private float calculateHeaviness(int n, int cap) {
// Formula: -(x - 1)^2 + 1 # always positive as (co-)domain=[0,1]
float inner = (float) n / cap - 1;
return constrainDecimal(-(inner * inner) + 1);
}

// Constrain any possible floating point calculation error causing potential issues
private float constrainDecimal(float val) {
if (val > 1) return 1;
if (val < 0) return 0;
return val;
}

// Main color means more vibrant color, i.e. with greenness; else with whiteness instead
// Colors here are calculated as two phases as of the property of RGB space.
private int colorByHeaviness(float val, boolean main) {
if (main) {
if (val < .5) {
// From green (0) to yellow (.5) linearly
return ((int) (val / .5F * 255) << 16) | 0x100FF00;
} else {
// From yellow (.5) to red (1) linearly
return ((int) ((1 - val) / .5F * 255) << 8) | 0x1FF0000;
}
} else {
if (val < .3) {
// From white (0) to yellow (.3) linearly
return (int) (val / .3F * 255) | 0x1FFFF00;
} else {
// From yellow (.3) to red (1) linearly
return ((int) ((1 - val) / .7F * 255) << 8) | 0x1FF0000;
}
}
}

/**
* Fading required color on counter background. Counter background here is hardcoded as #2A3299 while
* fading alpha (opacity) of the color is hardcoded as 35%.
*/
private int fadeColor(int color) {
/*
* Z = X + (Y - X) * P # Source: https://stackoverflow.com/a/12228643
* where Z: new color value, X: background, Y: overlay color value, P: overlay opacity
*/
final float P = .35F;
int r = (color >> 16) & 0xFF;
int g = (color >> 8) & 0xFF;
int b = color & 0xFF;

// New color values
int nr = 0x2A + (int) ((r - 0x2A) * P);
int ng = 0x32 + (int) ((g - 0x32) * P);
int nb = 0x99 + (int) ((b - 0x99) * P);
return 0x1000000 | (nr << 16) | (ng << 8) | nb;
}

@Override
Expand Down
130 changes: 130 additions & 0 deletions src/client/java/minicraft/screen/PlayerInvDisplay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@

import com.studiohartman.jamepad.ControllerButton;
import minicraft.core.Game;
import minicraft.core.Renderer;
import minicraft.core.io.InputHandler;
import minicraft.core.io.Localization;
import minicraft.entity.mob.Player;
import minicraft.gfx.Color;
import minicraft.gfx.Font;
import minicraft.gfx.MinicraftImage;
import minicraft.gfx.Point;
import minicraft.gfx.Rectangle;
import minicraft.gfx.Screen;
import minicraft.gfx.SpriteLinker;
import minicraft.item.Inventory;
import minicraft.item.Item;
import minicraft.item.Items;
Expand All @@ -20,6 +24,8 @@ public class PlayerInvDisplay extends Display {
private static final int padding = 10;

private final Player player;
private final MinicraftImage counterSheet =
Renderer.spriteLinker.getSheet(SpriteLinker.SpriteType.Gui, "inventory_counter");

private String itemDescription = "";
private Menu.Builder descriptionMenuBuilder;
Expand Down Expand Up @@ -192,6 +198,64 @@ public void render(Screen screen) {

super.render(screen);

if (selection == 0) {
// LHS is focused
Rectangle boundsLeft = menus[0].getBounds();
int sizeLeft = player.getInventory().invSize();
int capLeft = player.getInventory().getMaxSlots();
// Expanded counter
if (sizeLeft < 10) { // At the moment at most just 2 digits and always 2 digits for capacity (no worry yet)
// Background
screen.render(boundsLeft.getRight() + 2 - (23 - 5), boundsLeft.getTop() - 3,
12, 12, 3, 13, counterSheet);
// Skips the middle part as that is for more digits
screen.render(boundsLeft.getRight() + 2 - 15, boundsLeft.getTop() - 3,
20, 12, 15, 13, counterSheet);

// Digits
renderCounterNumber(screen, boundsLeft.getRight() + 2 - 16, boundsLeft.getTop() - 1,
5, 5, 7, sizeLeft, colorByHeaviness(calculateHeaviness(sizeLeft, capLeft), true));
renderCounterNumber(screen, boundsLeft.getRight() + 2 - 10, boundsLeft.getTop() + 3,
0, 4, 5, capLeft, Color.GRAY);
} else {
// Background
screen.render(boundsLeft.getRight() + 2 - 23, boundsLeft.getTop() - 3,
12, 12, 23, 13, counterSheet);

// Digits
renderCounterNumber(screen, boundsLeft.getRight() + 2 - 21, boundsLeft.getTop() - 1,
5, 5, 7, sizeLeft, colorByHeaviness(calculateHeaviness(sizeLeft, capLeft), true));
renderCounterNumber(screen, boundsLeft.getRight() + 2 - 10, boundsLeft.getTop() + 3,
0, 4, 5, capLeft, Color.GRAY);
}
} else if (creativeMode) { // assert selection == 1
// LHS is not focused
Rectangle boundsLeft = menus[0].getBounds();
int sizeLeft = player.getInventory().invSize();
int capLeft = player.getInventory().getMaxSlots();
// Minimized counter
if (sizeLeft < 10) {
// Background
screen.render(boundsLeft.getRight() - 4 - 8, boundsLeft.getTop() - 1,
0, 12, 4, 9, counterSheet);
// Skips the middle part as that is for more digits
screen.render(boundsLeft.getRight() - 4 - 4, boundsLeft.getTop() - 1,
8, 12, 4, 9, counterSheet);

// Digits
renderCounterNumber(screen, boundsLeft.getRight() - 4 - 6, boundsLeft.getTop() + 1,
0, 4, 5, sizeLeft, fadeColor(colorByHeaviness(calculateHeaviness(sizeLeft, capLeft), false)));
} else {
// Background
screen.render(boundsLeft.getRight() - 4 - 12, boundsLeft.getTop() - 1,
0, 12, 12, 9, counterSheet);

// Digits
renderCounterNumber(screen, boundsLeft.getRight() - 4 - 10, boundsLeft.getTop() + 1,
0, 4, 5, sizeLeft, fadeColor(colorByHeaviness(calculateHeaviness(sizeLeft, capLeft), false)));
}
}

// Searcher help text
String text = Localization.getLocalized("minicraft.displays.player_inv.display.help", Game.input.getMapping("SEARCHER-BAR"));
Font.draw(text, screen, selection == 0 ? 12 : Screen.w - 12 - Font.textWidth(text), menus[creativeMode ? 2 : 1].getBounds().getBottom() + 8, Color.WHITE);
Expand All @@ -200,6 +264,72 @@ public void render(Screen screen) {
onScreenKeyboardMenu.render(screen);
}

// xp, yp - x, y target pixel; ys - y source pixel; w, h - w, h of a digit sprite; n - number to render
private void renderCounterNumber(Screen screen, int xp, int yp, int ys, int w, int h, int n, int color) {
String display = String.valueOf(n);
for (int i = 0; i < display.length(); ++i) {
screen.render(xp + i * w, yp, w * (display.charAt(i) - '0'), ys, w, h, counterSheet, 0, color);
}
}

// Gives a percentage of heaviness according to size and capacity.
// n <= cap && n >= 0 && cap > 0
private float calculateHeaviness(int n, int cap) {
// Formula: -(x - 1)^2 + 1 # always positive as (co-)domain=[0,1]
float inner = (float) n / cap - 1;
return constrainDecimal(-(inner * inner) + 1);
}

// Constrain any possible floating point calculation error causing potential issues
private float constrainDecimal(float val) {
if (val > 1) return 1;
if (val < 0) return 0;
return val;
}

// Main color means more vibrant color, i.e. with greenness; else with whiteness instead
// Colors here are calculated as two phases as of the property of RGB space.
private int colorByHeaviness(float val, boolean main) {
if (main) {
if (val < .5) {
// From green (0) to yellow (.5) linearly
return ((int) (val / .5F * 255) << 16) | 0x100FF00;
} else {
// From yellow (.5) to red (1) linearly
return ((int) ((1 - val) / .5F * 255) << 8) | 0x1FF0000;
}
} else {
if (val < .3) {
// From white (0) to yellow (.3) linearly
return (int) (val / .3F * 255) | 0x1FFFF00;
} else {
// From yellow (.3) to red (1) linearly
return ((int) ((1 - val) / .7F * 255) << 8) | 0x1FF0000;
}
}
}

/**
* Fading required color on counter background. Counter background here is hardcoded as #2A3299 while
* fading alpha (opacity) of the color is hardcoded as 35%.
*/
private int fadeColor(int color) {
/*
* Z = X + (Y - X) * P # Source: https://stackoverflow.com/a/12228643
* where Z: new color value, X: background, Y: overlay color value, P: overlay opacity
*/
final float P = .35F;
int r = (color >> 16) & 0xFF;
int g = (color >> 8) & 0xFF;
int b = color & 0xFF;

// New color values
int nr = 0x2A + (int) ((r - 0x2A) * P);
int ng = 0x32 + (int) ((g - 0x32) * P);
int nb = 0x99 + (int) ((b - 0x99) * P);
return 0x1000000 | (nr << 16) | (ng << 8) | nb;
}

@Override
protected void onSelectionChange(int oldSel, int newSel) {
super.onSelectionChange(oldSel, newSel);
Expand Down
Binary file added src/client/resources/assets/textures/gui/inventory_counter.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading