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

ALongStringOfNumbers · 2025-01-21T02:34:10Z

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

@@ -86,6 +119,8 @@ public NBTTagCompound writeToNBT(NBTTagCompound data) {
            if (locked && lockedFluid != null) {
                data.setTag("LockedFluid", lockedFluid.writeToNBT(new NBTTagCompound()));
            }
+        } else {
+            this.circuitInventory.write(data);


Is just writing data here correct? Also, why not just serialize the integrated circuit number?

Also, the circuit number needs to be added to initial sync as well, since setting the circuit, exiting the world, and then rejoining will result in the circuit being lost.

this method does just serialize the circuit value, unless you want me to move that logic here and remove the method

ALongStringOfNumbers · 2025-01-21T03:29:41Z

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

+import java.util.ArrayList;
+import java.util.List;
+
+public class DualHandler implements IItemHandlerModifiable, IMultipleTankHandler, INotifiableHandler {


Minor, missing some annotations in this class, notnull, etc

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

ALongStringOfNumbers · 2025-01-21T03:49:08Z

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

+        @Override
+        public @NotNull IFluidTank getDelegate() {
+            return this.tank;
+        }


Are these two backwards? Returning the wrong thing for the method?

with respect to MultiFluidTankEntry, these methods return the correct objects, but their names are reversed

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

Should the reservoir hatch also get a circuit slot?

remove warn

some javadocs

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

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 added 10 commits February 3, 2025 14:53

initial work of multi abilities

405fb3c

add controller to notifiable

fb3b483

save to nbt

6f9f73b

renames

cdfb0b4

spotless

2e2220c

initial impl of dual handlers

eadc8ce

sbobl

e8dc566

some work on combining abilities

7c0df04

remove builder

9933c7e

dual handler probably works now

653556b

ghzdude added 29 commits February 3, 2025 14:54

update to getAbilities()

770cfed

fix warning

205b470

check object type and collect if iterable

ddb77a1

remove warn

unneeded javadoc

78e49d4

throw exception on adding or setting invalid element

370a90a

better javadocs

92cf35c

remove unnecessary override

836cc9f

some javadocs

always assume a size of one

dfba336

fix potential npe with EMPTY

dcce7f0

always check for extra fluids, but only for multis

8a56b0b

do not allow duplicate instances

d83f09f

check fluids in controller init instead of recipe logic

dafdc2e

fix fluid voiding?

a2e436b

spotless

fix tank list creation

76b3c51

casually rework IMultipleTankHandler to use an extendable interface i…

693ab71

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

add overloaded method

315462c

fix distinct fluids

remove unnecessary overrides

5b3b510

spotless

91ab818

add javadoc

ba5e722

spotless

improve javadoc slightly

ee8a043

improve javadoc slightly

c364dfd

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

d

b3b215e

fix rebase

72911db

use reference equals instead

dfe46ab

move circuit inventory to initializeInventory()

ba16d0c

initial sync circuit value

switch variable names to match MultiFluidTankEntry

95fcc43

use better method

f8f2a27

add circuit slot to reservoir hatch

3343d75

fix rebase + spotless

7e2e27a

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

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 Jan 21, 2025

ghzdude Jan 21, 2025

ALongStringOfNumbers Jan 21, 2025

ALongStringOfNumbers Jan 21, 2025

ghzdude Jan 21, 2025

ALongStringOfNumbers commented Jan 23, 2025

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

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 commented Jan 23, 2025

ghzdude commented Mar 19, 2024 •

edited

Loading