Port/Rework Crafting Station to MUI2 #2455

ghzdude · 2024-04-17T01:06:29Z

What

the fabled pr that ports the ~~crashing~~ Crafting Station to cleanroom mui, and also reworks the crafting station logic.
i now believe it is feature complete and ready for review

Implementation Details

rework crafting station logic
port crafting station to mui2

Todo/Notes

crafting grid - essentially complete
- JEI transfer complete
- should probably not be specific to the crafting station
- no longer extends itemslot
output slot
- no longer extends itemslot, syncing and interaction is handled manually
recipe memory slots
- effectively feature complete
inventory tab - essentially complete
- should correctly update and handle when inventories are added/removed

Outcome

crafting station will continue to exist

bruberu · 2024-06-04T04:11:34Z

brachy84 · 2025-01-20T22:01:37Z

src/main/java/gregtech/api/util/ItemStackHashStrategy.java

@@ -58,7 +58,7 @@ static ItemStackHashStrategy comparingItemDamageCount() {
     */
    class ItemStackHashStrategyBuilder {

-        private boolean item, count, damage, tag;
+        private boolean item, count, damage, tag, meta;


Why is damage not enough?

iirc because of GT Tools or something like that, i made this change a long time ago.

ALongStringOfNumbers

Shift clicking the output slot of the crafting station does not do anything, when you have enough items in the inventory to craft multiple of the output.

When viewing the contents of connected inventories in the inventory tab, the contents are not sorted so that all the actual items are visible at the top of the tab. Instead items are separated by any empty inventory spaces remaining in one of the inventories before showing other existing items.

this is 2 chests, 1 on either side of the station.

Crafting a recipe, locking the recipe in the memorized tab, and then crafting the recipe again removes the lock status in the memorized recipe tab.

There should be a way to clear the existing recipe displayed in the crafting slots widget, so you don't have to clock all the slots one by one. A little x or something in the top next to the grid.

I somehow managed to reset the count of the items crafted. Not sure how. I had crafted 16 LV motors, left the GUI, came back, crafted some other stuff, and the times crafted tooltip only showed 8.

There is some delay with the scroll bar in the item source window that can really be felt. If you scroll down and then immediately scroll back up, nothing happens on the scroll back up. You have to reach the bottom/top of the scroll bar distance for this to happen, if you change directions in the middle it feels ok.

The scroll bar for the item source tab is too close to the slots in the window, and cuts off the item counts of things in the right most slots.

The item source window should get some special handling for the quantum chest I believe, because right now is shows the virtualized items and the items in the output slot. It would be better if it showed a combined total of the two.

When the crafting station is checking if it can complete a recipe, it only checks its internal inventory and the connected inventories. Do we want to check the players inventory as well?

src/main/java/gregtech/common/inventory/handlers/SingleItemStackHandler.java

src/main/java/gregtech/common/mui/widget/workbench/RecipeMemorySlot.java

ALongStringOfNumbers · 2025-01-29T00:10:07Z

src/main/java/gregtech/common/mui/widget/workbench/RecipeMemorySlot.java

+    @Override
+    public void drawForeground(ModularGuiContext context) {
+        RichTooltip tooltip = getTooltip();
+        if (tooltip != null && isHoveringFor(tooltip.getShowUpTimer())) {


Why are we using tooltip.getShowUpTimer()? We never set a time value for the hovering amount, and the default time is 0 ticks.

this mimics mui2's item slot tooltip draw

src/main/java/gregtech/common/mui/widget/workbench/CraftingOutputSlot.java

src/main/java/gregtech/integration/jei/JustEnoughItemsModule.java

ALongStringOfNumbers · 2025-01-29T02:39:23Z

dependencies.gradle

@@ -42,6 +42,7 @@ dependencies {
    api("codechicken:codechickenlib:3.2.3.358")
    api("com.cleanroommc:modularui:2.5.0-rc2") { transitive = false }
    api("com.cleanroommc:groovyscript:1.2.0-hotfix1") { transitive = false }
+    api("curse.maven:inventory-bogosorter-632327:4951607-deobf-4951608-sources-4951609")


This is added as a dep, but nothing is done with it in this PR that I can see, do we still need it?

this is required due to ModularContainer implementing a bogosorter interface, which is loaded from GregTechGuiTransferHandler

use networkutils methods

fix removing recipe on client

ghzdude · 2025-01-30T00:30:16Z

Shift clicking the output slot of the crafting station does not do anything, when you have enough items in the inventory to craft multiple of the output.

it should craft the item once (at least it does for me)

I somehow managed to reset the count of the items crafted. Not sure how. I had crafted 16 LV motors, left the GUI, came back, crafted some other stuff, and the times crafted tooltip only showed 8.

uh, not sure how that could happen, and i don't think i'm reproducing it.

There is some delay with the scroll bar in the item source window that can really be felt. If you scroll down and then immediately scroll back up, nothing happens on the scroll back up. You have to reach the bottom/top of the scroll bar distance for this to happen, if you change directions in the middle it feels ok.

this is a mui2 issue i think, would need to look into it more

The scroll bar for the item source tab is too close to the slots in the window, and cuts off the item counts of things in the right most slots.

that's the grid default, but i might be able to change it

When the crafting station is checking if it can complete a recipe, it only checks its internal inventory and the connected inventories. Do we want to check the players inventory as well?

i don't think previous logic checked the player inventory, but i could look into adding that

ALongStringOfNumbers

The crafting station doesn't handle special crafting recipe with fluid containers. EG, you can use a drum of creosote to craft treated wood in a normal crafting table, but this is not recognized in the crafting station.

Some weird highlighting going on with the crafting grid when I placed in ghost ingredients by hand. Started in the bottom right, and then added items counter clockwise. I think it failed on the stick recipe when I added the two items into the grid, but then did not update the tint as I added more items into the grid. Yeah, testing this with jungle planks, it forms the stick recipe after placing in two planks, but then the tint does not disappear after invalidating the stick recipe by placing a third plank in the grid.

picture:

Found a way to void items. When crafting a lot of an item, such that the internal inventory fills up, continueing to shift click craft the item will void the output, instead of placing it in the players inventory or dropping it on the ground if the players inventory is full (I don't remember if vanilla drops the items on the ground if the players inventory is full, or just prevents more crafts). I was testing this with the Invar Wrench recipe, and this only happened when shift clicking the craft.

No tool crafting sounds are played when crafting items with GT tools in the crafting station. This does not apply to the breaking sound though, that works fine.

Found some weird slot tinting issue, where some slots are tinted darker than other slots. I had the recipe for Circuit Boards in the table, and then shift clicked in the recipe for iron plates from JEI, and two of the slots were tinted darker than they should be for empty slots.

picture:

For the memorized recipe grid, while it is not full, new crafts are added to the beginning of the list and displayed in the top right slot. However, after the grid is filled up new recipes are added to the bottom right slot. Previously new recipes would always be added to the top left slot, and if the grid was full the bottom right slot would be deleted, with the slot next to it taking its place. This is to always have the most recent crafted recipe not immediately be pushed off the grid if you craft another new recipe.

move used memorized recipe to the front

ghzdude · 2025-01-30T22:43:46Z

The crafting station doesn't handle special crafting recipe with fluid containers. EG, you can use a drum of creosote to craft treated wood in a normal crafting table, but this is not recognized in the crafting station.

these recipes work fine for me

Some weird highlighting going on with the crafting grid when I placed in ghost ingredients by hand. Started in the bottom right, and then added items counter clockwise. I think it failed on the stick recipe when I added the two items into the grid, but then did not update the tint as I added more items into the grid. Yeah, testing this with jungle planks, it forms the stick recipe after placing in two planks, but then the tint does not disappear after invalidating the stick recipe by placing a third plank in the grid.

this is fixed.

Found a way to void items. When crafting a lot of an item, such that the internal inventory fills up, continueing to shift click craft the item will void the output, instead of placing it in the players inventory or dropping it on the ground if the players inventory is full (I don't remember if vanilla drops the items on the ground if the players inventory is full, or just prevents more crafts). I was testing this with the Invar Wrench recipe, and this only happened when shift clicking the craft.

fixed

No tool crafting sounds are played when crafting items with GT tools in the crafting station. This does not apply to the breaking sound though, that works fine.

i'm actually not sure how to get the tool crafting sound

Found some weird slot tinting issue, where some slots are tinted darker than other slots. I had the recipe for Circuit Boards in the table, and then shift clicked in the recipe for iron plates from JEI, and two of the slots were tinted darker than they should be for empty slots.

couldn't reproduce

For the memorized recipe grid, while it is not full, new crafts are added to the beginning of the list and displayed in the top right slot.

i couldn't reproduce this, but it might be fixed now

However, after the grid is filled up new recipes are added to the bottom right slot. Previously new recipes would always be added to the top left slot, and if the grid was full the bottom right slot would be deleted, with the slot next to it taking its place. This is to always have the most recent crafted recipe not immediately be pushed off the grid if you craft another new recipe.

this is fixed now

ALongStringOfNumbers

The implemented dragging ghost ingredients from JEI doesn't really work. You can get the ghost ingredient onto your cursor, but when you click the grid with the item, nothing happens.

Durability render for tools in the crafting matrix is offcenter.

Can't click items from the output slot if there are items on the players cursor, even if the items match. You might want to look at the previous implementation of the various button clicks on the output slot, and see what all edge cases they solved.

Cannot use R/U JEI buttons on items in the memorized recipe widget

You can have both a locked and nonlocked memorized recipe of the same output (Tested with invar plates). If there is a locked recipe already, a new one should not be added, especially if it is the same recipe.

This may be hard, but right now, if the internal inventory is full, shift clicking a recipe will not complete the recipe, even if all the inputs would be consumed, thus freeing a slot in the internal inventory. Maybe it would be possible to calculate if a slot would be freed after using all the inputs, and if so craft the item, depositing the output into the now vacant input slot?

src/main/java/gregtech/common/gui/widget/craftingstation/CraftingSlotWidget.java

ALongStringOfNumbers · 2025-02-01T05:38:28Z

src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityWorkbench.java

+    public IWidget createCraftingOutput(PosGuiData guiData, PanelSyncManager syncManager) {
+        var amountCrafted = new IntSyncValue(this::getItemsCrafted, this::setItemsCrafted);
+        syncManager.syncValue("amount_crafted", amountCrafted);
+        amountCrafted.updateCacheFromSource(true); // todo remove


this is to work around an issue with int sync values where they don't set their cache on construction, there's a mixin in #2672 but it's also fixed in mui2 rc3

src/main/java/gregtech/common/metatileentities/storage/CraftingRecipeLogic.java

fix crafting with same item in hand

clarify todo

ghzdude added the type: feature New feature or request label Apr 17, 2024

ghzdude force-pushed the gh-crafting-station-mui-port branch from 270a020 to 85a5c84 Compare April 20, 2024 21:20

ghzdude marked this pull request as ready for review May 3, 2024 18:51

ghzdude requested review from a team as code owners May 3, 2024 18:51

ghzdude force-pushed the gh-crafting-station-mui-port branch 2 times, most recently from f528df5 to 07a2377 Compare June 9, 2024 19:46

ghzdude force-pushed the gh-crafting-station-mui-port branch from 2c0f220 to f4e1615 Compare July 20, 2024 17:24

ghzdude force-pushed the gh-crafting-station-mui-port branch from 9914d3b to 6160fd7 Compare August 25, 2024 06:53

MCTian-mi mentioned this pull request Oct 5, 2024

Mouse Tweaks: set scroll wheel tweak disabled by default SymmetricDevs/Supersymmetry#1008

Open

ghzdude force-pushed the gh-crafting-station-mui-port branch from d88f038 to 1558a94 Compare October 17, 2024 00:13

ghzdude force-pushed the gh-crafting-station-mui-port branch from 3350a30 to f542e0b Compare January 10, 2025 01:46

brachy84 reviewed Jan 20, 2025

View reviewed changes

ALongStringOfNumbers reviewed Jan 29, 2025

View reviewed changes

ghzdude added 15 commits January 29, 2025 14:29

initial work on workbench port

038b268

make crafting logic not server only

0937104

fix crafting output slot

3acd0e3

add class for jei recipe transfer

4363a18

update recipe appropriately

e2f9ae1

more work on ui

9fc9a8e

wrap InventoryCrafting

ec22458

more work on output crafting slot

71a3b66

test extending modularslot

ebd88df

more work on crafting logic

e732e90

add method to get inventory

74b92db

implement method

5b9400f

sync crafting matrix

56e7a4b

fix some issues with the output slot

50624a1

more work on crafting logic woo

51a279a

ghzdude added 8 commits January 29, 2025 15:14

remove unneeded override

58328de

name internal ids

f1b262d

use networkutils methods

make constructor private

b545de7

rename and cleanup

647a14f

cleanup and sort inventory list

87b8c48

fix lock not syncing

492286f

fix removing recipe on client

oops

478a54d

add button to clear grid

876b785

ghzdude added 3 commits January 29, 2025 19:16

implement multi-crafting with shift

8d92a30

fix off by one crafting

9dda6ae

use modified draw item method

e3039a6

ALongStringOfNumbers reviewed Jan 30, 2025

View reviewed changes

ghzdude added 7 commits January 30, 2025 01:24

reset ingredients

e59aebd

improve recipe memory offsetting

585bdd4

move used memorized recipe to the front

no need to move recipes at index 0

f84a3a9

check and simulate if output can be inserted

e7a875d

clear and refresh the lookup map every tick

6dacf63

fix issue with output slot not crafting when not holding shift

445c94c

more lang, remove todo

fb29c8f

ghzdude added 3 commits January 30, 2025 20:27

implement dragging for input slots

eb43be9

add todo

4d8b07f

fix toolbelt slot group

0852124

ALongStringOfNumbers reviewed Feb 1, 2025

View reviewed changes

ghzdude added 5 commits January 31, 2025 23:48

fix tools not making crafting sounds

367ea78

fix crafting with same item in hand

fix item overlay rendering

8f42a8e

don't transfer if not in workbench

a0cb66b

make RecipeMemorySlot a jei ingredient provider

09a8ee5

fix duplicate recipe memory

6162861

clarify todo

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Port/Rework Crafting Station to MUI2 #2455

Port/Rework Crafting Station to MUI2 #2455

ghzdude commented Apr 17, 2024 •

edited

Loading

bruberu commented Jun 4, 2024 •

edited

Loading

brachy84 Jan 20, 2025

ghzdude Jan 20, 2025

ALongStringOfNumbers left a comment •

edited

Loading

ALongStringOfNumbers Jan 29, 2025

ghzdude Jan 29, 2025

ALongStringOfNumbers Jan 29, 2025

ghzdude Jan 29, 2025

ghzdude commented Jan 30, 2025

ALongStringOfNumbers left a comment •

edited

Loading

ghzdude commented Jan 30, 2025

ALongStringOfNumbers left a comment •

edited

Loading

ALongStringOfNumbers Feb 1, 2025

ghzdude Feb 1, 2025

Port/Rework Crafting Station to MUI2 #2455

Are you sure you want to change the base?

Port/Rework Crafting Station to MUI2 #2455

Conversation

ghzdude commented Apr 17, 2024 • edited Loading

What

Implementation Details

Todo/Notes

Outcome

bruberu commented Jun 4, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ALongStringOfNumbers left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghzdude commented Jan 30, 2025

ALongStringOfNumbers left a comment • edited Loading

Choose a reason for hiding this comment

ghzdude commented Jan 30, 2025

ALongStringOfNumbers left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghzdude commented Apr 17, 2024 •

edited

Loading

bruberu commented Jun 4, 2024 •

edited

Loading

ALongStringOfNumbers left a comment •

edited

Loading

ALongStringOfNumbers left a comment •

edited

Loading

ALongStringOfNumbers left a comment •

edited

Loading