update to new LDLib recipe viewer changes #1067
Merged
Conversation
This file contains 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
… oh so many REI & EMI internals.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
# Conflicts: # src/main/java/com/gregtechceu/gtceu/api/gui/widget/PatternPreviewWidget.java # src/main/java/com/gregtechceu/gtceu/integration/GTRecipeWidget.java
|
viewing multiblocks in EMI is still kind of.. janky? @Arborsm could you look into that after this is merged? |
mikerooni
approved these changes
Apr 7, 2024
src/main/java/com/gregtechceu/gtceu/integration/GTOreByProductWidget.java
Show resolved
Hide resolved
|
won't merge this yet because of bugs listed on the discord server. mainly to do with EMI integration. |
* fix data bank pattern errors, network switch not transmitting data (#1073) * fix number formatting in recipe widget (#1070) * Port multiblock fluid tanks (#1072) * feat: add multiblock tanks * feat: add tank valve behavior * fix: tank valve rendering * fix: tank valve rotation * chore: run datagen * refactor: decouple used filter from isMetal in multiblock tanks * feat: add tooltips to multiblock tanks and valves * chore: fix file copy error * fixes * back REI * lang * fix emi PatternPreviewWidget --------- Co-authored-by: screret <[email protected]> Co-authored-by: Mikerooni <[email protected]>
# Conflicts: # src/generated/resources/assets/gtceu/lang/en_us.json # src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java # src/main/resources/assets/gtceu/lang/zh_cn.json
mikerooni
approved these changes
Apr 8, 2024
mikerooni
added a commit
that referenced
this pull request
Apr 8, 2024
* update to new LDLib recipe viewer changes which make us no longer use oh so many REI & EMI internals. * fix things * fix errors * fixes update-ldlib-recipeviewer-changes bugs (#1075) * fix data bank pattern errors, network switch not transmitting data (#1073) * fix number formatting in recipe widget (#1070) * Port multiblock fluid tanks (#1072) * feat: add multiblock tanks * feat: add tank valve behavior * fix: tank valve rendering * fix: tank valve rotation * chore: run datagen * refactor: decouple used filter from isMetal in multiblock tanks * feat: add tooltips to multiblock tanks and valves * chore: fix file copy error * fixes * back REI * lang * fix emi PatternPreviewWidget --------- Co-authored-by: screret <[email protected]> Co-authored-by: Mikerooni <[email protected]> --------- Co-authored-by: Arbor <[email protected]> Co-authored-by: Mikerooni <[email protected]>
screret
added a commit
that referenced
this pull request
Apr 9, 2024
* update to new LDLib recipe viewer changes which make us no longer use oh so many REI & EMI internals. * fix things * fix errors * fixes update-ldlib-recipeviewer-changes bugs (#1075) * fix data bank pattern errors, network switch not transmitting data (#1073) * fix number formatting in recipe widget (#1070) * Port multiblock fluid tanks (#1072) * feat: add multiblock tanks * feat: add tank valve behavior * fix: tank valve rendering * fix: tank valve rotation * chore: run datagen * refactor: decouple used filter from isMetal in multiblock tanks * feat: add tooltips to multiblock tanks and valves * chore: fix file copy error * fixes * back REI * lang * fix emi PatternPreviewWidget --------- Co-authored-by: screret <[email protected]> Co-authored-by: Mikerooni <[email protected]> --------- Co-authored-by: Arbor <[email protected]> Co-authored-by: Mikerooni <[email protected]>
screret
added a commit
that referenced
this pull request
Apr 10, 2024
* Fix multiblocks with only 1 energy/dynamo hatch not overclocking (#1046) * Feature/portable scanner port (#1052) * Added item for the portable scanner, logic tbd * Added basic scanner info * General scanner implementation to read out machine data from multis * Added debug scanner and finished scanner implementation * Added lang keys * Removed old item references and added portable scanner recipe * fix more max energy hatch amounts (#1044) * Emitter bug fix (#1057) * fix * rundata * . * fix (#1058) * all (#1055) * remake GTRecipeWidget add oc button (#1063) * remake GTRecipeWidget add oc button * update lang * delete hardcode * update zh_cn * change name * Fixed plunger not working (#1061) * Fixed plunger not doing anything but consuming durability * Added API to prevent the plunger from opening the UI when using it * Addressed reviews * Replaced isCrouching with isShiftKeyDown for plunger behavior * Fix ME Input Hatch and Output Bus (#1065) * hey it works (added a theorical fix to ME output bus and fixed ME Input Hatch) * Remove a missing debug line and change all ME parts (busses and hatches) to use EV hull texture * Do review requested changes * Research logic (#1001) * damn this is pain * start on research logic? * oh damn I think it almost works * piss off, i didn't click all of them after all * try sumthin' * chore: run datagen * refactor: Move machines classes to separate package * chore: add textures for data hatches * feat: research-related hatches and HPCA parts (rendering still WIP) * feat: data bank (rendering still WIP, wrong base texture on hatches) * feat: add network switch multiblock * feat: add HPCA multiblock * fix errors * fix research recipe lookup * run data * "only" bugs left, lots of them. * run data * more comments, change how total CWU as duration is handled * fix drops on some blocks, add todo * fix data bank crashing when unformed * some formatting changes * move all machine-specific tooltips to MachineLang * chore: run data * forgot a lang key. * remove duplicated tooltips * fix bad formatting keys * fix data bank, HPCA GUI; clean up ComputationRecipeLogic * fix creative data access hatch not having bloom * fix dual progress widget, research station JEI page * fix creative data access hatch having too much bloom * make GCYM 'unique' blocks use the correct textures + active state * run data * switch to jetbrains nullability annotations * make computation an actual recipe capability and be handled as such * add builder shortcuts for singleblock research machines for the people who want that * fix various crouch-dependant things not working when flying * fix HPCA part render * change HPCA id whilst I still can * feat: make any recipe type able to use research * fix GTTransferUtils simulate being inverted for fluids * fix wrong NotNull annotations * fix data access hatch not dropping, gui being offset * fix HPCA not using coolant * add recipes * add casingsPerCraft config * add harderCircuitRecipes config * fix data bank pattern * fix crash in buildRawRecipe * fix HPCA renderer part 2 * make any ol' machine able to use computation * rename AssemblyLineManager to ResearchManager * didn't mean to push the version change * fix error in recipe widget if recipe has `duration_is_total_cwu` set to true but no CWU inputs defined * requested changes * run data * run data 2 --------- Co-authored-by: mikerooni <[email protected]> * fix data bank pattern errors, network switch not transmitting data (#1073) * fix number formatting in recipe widget (#1070) * Port multiblock fluid tanks (#1072) * feat: add multiblock tanks * feat: add tank valve behavior * fix: tank valve rendering * fix: tank valve rotation * chore: run datagen * refactor: decouple used filter from isMetal in multiblock tanks * feat: add tooltips to multiblock tanks and valves * chore: fix file copy error * update to new LDLib recipe viewer changes (#1067) * update to new LDLib recipe viewer changes which make us no longer use oh so many REI & EMI internals. * fix things * fix errors * fixes update-ldlib-recipeviewer-changes bugs (#1075) * fix data bank pattern errors, network switch not transmitting data (#1073) * fix number formatting in recipe widget (#1070) * Port multiblock fluid tanks (#1072) * feat: add multiblock tanks * feat: add tank valve behavior * fix: tank valve rendering * fix: tank valve rotation * chore: run datagen * refactor: decouple used filter from isMetal in multiblock tanks * feat: add tooltips to multiblock tanks and valves * chore: fix file copy error * fixes * back REI * lang * fix emi PatternPreviewWidget --------- Co-authored-by: screret <[email protected]> Co-authored-by: Mikerooni <[email protected]> --------- Co-authored-by: Arbor <[email protected]> Co-authored-by: Mikerooni <[email protected]> * Update PSS UI to Show Seperate EU/t Values (#1078) * Ported Separate EU In and EU Out values for the PSS from 1.12 * Run Datagen * Fixed EU Out showing negative values * Fixed Bad Gems not being enabled * fix miscellaneous issues with research (#1076) * fix coil machine OC not applying correctly when using multi amp hatches * fix HPCA part rendering * fix CWU text being slightly offset * try to fix ore pages moving around by using a LinkedHashMap for order. * fix JEI crash that can happen with invalid ingredients. * fix HPCA part inventory render * Update zh_cn.json (#1079) * Fixes before 1.2.0 (#1074) * chore: remove processing array recipes to further prepare its removal * refactor: change deprecation warning color * refactor: disable processing array config option by default * chore: update deprecation warnings for Processing Array * fix: apply the correct tooltips to multi-slot hatches * chore: version and changelog * chore: bump ldlib version * Update ru lang (#1081) * fix MultiblockInfo in REI, adjust MultiblockInfo in JEI (#1082) * fix MultiblockInfo in REI, adjust MultiblockInfo in JEI * better * add singleblock scanner recipes * fix REI pattern preview loading * fix errors * Fix Large Boilers requiring a maintenance hatch when maintenance is disabled. (#1087) --------- Co-authored-by: Yibo Cao <[email protected]> Co-authored-by: Maxim <[email protected]> Co-authored-by: The__Flames <[email protected]> Co-authored-by: Arbor <[email protected]> Co-authored-by: StarL0stGaming <[email protected]> Co-authored-by: mikerooni <[email protected]> Co-authored-by: Ghostipedia <[email protected]> Co-authored-by: iouter <[email protected]> Co-authored-by: marisathewitch <[email protected]> Co-authored-by: Lura Skye <[email protected]>
DimaKuzmin
pushed a commit
to DimaKuzmin/GregTech-Modern
that referenced
this pull request
Jun 1, 2024
* Fix multiblocks with only 1 energy/dynamo hatch not overclocking (GregTechCEu#1046) * Feature/portable scanner port (GregTechCEu#1052) * Added item for the portable scanner, logic tbd * Added basic scanner info * General scanner implementation to read out machine data from multis * Added debug scanner and finished scanner implementation * Added lang keys * Removed old item references and added portable scanner recipe * fix more max energy hatch amounts (GregTechCEu#1044) * Emitter bug fix (GregTechCEu#1057) * fix * rundata * . * fix (GregTechCEu#1058) * all (GregTechCEu#1055) * remake GTRecipeWidget add oc button (GregTechCEu#1063) * remake GTRecipeWidget add oc button * update lang * delete hardcode * update zh_cn * change name * Fixed plunger not working (GregTechCEu#1061) * Fixed plunger not doing anything but consuming durability * Added API to prevent the plunger from opening the UI when using it * Addressed reviews * Replaced isCrouching with isShiftKeyDown for plunger behavior * Fix ME Input Hatch and Output Bus (GregTechCEu#1065) * hey it works (added a theorical fix to ME output bus and fixed ME Input Hatch) * Remove a missing debug line and change all ME parts (busses and hatches) to use EV hull texture * Do review requested changes * Research logic (GregTechCEu#1001) * damn this is pain * start on research logic? * oh damn I think it almost works * piss off, i didn't click all of them after all * try sumthin' * chore: run datagen * refactor: Move machines classes to separate package * chore: add textures for data hatches * feat: research-related hatches and HPCA parts (rendering still WIP) * feat: data bank (rendering still WIP, wrong base texture on hatches) * feat: add network switch multiblock * feat: add HPCA multiblock * fix errors * fix research recipe lookup * run data * "only" bugs left, lots of them. * run data * more comments, change how total CWU as duration is handled * fix drops on some blocks, add todo * fix data bank crashing when unformed * some formatting changes * move all machine-specific tooltips to MachineLang * chore: run data * forgot a lang key. * remove duplicated tooltips * fix bad formatting keys * fix data bank, HPCA GUI; clean up ComputationRecipeLogic * fix creative data access hatch not having bloom * fix dual progress widget, research station JEI page * fix creative data access hatch having too much bloom * make GCYM 'unique' blocks use the correct textures + active state * run data * switch to jetbrains nullability annotations * make computation an actual recipe capability and be handled as such * add builder shortcuts for singleblock research machines for the people who want that * fix various crouch-dependant things not working when flying * fix HPCA part render * change HPCA id whilst I still can * feat: make any recipe type able to use research * fix GTTransferUtils simulate being inverted for fluids * fix wrong NotNull annotations * fix data access hatch not dropping, gui being offset * fix HPCA not using coolant * add recipes * add casingsPerCraft config * add harderCircuitRecipes config * fix data bank pattern * fix crash in buildRawRecipe * fix HPCA renderer part 2 * make any ol' machine able to use computation * rename AssemblyLineManager to ResearchManager * didn't mean to push the version change * fix error in recipe widget if recipe has `duration_is_total_cwu` set to true but no CWU inputs defined * requested changes * run data * run data 2 --------- Co-authored-by: mikerooni <[email protected]> * fix data bank pattern errors, network switch not transmitting data (GregTechCEu#1073) * fix number formatting in recipe widget (GregTechCEu#1070) * Port multiblock fluid tanks (GregTechCEu#1072) * feat: add multiblock tanks * feat: add tank valve behavior * fix: tank valve rendering * fix: tank valve rotation * chore: run datagen * refactor: decouple used filter from isMetal in multiblock tanks * feat: add tooltips to multiblock tanks and valves * chore: fix file copy error * update to new LDLib recipe viewer changes (GregTechCEu#1067) * update to new LDLib recipe viewer changes which make us no longer use oh so many REI & EMI internals. * fix things * fix errors * fixes update-ldlib-recipeviewer-changes bugs (GregTechCEu#1075) * fix data bank pattern errors, network switch not transmitting data (GregTechCEu#1073) * fix number formatting in recipe widget (GregTechCEu#1070) * Port multiblock fluid tanks (GregTechCEu#1072) * feat: add multiblock tanks * feat: add tank valve behavior * fix: tank valve rendering * fix: tank valve rotation * chore: run datagen * refactor: decouple used filter from isMetal in multiblock tanks * feat: add tooltips to multiblock tanks and valves * chore: fix file copy error * fixes * back REI * lang * fix emi PatternPreviewWidget --------- Co-authored-by: screret <[email protected]> Co-authored-by: Mikerooni <[email protected]> --------- Co-authored-by: Arbor <[email protected]> Co-authored-by: Mikerooni <[email protected]> * Update PSS UI to Show Seperate EU/t Values (GregTechCEu#1078) * Ported Separate EU In and EU Out values for the PSS from 1.12 * Run Datagen * Fixed EU Out showing negative values * Fixed Bad Gems not being enabled * fix miscellaneous issues with research (GregTechCEu#1076) * fix coil machine OC not applying correctly when using multi amp hatches * fix HPCA part rendering * fix CWU text being slightly offset * try to fix ore pages moving around by using a LinkedHashMap for order. * fix JEI crash that can happen with invalid ingredients. * fix HPCA part inventory render * Update zh_cn.json (GregTechCEu#1079) * Fixes before 1.2.0 (GregTechCEu#1074) * chore: remove processing array recipes to further prepare its removal * refactor: change deprecation warning color * refactor: disable processing array config option by default * chore: update deprecation warnings for Processing Array * fix: apply the correct tooltips to multi-slot hatches * chore: version and changelog * chore: bump ldlib version * Update ru lang (GregTechCEu#1081) * fix MultiblockInfo in REI, adjust MultiblockInfo in JEI (GregTechCEu#1082) * fix MultiblockInfo in REI, adjust MultiblockInfo in JEI * better * add singleblock scanner recipes * fix REI pattern preview loading * fix errors * Fix Large Boilers requiring a maintenance hatch when maintenance is disabled. (GregTechCEu#1087) --------- Co-authored-by: Yibo Cao <[email protected]> Co-authored-by: Maxim <[email protected]> Co-authored-by: The__Flames <[email protected]> Co-authored-by: Arbor <[email protected]> Co-authored-by: StarL0stGaming <[email protected]> Co-authored-by: mikerooni <[email protected]> Co-authored-by: Ghostipedia <[email protected]> Co-authored-by: iouter <[email protected]> Co-authored-by: marisathewitch <[email protected]> Co-authored-by: Lura Skye <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What
updates to latest LDLib to remove uses of internal recipeviewer code and switch to (mostly) API only.
Implementation Details
added a
TagOrCycleItemStackTransferandTagOrCycleFluidTransferin LDLib and used those for managing tags in recipe viewer display slots to allow seeing e.g. the list of valid items in REI and EMI.Outcome
cleaner recipe viewer widgets with some extra features like stated above
Potential Compatibility Issues
shouldn't be, unless someone is mixining into our recipe viewer code.