Code

Rework Multiblock Abilities#2420

Code

Open

ghzdude wants to merge 103 commits intoGregTechCEu:masterGregTechCEu/GregTech:masterfrom ghzdude:gh-mutli-abilitiesghzdude/GregTechCEu:gh-mutli-abilitiesCopy head branch name to clipboard

+1,046-374

Commits

Commits on Jan 9, 2025

• initial work of multi abilities

  ghzdude

  committed
  1e83be0

  Copy full SHA for 1e83be0

• add controller to notifiable

  ghzdude

  committed
  f6daf31

  Copy full SHA for f6daf31

• save to nbt

  ghzdude

  committed
  d4b52ff

  Copy full SHA for d4b52ff

• renames

  ghzdude

  committed
  1f29159

  Copy full SHA for 1f29159

• spotless

  ghzdude

  committed
  1a9347f

  Copy full SHA for 1a9347f

• initial impl of dual handlers

  ghzdude

  committed
  48692b7

  Copy full SHA for 48692b7

• sbobl

  ghzdude

  committed
  97879c3

  Copy full SHA for 97879c3

• some work on combining abilities

  ghzdude

  committed
  32fcbca

  Copy full SHA for 32fcbca

• remove builder

  ghzdude

  committed
  ce8a6f4

  Copy full SHA for ce8a6f4

• dual handler probably works now

  ghzdude

  committed
  9adc061

  Copy full SHA for 9adc061

• small fixes

  ghzdude

  committed
  3f1a93e

  Copy full SHA for 3f1a93e

• a bit more work

  ghzdude

  committed
  d875cbb

  Copy full SHA for d875cbb

• try fix tests

  Show description for 3008757
  ghzdude

  committed
  3008757

  Copy full SHA for 3008757

• fix ghost circ init

  ghzdude

  committed
  0e7c8df

  Copy full SHA for 0e7c8df

• fix inventory init

  ghzdude

  committed
  edfc5ec

  Copy full SHA for edfc5ec

• add and use better utility methods

  ghzdude

  committed
  c856a10

  Copy full SHA for c856a10

• add method overloads for multiple abilities

  ghzdude

  committed
  1a0c0a0

  Copy full SHA for 1a0c0a0

• misc + spotless

  ghzdude

  committed
  94ea753

  Copy full SHA for 94ea753

• wtf distillation tower

  Show description for 7495168
  ghzdude

  committed
  7495168

  Copy full SHA for 7495168

• fix typo + spotless

  ghzdude

  committed
  4f08937

  Copy full SHA for 4f08937

• forgor tank props

  ghzdude

  committed
  8198390

  Copy full SHA for 8198390

• use new method

  ghzdude

  committed
  a6c25cd

  Copy full SHA for a6c25cd

• try and improve checks for dual handlers

  ghzdude

  committed
  647d062

  Copy full SHA for 647d062

• remove contains check

  ghzdude

  committed
  14e1f5a

  Copy full SHA for 14e1f5a

• mark delegates nonnull

  Show description for 82abff1
  ghzdude

  committed
  82abff1

  Copy full SHA for 82abff1

• INotifiable is not needed

  Show description for 63c2d41
  ghzdude

  committed
  63c2d41

  Copy full SHA for 63c2d41

• use new method

  ghzdude

  committed
  55bda4c

  Copy full SHA for 55bda4c

• improve handler checking

  ghzdude

  committed
  1da6d2b

  Copy full SHA for 1da6d2b

• forgor

  ghzdude

  committed
  cb8b678

  Copy full SHA for cb8b678

• spobl

  ghzdude

  committed
  0c5b3fc

  Copy full SHA for 0c5b3fc

• move DualHandler to capability package

  ghzdude

  committed
  ac7c42d

  Copy full SHA for ac7c42d

• add method for checking the ability at pos

  ghzdude

  committed
  c67797a

  Copy full SHA for c67797a

• remove unnecessary methods and usages

  ghzdude

  committed
  85b0cc2

  Copy full SHA for 85b0cc2

• move find recipe changes to MultiblockRecipeLogic

  ghzdude

  committed
  f4726f6

  Copy full SHA for f4726f6

• remove unnecessary abilities

  ghzdude

  committed
  352654d

  Copy full SHA for 352654d

• return key set which is the correct size

  ghzdude

  committed
  af5fa0c

  Copy full SHA for af5fa0c

• actually check correctly

  Show description for 23576e0
  ghzdude

  committed
  23576e0

  Copy full SHA for 23576e0

• minor oopsie

  ghzdude

  committed
  3d6ad01

  Copy full SHA for 3d6ad01

• fix issue in prepareRecipe

  ghzdude

  committed
  ba3300c

  Copy full SHA for ba3300c

• spblss

  ghzdude

  committed
  6c2e89d

  Copy full SHA for 6c2e89d

• add DualEntry to implement IFluidTank

  Show description for 06fad3b
  ghzdude

  committed
  06fad3b

  Copy full SHA for 06fad3b

• lower interface check

  ghzdude

  committed
  2355238

  Copy full SHA for 2355238

• move more logic to MultiblockRecipeLogic

  Show description for 2aeaffe
  ghzdude

  committed
  2aeaffe

  Copy full SHA for 2aeaffe

• fix dt rebase

  Show description for 496107f
  ghzdude

  committed
  496107f

  Copy full SHA for 496107f

• sblss

  ghzdude

  committed
  ebccd04

  Copy full SHA for ebccd04

• fix props

  ghzdude

  committed
  7666816

  Copy full SHA for 7666816

• add constructor

  Show description for ac3aa2d
  ghzdude

  committed
  ac3aa2d

  Copy full SHA for ac3aa2d

• fix issue with tests and recipe matching

  ghzdude

  committed
  21d2a7a

  Copy full SHA for 21d2a7a

• fix distinct recipe checking + misc

  ghzdude

  committed
  88cf1ef

  Copy full SHA for 88cf1ef

• refactor IMultiblockAbilityPart to reduce list instantiations

  ghzdude

  committed
  671f64b

  Copy full SHA for 671f64b

• use ObjectArrayList

  ghzdude

  committed
  fa2a6a6

  Copy full SHA for fa2a6a6

• no need to use this method here

  ghzdude

  committed
  6c5c857

  Copy full SHA for 6c5c857

• fix rebase

  ghzdude

  committed
  11fe724

  Copy full SHA for 11fe724

• return if there's nothing to check

  ghzdude

  committed
  d6a9484

  Copy full SHA for d6a9484

• attempt to retain references to the handlers

  ghzdude

  committed
  6526f61

  Copy full SHA for 6526f61

• remove unused methods + spotless

  ghzdude

  committed
  a355042

  Copy full SHA for a355042

• try reduce list depth

  ghzdude

  committed
  b7dc3bc

  Copy full SHA for b7dc3bc

• dual handler notifiable

  ghzdude

  committed
  e8fd9ba

  Copy full SHA for e8fd9ba

• size for notifiables

  ghzdude

  committed
  c6356f0

  Copy full SHA for c6356f0

• casually refactor notifiables

  Show description for d945704
  ghzdude

  committed
  d945704

  Copy full SHA for d945704

• fix issues with distinct consuming items

  ghzdude

  committed
  7d2f3ac

  Copy full SHA for 7d2f3ac

• address reviews

  ghzdude

  committed
  2491727

  Copy full SHA for 2491727

• store class for type checking

  Show description for 7786efc
  ghzdude

  committed
  7786efc

  Copy full SHA for 7786efc

• utilize new list

  ghzdude

  committed
  8d83336

  Copy full SHA for 8d83336

• update registration to new list

  ghzdude

  committed
  bbf145b

  Copy full SHA for bbf145b

• no need for dual handler here anymore

  ghzdude

  committed
  b5370c3

  Copy full SHA for b5370c3

• mark ability as nullable and add default

  ghzdude

  committed
  694532c

  Copy full SHA for 694532c

• changes to recipe logic are no longer necessary

  Show description for 9e83d60
  ghzdude

  committed
  9e83d60

  Copy full SHA for 9e83d60

• override more methods

  ghzdude

  committed
  6376a61

  Copy full SHA for 6376a61

• simplify DualHandler and improve notifiability

  ghzdude

  committed
  0fb50cc

  Copy full SHA for 0fb50cc

• make entry static again

  ghzdude

  committed
  48c3ac9

  Copy full SHA for 48c3ac9

• add back simple checking of extra fluids from items only when distinct is enabled

  ghzdude

  committed
  ecab010

  Copy full SHA for ecab010

• fix dual handler a bit

  Show description for 8a28d6f
  ghzdude

  committed
  8a28d6f

  Copy full SHA for 8a28d6f

• improve add method

  ghzdude

  committed
  e75c48f

  Copy full SHA for e75c48f

• update to getAbilities()

  ghzdude

  committed
  040a5a5

  Copy full SHA for 040a5a5

• fix warning

  ghzdude

  committed
  7e04dff

  Copy full SHA for 7e04dff

• check object type and collect if iterable

  Show description for bce0914
  ghzdude

  committed
  bce0914

  Copy full SHA for bce0914

• unneeded javadoc

  ghzdude

  committed
  4cd8e62

  Copy full SHA for 4cd8e62

• throw exception on adding or setting invalid element

  ghzdude

  committed
  4b62204

  Copy full SHA for 4b62204

• better javadocs

  ghzdude

  committed
  b75f2e8

  Copy full SHA for b75f2e8

• remove unnecessary override

  Show description for 5c7bfa4
  ghzdude

  committed
  5c7bfa4

  Copy full SHA for 5c7bfa4

• always assume a size of one

  ghzdude

  committed
  8b3d528

  Copy full SHA for 8b3d528

• fix potential npe with EMPTY

  ghzdude

  committed
  ccff22d

  Copy full SHA for ccff22d

• always check for extra fluids, but only for multis

  ghzdude

  committed
  66183ff

  Copy full SHA for 66183ff

• do not allow duplicate instances

  ghzdude

  committed
  ff47a7a

  Copy full SHA for ff47a7a

• check fluids in controller init instead of recipe logic

  ghzdude

  committed
  b3387eb

  Copy full SHA for b3387eb

• fix fluid voiding?

  Show description for 9b0295f
  ghzdude

  committed
  9b0295f

  Copy full SHA for 9b0295f

• fix tank list creation

  ghzdude

  committed
  92caafe

  Copy full SHA for 92caafe

• casually rework IMultipleTankHandler to use an extendable interface instead of sealed class

  Show description for 35be693
  ghzdude

  committed
  35be693

  Copy full SHA for 35be693

• add overloaded method

  Show description for e716fff
  ghzdude

  committed
  e716fff

  Copy full SHA for e716fff

• remove unnecessary overrides

  ghzdude

  committed
  8018399

  Copy full SHA for 8018399

• spotless

  ghzdude

  committed
  f15c3b8

  Copy full SHA for f15c3b8

• add javadoc

  Show description for 3df691c
  ghzdude

  committed
  3df691c

  Copy full SHA for 3df691c

• improve javadoc slightly

  ghzdude

  committed
  a70e49d

  Copy full SHA for a70e49d

• improve javadoc slightly

  Show description for d9656da
  ghzdude

  committed
  d9656da

  Copy full SHA for d9656da

• d

  ghzdude

  committed
  69f24e7

  Copy full SHA for 69f24e7

• fix rebase

  ghzdude

  committed
  52177f4

  Copy full SHA for 52177f4

Commits on Jan 14, 2025

• use reference equals instead

  ghzdude

  committed
  f268ffa

  Copy full SHA for f268ffa

Commits on Jan 21, 2025

• move circuit inventory to initializeInventory()

  Show description for 1d4e47b
  ghzdude

  committed
  1d4e47b

  Copy full SHA for 1d4e47b

• switch variable names to match MultiFluidTankEntry

  ghzdude

  committed
  e80cedd

  Copy full SHA for e80cedd

• use better method

  ghzdude

  committed
  0bd9b2a

  Copy full SHA for 0bd9b2a

Commits on Jan 25, 2025

• add circuit slot to reservoir hatch

  ghzdude

  committed
  89e65ac

  Copy full SHA for 89e65ac

• fix circuit slot

  ghzdude

  committed
  7f5f0be

  Copy full SHA for 7f5f0be