Add normal Workbench #30
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,26 @@ | ||
| package com.tcm.MineTale; | ||
|
|
||
| import com.tcm.MineTale.block.workbenches.screen.FurnaceWorkbenchScreen; | ||
| import com.tcm.MineTale.block.workbenches.screen.WorkbenchWorkbenchScreen; | ||
| import com.tcm.MineTale.block.workbenches.screen.CampfireWorkbenchScreen; | ||
| import com.tcm.MineTale.registry.ModMenuTypes; | ||
|
|
||
| import net.fabricmc.api.ClientModInitializer; | ||
| import net.minecraft.client.gui.screens.MenuScreens; | ||
|
|
||
| public class MineTaleClient implements ClientModInitializer { | ||
| /** | ||
| * Register client-side screen factories for custom workbench menu types. | ||
| * | ||
| * Binds ModMenuTypes.FURNACE_WORKBENCH_MENU to FurnaceWorkbenchScreen, | ||
| * ModMenuTypes.CAMPFIRE_WORKBENCH_MENU to CampfireWorkbenchScreen, and | ||
| * ModMenuTypes.WORKBENCH_WORKBENCH_MENU to WorkbenchWorkbenchScreen so the client | ||
| * can create the appropriate GUI when those menus open. | ||
| */ | ||
| @Override | ||
| public void onInitializeClient() { | ||
| MenuScreens.register(ModMenuTypes.FURNACE_WORKBENCH_MENU, FurnaceWorkbenchScreen::new); | ||
| MenuScreens.register(ModMenuTypes.CAMPFIRE_WORKBENCH_MENU, CampfireWorkbenchScreen::new); | ||
| MenuScreens.register(ModMenuTypes.WORKBENCH_WORKBENCH_MENU, WorkbenchWorkbenchScreen::new); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,263 @@ | ||
| package com.tcm.MineTale.block.workbenches.screen; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import com.tcm.MineTale.MineTale; | ||
| import com.tcm.MineTale.block.workbenches.menu.WorkbenchWorkbenchMenu; | ||
| import com.tcm.MineTale.mixin.client.RecipeBookComponentAccessor; | ||
| import com.tcm.MineTale.network.CraftRequestPayload; | ||
| import com.tcm.MineTale.recipe.MineTaleRecipeBookComponent; | ||
| import com.tcm.MineTale.registry.ModBlocks; | ||
| import com.tcm.MineTale.registry.ModRecipeDisplay; | ||
| import com.tcm.MineTale.registry.ModRecipes; | ||
|
|
||
| import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; | ||
| import net.minecraft.client.gui.GuiGraphics; | ||
| import net.minecraft.client.gui.components.Button; | ||
| import net.minecraft.client.gui.navigation.ScreenPosition; | ||
| import net.minecraft.client.gui.screens.inventory.AbstractRecipeBookScreen; | ||
| import net.minecraft.client.gui.screens.recipebook.RecipeBookComponent; | ||
| import net.minecraft.client.gui.screens.recipebook.RecipeBookPage; | ||
| import net.minecraft.client.gui.screens.recipebook.RecipeCollection; | ||
| import net.minecraft.client.renderer.RenderPipelines; | ||
| import net.minecraft.resources.Identifier; | ||
| import net.minecraft.world.entity.player.Inventory; | ||
| import net.minecraft.world.item.ItemStack; | ||
| import net.minecraft.world.item.crafting.display.RecipeDisplayEntry; | ||
| import net.minecraft.world.item.crafting.display.RecipeDisplayId; | ||
| import net.minecraft.world.item.crafting.display.SlotDisplayContext; | ||
| import net.minecraft.network.chat.Component; | ||
|
|
||
| public class WorkbenchWorkbenchScreen extends AbstractRecipeBookScreen<WorkbenchWorkbenchMenu> { | ||
| private static final Identifier TEXTURE = | ||
| Identifier.fromNamespaceAndPath(MineTale.MOD_ID, "textures/gui/container/furnace_workbench.png"); | ||
|
|
||
| private final MineTaleRecipeBookComponent mineTaleRecipeBook; | ||
|
|
||
| private Button craftOneBtn; | ||
| private Button craftThirtyBtn; | ||
| private Button craftAllBtn; | ||
|
|
||
| /** | ||
| * Initialize a workbench GUI screen using the provided container menu, player inventory, and title. | ||
| * | ||
| * @param menu the menu supplying slots and synchronized state for this screen | ||
| * @param inventory the player's inventory to display and interact with | ||
| * @param title the title component shown at the top of the screen | ||
| */ | ||
| public WorkbenchWorkbenchScreen(WorkbenchWorkbenchMenu menu, Inventory inventory, Component title) { | ||
| this(menu, inventory, title, createRecipeBookComponent(menu)); | ||
| } | ||
|
|
||
| /** | ||
| * Creates a WorkbenchWorkbenchScreen bound to the given menu, player inventory, title, and recipe book component. | ||
| * | ||
| * @param menu the menu backing this screen | ||
| * @param inventory the player's inventory shown in the screen | ||
| * @param title the screen title component | ||
| * @param recipeBook the MineTaleRecipeBookComponent used to display and manage recipes in this screen | ||
| */ | ||
| private WorkbenchWorkbenchScreen(WorkbenchWorkbenchMenu menu, Inventory inventory, Component title, MineTaleRecipeBookComponent recipeBook) { | ||
| super(menu, recipeBook, inventory, title); | ||
| this.mineTaleRecipeBook = recipeBook; | ||
| } | ||
|
|
||
| /** | ||
| * Create a MineTaleRecipeBookComponent configured for the workbench screen. | ||
| * | ||
| * @param menu the workbench menu used to initialize the recipe book component | ||
| * @return a MineTaleRecipeBookComponent containing the workbench tab and associated recipe category | ||
| */ | ||
| private static MineTaleRecipeBookComponent createRecipeBookComponent(WorkbenchWorkbenchMenu menu) { | ||
| ItemStack tabIcon = new ItemStack(ModBlocks.WORKBENCH_WORKBENCH_BLOCK.asItem()); | ||
|
|
||
| List<RecipeBookComponent.TabInfo> tabs = List.of( | ||
| new RecipeBookComponent.TabInfo(tabIcon.getItem(), ModRecipeDisplay.WORKBENCH_SEARCH) | ||
| ); | ||
|
|
||
| return new MineTaleRecipeBookComponent(menu, tabs, ModRecipes.WORKBENCH_TYPE); | ||
| } | ||
|
|
||
| /** | ||
| * Configure the screen's GUI dimensions and initialize widgets. | ||
| * | ||
| * Sets the layout size (imageWidth = 176, imageHeight = 166), delegates remaining | ||
| * layout initialization to the superclass, and creates the three craft buttons | ||
| * ("1", "30", "All") wired to their respective handlers. | ||
| */ | ||
| @Override | ||
| protected void init() { | ||
| // Important: Set your GUI size before super.init() | ||
| this.imageWidth = 176; | ||
| this.imageHeight = 166; | ||
|
|
||
| super.init(); | ||
|
|
||
| this.craftOneBtn = addRenderableWidget(Button.builder(Component.literal("1"), (button) -> { | ||
| handleCraftRequest(1); | ||
| }).bounds(this.leftPos + 80, this.topPos + 20, 30, 20).build()); | ||
|
|
||
| this.craftThirtyBtn = addRenderableWidget(Button.builder(Component.literal("30"), (button) -> { | ||
| handleCraftRequest(30); | ||
| }).bounds(this.leftPos + 112, this.topPos + 20, 30, 20).build()); | ||
|
|
||
| this.craftAllBtn = addRenderableWidget(Button.builder(Component.literal("All"), (button) -> { | ||
| handleCraftRequest(-1); // -1 represents "All" logic | ||
| }).bounds(this.leftPos + 144, this.topPos + 20, 30, 20).build()); | ||
| } | ||
|
|
||
| // private void handleCraftRequest(int amount) { | ||
| // RecipeBookPage page = ((RecipeBookComponentAccessor)this.mineTaleRecipeBook).getRecipeBookPage(); | ||
| // RecipeCollection collection = page.getLastClickedRecipeCollection(); | ||
| // RecipeDisplayId displayId = page.getLastClickedRecipe(); | ||
|
|
||
| // if (collection != null && displayId != null) { | ||
| // // 1. Find the specific entry that was clicked | ||
| // for (RecipeDisplayEntry entry : collection.getSelectedRecipes(RecipeCollection.CraftableStatus.ANY)) { | ||
| // if (entry.id().equals(displayId)) { | ||
| // // 2. Resolve the visual result into an actual ItemStack | ||
| // List<ItemStack> results = entry.resultItems(SlotDisplayContext.fromLevel(this.minecraft.level)); | ||
|
|
||
| // if (!results.isEmpty()) { | ||
| // ItemStack resultStack = results.get(0); | ||
| // // 3. Send the item and amount to the server | ||
| // // Note: Update your CraftRequestPayload to accept ItemStack instead of Identifier | ||
| // ClientPlayNetworking.send(new CraftRequestPayload(resultStack, amount)); | ||
| // } | ||
| // break; | ||
| // } | ||
| // } | ||
| // } | ||
| // } | ||
|
|
||
| // private void handleCraftRequest(int amount) { | ||
| // // 1. Get the current page from the recipe book | ||
| // // We use your mixin/accessor to get the internal page object | ||
| // RecipeBookPage page = ((RecipeBookComponentAccessor)this.mineTaleRecipeBook).getRecipeBookPage(); | ||
|
|
||
| // // 2. Identify WHAT was clicked | ||
| // RecipeCollection collection = page.getLastClickedRecipeCollection(); | ||
| // RecipeDisplayId displayId = page.getLastClickedRecipe(); | ||
|
|
||
| // if (collection != null && displayId != null) { | ||
| // // 3. Find the display entry | ||
| // for (RecipeDisplayEntry entry : collection.getSelectedRecipes(RecipeCollection.CraftableStatus.ANY)) { | ||
| // if (entry.id().equals(displayId)) { | ||
| // // 4. Get the result item (the Chest) | ||
| // // 1.21.1 uses SlotDisplayContext to handle dynamic results | ||
| // List<ItemStack> results = entry.resultItems(SlotDisplayContext.fromLevel(this.minecraft.level)); | ||
|
|
||
| // if (!results.isEmpty()) { | ||
| // ItemStack resultStack = results.get(0); | ||
|
|
||
| // // 5. Send the packet to the Server | ||
| // // IMPORTANT: Ensure your CraftRequestPayload is registered to handle | ||
| // // an ItemStack and an Int. | ||
| // ClientPlayNetworking.send(new CraftRequestPayload(resultStack, amount)); | ||
|
|
||
| // // Optional: Play a click sound so the player knows it worked | ||
| // this.minecraft.getSoundManager().play(net.minecraft.client.resources.sounds.SimpleSoundInstance.forUI( | ||
| // net.minecraft.sounds.SoundEvents.UI_BUTTON_CLICK, 1.0F)); | ||
| // } | ||
| // break; | ||
| // } | ||
| // } | ||
| // } | ||
| // } | ||
|
coderabbitai[bot] marked this conversation as resolved.
Outdated
|
||
|
|
||
| /** | ||
| * Sends a crafting request for the currently selected recipe in the integrated recipe book. | ||
| * | ||
| * Locates the last recipe collection and last selected recipe ID from the recipe book component, | ||
| * resolves the recipe's result item, and sends a CraftRequestPayload to the server containing that | ||
| * item and the requested amount. | ||
| * | ||
| * @param amount the quantity to craft; use -1 to request crafting of the full available stack ("All") | ||
| */ | ||
|
|
||
| private void handleCraftRequest(int amount) { | ||
| // 1. Cast the book component to the Accessor to get the selected data | ||
| RecipeBookComponentAccessor accessor = (RecipeBookComponentAccessor) this.mineTaleRecipeBook; | ||
|
|
||
| RecipeCollection collection = accessor.getLastRecipeCollection(); | ||
| RecipeDisplayId displayId = accessor.getLastRecipe(); | ||
|
|
||
| if (collection != null && displayId != null) { | ||
| // 2. Find the visual entry | ||
| for (RecipeDisplayEntry entry : collection.getSelectedRecipes(RecipeCollection.CraftableStatus.ANY)) { | ||
| if (entry.id().equals(displayId)) { | ||
| // 3. Resolve result for the packet | ||
| List<ItemStack> results = entry.resultItems(SlotDisplayContext.fromLevel(this.minecraft.level)); | ||
|
|
||
| if (!results.isEmpty()) { | ||
| ItemStack resultStack = results.get(0); | ||
|
|
||
| // 4. LOG FOR DEBUGGING: Does this print in your console? | ||
| System.out.println("Sending craft request for: " + resultStack + " amount: " + amount); | ||
|
Contributor
There was a problem hiding this comment. 🛠️ Refactor suggestion | 🟠 Major Replace Debug prints via Proposed fix- // 4. LOG FOR DEBUGGING: Does this print in your console?
- System.out.println("Sending craft request for: " + resultStack + " amount: " + amount);
+ MineTale.LOGGER.debug("Sending craft request for: {} amount: {}", resultStack, amount);- System.out.println("Request failed: Collection or DisplayID is null!");
+ MineTale.LOGGER.debug("Craft request skipped: collection or displayId is null");Also applies to: 186-188 🤖 Prompt for AI Agents
Contributor
Author
There was a problem hiding this comment. I want to keep this for now.
Contributor
There was a problem hiding this comment.
🧠 Learnings used |
||
|
|
||
| ClientPlayNetworking.send(new CraftRequestPayload(resultStack, amount)); | ||
| } | ||
| break; | ||
| } | ||
| } | ||
| } else { | ||
| System.out.println("Request failed: Collection or DisplayID is null!"); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Draws the workbench GUI background texture at the screen's top-left corner. | ||
| * | ||
| * @param guiGraphics the graphics context used to draw GUI elements | ||
| * @param f partial tick time for interpolation | ||
| * @param i current mouse x coordinate relative to the window | ||
| * @param j current mouse y coordinate relative to the window | ||
| */ | ||
| protected void renderBg(GuiGraphics guiGraphics, float f, int i, int j) { | ||
| int k = this.leftPos; | ||
| int l = this.topPos; | ||
| guiGraphics.blit(RenderPipelines.GUI_TEXTURED, TEXTURE, k, l, 0.0F, 0.0F, this.imageWidth, this.imageHeight, 256, 256); | ||
| } | ||
|
|
||
| /** | ||
| * Renders the workbench screen including the background tint, GUI elements, and tooltips. | ||
| * | ||
| * @param graphics the graphics context | ||
| * @param mouseX the current mouse x-coordinate | ||
| * @param mouseY the current mouse y-coordinate | ||
| * @param delta the partial tick delta for frame interpolation | ||
| */ | ||
| @Override | ||
| public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) { | ||
| // 1. Always render the dark background tint first | ||
| renderBackground(graphics, mouseX, mouseY, delta); | ||
|
|
||
| // 3. Call super (this draws your slots and items) | ||
| super.render(graphics, mouseX, mouseY, delta); | ||
|
|
||
| boolean hasSelection = this.mineTaleRecipeBook.getSelectedRecipeId() != null; | ||
| this.craftOneBtn.active = hasSelection; | ||
| this.craftThirtyBtn.active = hasSelection; | ||
| this.craftAllBtn.active = hasSelection; | ||
|
|
||
| renderTooltip(graphics, mouseX, mouseY); | ||
| } | ||
|
|
||
| /** | ||
| * Computes the on-screen position for the recipe book toggle button for this GUI. | ||
| * | ||
| * @return the screen position placed 5 pixels from the GUI's left edge and 49 pixels above the GUI's vertical center | ||
| */ | ||
| @Override | ||
| protected ScreenPosition getRecipeBookButtonPosition() { | ||
| // 1. Calculate the start (left) of your workbench GUI | ||
| int guiLeft = (this.width - this.imageWidth) / 2; | ||
|
|
||
| // 2. Calculate the top of your workbench GUI | ||
| int guiTop = (this.height - this.imageHeight) / 2; | ||
|
|
||
| // 3. Standard Vanilla positioning: | ||
| // Usually 5 pixels in from the left and 49 pixels up from the center | ||
| return new ScreenPosition(guiLeft + 5, guiTop + this.imageHeight / 2 - 49); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.