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

Proposal to Change Creative Buttons Texture #4221

Open
wants to merge 14 commits into
base: 1.21.3
Choose a base branch
from
Open

Proposal to Change Creative Buttons Texture #4221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
eac15b6
Update Creative Buttons Texture
matthewperiut Nov 10, 2024
75614bf
Change disabled appearance, moved buttons position
matthewperiut Nov 11, 2024
11d09af
Shorten search bar
matthewperiut Dec 25, 2024
02e5d50
Minor adjustments to fix slight variance in color compared to rest of…
matthewperiut Dec 25, 2024
244a6c7
Keep regular search bar size when no additional pages exist
matthewperiut Dec 25, 2024
ba5487f
Remove unnecessary import
matthewperiut Dec 25, 2024
513406d
Greatly simplify implementation of search bar resize, improve compati…
matthewperiut Dec 25, 2024
82e5af1
Add orginal textures to Programmer Art
cassiancc Jan 5, 2025
7eca2bb
Merge pull request #1 from cassiancc/creative-buttons-retexture
matthewperiut Jan 5, 2025
d3277e1
Modify Search Bar Modification to Accommodate Programmer Art
matthewperiut Jan 6, 2025
025b191
Remove size modification of text input in creative screen,
matthewperiut Jan 8, 2025
016b3be
Improve render injection
matthewperiut Jan 8, 2025
1a4a2bb
Change creative button size
matthewperiut Jan 8, 2025
7b1177c
Optimize imports
matthewperiut Jan 8, 2025
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: 3 additions & 3 deletions ...rc/client/java/net/fabricmc/fabric/impl/client/itemgroup/FabricCreativeGuiComponents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public static class ItemGroupButtonWidget extends ButtonWidget {
final Type type;

public ItemGroupButtonWidget(int x, int y, Type type, CreativeInventoryScreen screen) {
super(x, y, 11, 12, type.text, (bw) -> type.clickConsumer.accept(screen), ButtonWidget.DEFAULT_NARRATION_SUPPLIER);
super(x, y, 10, 12, type.text, (bw) -> type.clickConsumer.accept(screen), ButtonWidget.DEFAULT_NARRATION_SUPPLIER);
this.type = type;
this.screen = screen;
}
Expand All @@ -64,9 +64,9 @@ protected void renderWidget(DrawContext drawContext, int mouseX, int mouseY, flo
return;
}

int u = active && this.isHovered() ? 22 : 0;
int u = active && this.isHovered() ? 20 : 0;
int v = active ? 0 : 12;
drawContext.drawTexture(RenderLayer::getGuiTextured, BUTTON_TEX, this.getX(), this.getY(), u + (type == Type.NEXT ? 11 : 0), v, 11, 12, 256, 256);
drawContext.drawTexture(RenderLayer::getGuiTextured, BUTTON_TEX, this.getX(), this.getY(), u + (type == Type.NEXT ? 10 : 0), v, 10, 12, 256, 256);

if (this.isHovered()) {
drawContext.drawTooltip(MinecraftClient.getInstance().textRenderer, Text.translatable("fabric.gui.creativeTabPage", screen.getCurrentPage() + 1, getPageCount()), mouseX, mouseY);
Expand Down
6 changes: 3 additions & 3 deletions .../client/java/net/fabricmc/fabric/mixin/itemgroup/client/CreativeInventoryScreenMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,15 @@ private void updateSelection() {
}
}

@Inject(method = "init", at = @At("RETURN"))
@Inject(method = "init", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/TextFieldWidget;setEditableColor(I)V", shift = At.Shift.AFTER))
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was changed to stop creating creative buttons when in survival mode, incase anyone asks the purpose

private void init(CallbackInfo info) {
currentPage = getPage(selectedTab);

int xpos = x + 170;
int xpos = x + 171;
int ypos = y + 4;

CreativeInventoryScreen self = (CreativeInventoryScreen) (Object) this;
addDrawableChild(new FabricCreativeGuiComponents.ItemGroupButtonWidget(xpos + 11, ypos, FabricCreativeGuiComponents.Type.NEXT, self));
addDrawableChild(new FabricCreativeGuiComponents.ItemGroupButtonWidget(xpos + 10, ypos, FabricCreativeGuiComponents.Type.NEXT, self));
addDrawableChild(new FabricCreativeGuiComponents.ItemGroupButtonWidget(xpos, ypos, FabricCreativeGuiComponents.Type.PREVIOUS, self));
}

Expand Down
Binary file modified ...group-api-v1/src/main/resources/assets/fabric/textures/gui/creative_buttons.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.
Binary file added ...c/main/resources/programmer_art/assets/fabric/textures/gui/creative_buttons.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.