Rework Multiblock Abilities #2420

ghzdude · 2024-03-19T18:59:35Z

What

Reworks IMultiblockAbilityPart to allow for multiple abilities from one part.
MultiblockRecipeLogic checks if an item handler could also be a fluid handler (only for distinct mode atm)
Implements a ghost circuit slot for single-tank fluid input hatches.

Implementation Details

add a class to MultiblockAbility's constructor so that class types can be checked
add a new class to store instances of a MultilbockAbility. types are checked and an exception is thrown when the wrong type is added.
a new class, DualHandler, is added to implement item and fluid handling capabilities. (not used for anything atm)
Should multitank fluid hatches (quad/nonuple) have ghost circuits as well?

Outcome

fluid hatches are more spooky

src/main/java/gregtech/api/DualHandler.java

src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java

serenibyss · 2024-07-10T05:55:51Z

src/main/java/gregtech/api/metatileentity/multiblock/MultiblockControllerBase.java

-            for (IMultiblockPart multiblockPart : parts) {
-                if (multiblockPart instanceof IMultiblockAbilityPart) {
-                    @SuppressWarnings("unchecked")
-                    IMultiblockAbilityPart<Object> abilityPart = (IMultiblockAbilityPart<Object>) multiblockPart;
-                    List<Object> abilityInstancesList = abilities.computeIfAbsent(abilityPart.getAbility(),
-                            k -> new ArrayList<>());
-                    abilityPart.registerAbilities(abilityInstancesList);
+            for (IMultiblockPart part : parts) {
+                if (part instanceof IMultiblockAbilityPart abilityPart) {
+                    List<MultiblockAbility> abilityList = abilityPart.getAbilities();
+                    for (MultiblockAbility ability : abilityList) {
+                        List abilityInstancesList = abilities.computeIfAbsent(ability,
+                                k -> new ArrayList<>());
+                        abilityInstancesList.addAll(abilityPart.registerAbilities(ability));
+                    }


What happens here if a single multiblock part has IMPORT_ITEMS and IMPORT_FLUIDS, but the multiblock only allows one of these in the structure at that position. Should the part be allowed or rejected?

I added a method that skips adding abilities at certain positions, but should i just invalidate the multiblock instead?

src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java

src/main/java/gregtech/api/metatileentity/multiblock/MultiblockAbility.java

src/main/java/gregtech/api/capability/INotifiableHandler.java

src/main/java/gregtech/api/capability/DualHandler.java

ALongStringOfNumbers · 2025-01-21T02:31:20Z

...ain/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFluidHatch.java

-        return isExportHatch ? MultiblockAbility.EXPORT_FLUIDS : MultiblockAbility.IMPORT_FLUIDS;
+    public @NotNull List<MultiblockAbility<?>> getAbilities() {
+        return isExportHatch ?
+                Collections.singletonList(MultiblockAbility.EXPORT_FLUIDS) :


Do the slots for filling fluid containers technically not count for abilities here?

i don't think it makes sense to include the IO slots when searching for a recipe

...ain/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFluidHatch.java

src/main/java/gregtech/api/capability/DualHandler.java

ALongStringOfNumbers · 2025-01-23T04:09:06Z

Should the reservoir hatch also get a circuit slot?

src/main/java/gregtech/api/metatileentity/multiblock/AbilityInstances.java

src/main/java/gregtech/api/metatileentity/multiblock/MultiblockAbility.java

src/main/java/gregtech/api/metatileentity/multiblock/MultiblockControllerBase.java

src/main/java/gregtech/api/metatileentity/multiblock/RecipeMapMultiblockController.java

ALongStringOfNumbers

Will take a look at the Fluid Hatch GUI stuff next time

src/main/java/gregtech/api/capability/DualHandler.java

ALongStringOfNumbers · 2025-02-22T04:49:03Z

src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java

+        if (items instanceof IMultipleTankHandler tankHandler) {
+            tanks.addAll(tankHandler.getFluidTanks());
+        }
+        return new FluidTankList(getInputTank().allowSameFluidFill(), tanks);


So this takes allowSameFluidFill from the normal input tanks, but does not take into account if any of the dual handlers discovered set this value to true. Do we want to check if any of the discovered tanks have this set to true, and if so pass that to the FluidTankList? Or what happens when a dual handler allows same fill, but normal hatches on the multiblock do not?

src/main/java/gregtech/api/capability/impl/ItemHandlerList.java

ALongStringOfNumbers · 2025-02-22T05:19:15Z

src/main/java/gregtech/api/capability/impl/FluidTankList.java

+     * Entry of multi fluid tanks. Retains reference to original {@link IMultipleTankHandler} for accessing
+     * information such as {@link IMultipleTankHandler#allowSameFluidFill()}.
+     */
+    private static final class MultiFluidTankEntry implements ITankEntry {


I am sort of confused why we need this class in the first place. The incoming fluid data is wrapped into this MultiFluidTankEntry, but then immediately unwrapped into an ITankEntry.

src/main/java/gregtech/api/metatileentity/multiblock/MultiblockAbility.java

src/main/java/gregtech/api/metatileentity/multiblock/MultiblockControllerBase.java

ALongStringOfNumbers · 2025-02-22T05:51:29Z

src/main/java/gregtech/api/metatileentity/multiblock/RecipeMapMultiblockController.java

+            }
+        }
+
+        return new FluidTankList(allowSameFluidFillForOutputs(), tanks);


Same question about if the DualHandler allows same fill, but the normal hatches on the structure do not.

if the tanks are already wrapped, then they should respect the setting of their parent fluid tank list

ALongStringOfNumbers

Got this error in the log when I was playing around with the reservoir hatch,

[22:41:51] [Client thread/ERROR] [modularui]: Tried to open a panel, but a panel handler that opens the same panel already exists. Using existing panel handler!

Repeat by shift clicking the circuit slot, set a circuit number with shift click, and then shift click the circuit slot again and set a new number with shift click.

ALongStringOfNumbers · 2025-02-24T06:00:48Z

...ain/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFluidHatch.java

+        super.initializeInventory();
+        if (this.hasGhostCircuitInventory()) {
+            this.circuitInventory = new GhostCircuitItemStackHandler(this);
+            this.circuitInventory.addNotifiableMetaTileEntity(this);


Why do we need to add the fluid hatch to the notified list? Since the hatch can never perform any recipes. We get the multiblock in the add to structure override, but I don't think there is any need for the hatch itself to be notified, is there?

idk, every other usage of GhostCircuitItemStackHandler does this as well, but it doesn't seem to be needed?

src/main/java/gregtech/api/capability/IDualHandler.java

...java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityReservoirHatch.java

ghzdude · 2025-02-24T17:02:55Z

Got this error in the log when I was playing around with the reservoir hatch,
[22:41:51] [Client thread/ERROR] [modularui]: Tried to open a panel, but a panel handler that opens the same panel already exists. Using existing panel handler!
Repeat by shift clicking the circuit slot, set a circuit number with shift click, and then shift click the circuit slot again and set a new number with shift click.

this is because the ghost circuit slot calls IPanelHandler.simple() on each mouse click. it isn't really the ideal way to handle the popup, but that should be changed in the rc4 pr imo.

spotless

…nstead of sealed class casually rework DualEntry to not be an item handler

fix distinct fluids

spotless

clarify existing check at set use simple name instead of class string

initial sync circuit value

remove unused methods simplify AbilityInstances a bit remove exception throwing remove getAbilitiesModifiable()

add contains check

rename delegate methods add annotations add javadoc remove unused method

add toString to instances

ghzdude added the type: refactor Suggestion to refactor a section of code label Mar 19, 2024

ghzdude force-pushed the gh-mutli-abilities branch from 0c22cbd to 6b8c11a Compare March 19, 2024 20:09

ghzdude force-pushed the gh-mutli-abilities branch 2 times, most recently from b58ef1c to f6b840f Compare April 6, 2024 06:48

ghzdude force-pushed the gh-mutli-abilities branch from 6bdc2d7 to 6d0fcf2 Compare April 14, 2024 16:52

Zorbatron mentioned this pull request Jun 6, 2024

Add creative reservoir block #2494

Closed

ghzdude force-pushed the gh-mutli-abilities branch from 6d0fcf2 to dff15e9 Compare July 4, 2024 20:01

ghzdude marked this pull request as ready for review July 4, 2024 23:03

ghzdude requested a review from a team as a code owner July 4, 2024 23:03

ghzdude force-pushed the gh-mutli-abilities branch from 829ea5f to 04ad422 Compare July 6, 2024 02:51

serenibyss reviewed Jul 10, 2024

View reviewed changes

ghzdude force-pushed the gh-mutli-abilities branch from 3700d34 to bfd2e2f Compare July 11, 2024 23:26

ghzdude force-pushed the gh-mutli-abilities branch from fd8136b to 4ac4934 Compare July 27, 2024 00:00

TechLord22 reviewed Aug 2, 2024

View reviewed changes

ghzdude force-pushed the gh-mutli-abilities branch from ce00ff9 to 734585c Compare October 16, 2024 03:17

ghzdude force-pushed the gh-mutli-abilities branch from 7e565d2 to 73bc303 Compare December 31, 2024 23:24

Zorbatron mentioned this pull request Jan 2, 2025

[Suggestion] Port Dual Input Buffers from GTNH Twist Space Zorbatron/ZBGT#116

Open

ghzdude force-pushed the gh-mutli-abilities branch from 4406c85 to 52177f4 Compare January 9, 2025 02:30

ALongStringOfNumbers reviewed Jan 21, 2025

View reviewed changes

ghzdude force-pushed the gh-mutli-abilities branch from 7f5f0be to 7e2e27a Compare February 3, 2025 22:02

ALongStringOfNumbers reviewed Feb 16, 2025

View reviewed changes

ALongStringOfNumbers reviewed Feb 22, 2025

View reviewed changes

ghzdude force-pushed the gh-mutli-abilities branch from 7946c82 to 23fc855 Compare February 22, 2025 21:30

ALongStringOfNumbers reviewed Feb 24, 2025

View reviewed changes

ghzdude force-pushed the gh-mutli-abilities branch from b572825 to b29e781 Compare February 27, 2025 02:59

ALongStringOfNumbers approved these changes Mar 4, 2025

View reviewed changes

ghzdude added 2 commits March 3, 2025 22:47

initial work of multi abilities

f5a8c13

add controller to notifiable

ad55eeb

ghzdude added 28 commits March 3, 2025 22:48

do not allow duplicate instances

394d02c

check fluids in controller init instead of recipe logic

f2454c2

fix fluid voiding?

4d4b5ab

spotless

fix tank list creation

6aef6f1

casually rework IMultipleTankHandler to use an extendable interface i…

b53525d

…nstead of sealed class casually rework DualEntry to not be an item handler

add overloaded method

b669d56

fix distinct fluids

remove unnecessary overrides

79526e4

spotless

84b4350

add javadoc

91d627d

spotless

improve javadoc slightly

45592b1

improve javadoc slightly

e20b0e6

clarify existing check at set use simple name instead of class string

d

4ba0536

fix rebase

10300da

use reference equals instead

626139a

move circuit inventory to initializeInventory()

0f1d889

initial sync circuit value

switch variable names to match MultiFluidTankEntry

63188bc

use better method

7b34852

add circuit slot to reservoir hatch

4e8bc4d

fix rebase + spotless

38a789c

remove name registry

37a0dcc

remove unused methods simplify AbilityInstances a bit remove exception throwing remove getAbilitiesModifiable()

reset extended fluid inputs

b5b3485

add comment

d5c3556

add contains check

use dual handler in qstorage controller

44b6745

rename delegate methods add annotations add javadoc remove unused method

remove todo

7c92696

check if already wrapped

c59751b

replace IDualHandler with DualHandler

82c849f

add various overrides to fix circuit in reservoir hatch

707a57e

make cast list not null

83a4325

add toString to instances

ghzdude force-pushed the gh-mutli-abilities branch from 0b42db8 to 83a4325 Compare March 4, 2025 05:56

ALongStringOfNumbers approved these changes Mar 4, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rework Multiblock Abilities #2420

Rework Multiblock Abilities #2420

ghzdude commented Mar 19, 2024 •

edited

Loading

serenibyss Jul 10, 2024

ghzdude Jul 10, 2024

ALongStringOfNumbers Jan 21, 2025

ghzdude Jan 21, 2025

ALongStringOfNumbers commented Jan 23, 2025

ALongStringOfNumbers left a comment

ALongStringOfNumbers Feb 22, 2025

ALongStringOfNumbers Feb 22, 2025

ALongStringOfNumbers Feb 22, 2025

ghzdude Feb 22, 2025

ALongStringOfNumbers left a comment

ALongStringOfNumbers Feb 24, 2025

ghzdude Feb 27, 2025

ghzdude commented Feb 24, 2025 •

edited

Loading

Rework Multiblock Abilities #2420

Are you sure you want to change the base?

Rework Multiblock Abilities #2420

Conversation

ghzdude commented Mar 19, 2024 • edited Loading

What

Implementation Details

Outcome

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

ALongStringOfNumbers commented Jan 23, 2025

ALongStringOfNumbers left a 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

Choose a reason for hiding this comment

ALongStringOfNumbers left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghzdude commented Feb 24, 2025 • edited Loading

ghzdude commented Mar 19, 2024 •

edited

Loading

ghzdude commented Feb 24, 2025 •

edited

Loading