Skip to content

Let BackgroundRenderedSlots override the background atlas #941

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

Merged
merged 5 commits into from
Nov 27, 2024
Merged

Let BackgroundRenderedSlots override the background atlas #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1156945
Let BackgroundRenderedSlots override the background atlas
Swedz Nov 25, 2024
563df3a
Make getBackgroundAtlasLocation not nullable
Swedz Nov 26, 2024
f605783
Use null atlas check instead of isActive
Swedz Nov 27, 2024
654b0a9
Remove isEmpty check
Swedz Nov 27, 2024
b990b91
Update comment to say that background atlas can be null
Swedz Nov 27, 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
6 changes: 5 additions & 1 deletion src/client/java/aztech/modern_industrialization/machines/gui/MachineScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,13 @@ protected void renderBg(GuiGraphics guiGraphics, float delta, int mouseX, int mo
private void renderConfigurableSlotBackgrounds(GuiGraphics guiGraphics) {
for (Slot slot : this.menu.slots) {
if (slot instanceof BackgroundRenderedSlot brs) {
var atlas = brs.getBackgroundAtlasLocation();
if (atlas == null) {
continue;
}
int px = leftPos + slot.x - 1;
int py = topPos + slot.y - 1;
guiGraphics.blit(SLOT_ATLAS, px, py, brs.getBackgroundU(), brs.getBackgroundV(), 18, 18);
guiGraphics.blit(atlas, px, py, brs.getBackgroundU(), brs.getBackgroundV(), 18, 18);
}
}
}
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/aztech/modern_industrialization/inventory/BackgroundRenderedSlot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,22 @@
*/
package aztech.modern_industrialization.inventory;

import aztech.modern_industrialization.MI;
import net.minecraft.resources.ResourceLocation;
import org.jetbrains.annotations.Nullable;

/**
* Implement this on a slot to render its background automatically.
*/
public interface BackgroundRenderedSlot {
/**
* @return the {@link ResourceLocation} of the slot atlas texture to use for the slot background. Return null to render no background.
*/
@Nullable
default ResourceLocation getBackgroundAtlasLocation() {
return MI.id("textures/gui/container/slot_atlas.png");
}

default int getBackgroundU() {
return 0;
}
Expand Down
Loading