Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various Fixes #39

Merged
merged 9 commits into from
Jul 12, 2024
Merged

Various Fixes #39

merged 9 commits into from
Jul 12, 2024

Conversation

glowredman
Copy link
Member

Due to GTNewHorizons/AE2FluidCraft-Rework#213 AE2 Fluid Crafting now specifies more mods to be loaded after which can result in a changed load order like this:

AE2FC 1.3.8-pre AE2FC 1.3.9
Applied Energistics 2 Applied Energistics 2
AE2 Fluid Crafting CoFH Core
CoFH Core Baubles
Baubles Thaumcraft
Thaumcraft Waila
Waila Thaumic Energistics
Avaritia AE2 Wireless Crafting Terminal
AE2 Wireless Crafting Terminal AE2 Fluid Crafting
Thaumic Energistics Avaritia

AE2FC now requires ThE to be loaded before it while Avaritia still defaults to being loaded after AE2FC. ThE registers the Gaseous Essentia fluids during postInit. During this load phase Avaritia used to register its Terminus aspect too, which is now to late. As a result, using Terminus Essentia in AE2 is no longer possible. The Essentia Storage Cells still store it, which causes these log messages each time the cell is read:

[18:21:46] [Server thread/WARN] [FML/]: ****************************************
[18:21:46] [Server thread/WARN] [FML/]: * Null fluid supplied to fluidstack. Did you try and create a stack for an unregistered fluid?
[18:21:46] [Server thread/WARN] [FML/]: *  at RFB-Launch//net.minecraftforge.fluids.FluidStack.<init>(FluidStack.java:35)
[18:21:46] [Server thread/WARN] [FML/]: *  at RFB-Launch//thaumicenergistics.common.integration.tc.EssentiaConversionHelper.createAEFluidStackInFluidUnits(EssentiaConversionHelper.java:111)
[18:21:46] [Server thread/WARN] [FML/]: *  at RFB-Launch//thaumicenergistics.common.integration.tc.EssentiaConversionHelper.createAEFluidStackInEssentiaUnits(EssentiaConversionHelper.java:98)
[18:21:46] [Server thread/WARN] [FML/]: *  at RFB-Launch//thaumicenergistics.common.inventory.HandlerItemEssentiaCell.getAvailableItems(HandlerItemEssentiaCell.java:531)
[18:21:46] [Server thread/WARN] [FML/]: *  at RFB-Launch//appeng.me.storage.MEInventoryHandler.getAvailableItems(MEInventoryHandler.java:104)
[18:21:46] [Server thread/WARN] [FML/]: *  at RFB-Launch//appeng.me.cache.GridStorageCache$CellChangeTrackerRecord.<init>(GridStorageCache.java:351)...
[18:21:46] [Server thread/WARN] [FML/]: ****************************************

By moving the aspect creating to preInit (like e.g. Magic Bees does), it is ensured that ThE finds the aspect during postInit.
I found this issue outside of GTNH but I assume it is a problem here too (even if not, it might become one once the load order changes again).

Other changes:

  • updated buildscript
  • updated dependencies
  • switched from token replacement to Tags class
  • enabled generic injection and did the resulting cleanup
  • added missing @Override annotations
  • removed redundant @SideOnly(Side.CLIENT) annotations
  • replaced most reflection with ATs
  • removed some commented-out code

@glowredman glowredman requested a review from a team July 11, 2024 21:24
Copy link

@OneEyeMaker OneEyeMaker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@glowredman glowredman merged commit 91bfbb3 into master Jul 12, 2024
1 check passed
@glowredman glowredman deleted the fixes branch July 12, 2024 10:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants