Move from LDLib's FluidStack implementation to Forge's FluidStack #1975
+3,117
−2,321
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
screret
requested changes
Sep 18, 2024
src/main/java/com/gregtechceu/gtceu/api/capability/IThermalFluidHandlerItemStack.java
Show resolved
Hide resolved
screret
requested changes
Sep 19, 2024
...in/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/FluidPipeProperties.java
Outdated
Show resolved
Hide resolved
src/main/java/com/gregtechceu/gtceu/api/gui/widget/ScrollablePhantomFluidWidget.java
Outdated
Show resolved
Hide resolved
src/main/java/com/gregtechceu/gtceu/api/machine/steam/SimpleSteamMachine.java
Outdated
Show resolved
Hide resolved
src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamBoilerMachine.java
Outdated
Show resolved
Hide resolved
src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamBoilerMachine.java
Outdated
Show resolved
Hide resolved
src/main/java/com/gregtechceu/gtceu/integration/ae2/gui/widget/list/AEFluidDisplayWidget.java
Outdated
Show resolved
Hide resolved
src/main/java/com/gregtechceu/gtceu/integration/ae2/gui/widget/list/AEFluidDisplayWidget.java
Outdated
Show resolved
Hide resolved
src/main/java/com/gregtechceu/gtceu/syncdata/FluidStackLoad.java
Outdated
Show resolved
Hide resolved
screret
approved these changes
Sep 20, 2024
|
conflicts |
|
Last commit is the only new content. Rebased and resolved conflicts because things were getting a little out of hand. |
Adds classes in /api/misc/lib/ which are Forge FluidStack compatible stand-ins for LDLib's versions Creates a Payload for Forge FluidStacks and registers them with LDLib Adds a mixin for LDLib to allow for FluidStack syncing
Rewrites these classes to use Forge's native IFLuidHandler rather than LDLib's IFluidTransfer
Switches from hardcoded logic to using Forge's FluidUtil to add cleanliness
Now passes the interaction for drums and tanks if the held item isn't a fluidhandler Also cleaned up the CreativeTankMachine to more properly make use of being a subclass Implemented CreativeTankMachine right-click behavior
Removed any unnecessary BUCKET_VOLUME uses Moved new classes to appropriate packages Renamed Fluid classes to use Handler rather than Transfer
Also clean up some lingering references
screret
approved these changes
Sep 24, 2024
|
This causes issues with loading certain machines: I don't know how much this actually affects (as none of my tanks emptied) but a few of my fluid pipes spontaneously disconnected. |
screret
approved these changes
Sep 26, 2024
|
Ready for merge after one last review. Will almost certainly break addons. |
screret
approved these changes
Oct 1, 2024
|
merge #1945 first |
screret
approved these changes
Oct 17, 2024
screret
requested changes
Oct 18, 2024
src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeTypes.java
Outdated
Show resolved
Hide resolved
screret
approved these changes
Oct 18, 2024
screret
pushed a commit
that referenced
this pull request
Dec 5, 2024
This was referenced Dec 7, 2024
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
This PR moves the codebase off of LDLib's FluidStack implementation and onto Forge's native FluidStack implementation.
This includes switching from LDLib's IFluidTransfer to Forge's IFluidHandler. The behavior between the two is extremely similar, and this change will allow for better maintainability and better understanding of the depended-upon implementation, as Forge is very well documented.
Implementation Details
I have added a couple new methods to
GTUtilswhich I use sporadically, please see them here so you don't have to go flopping around trying to find what a certain utility method will do.I also make very good use of Forge's
FluidUtilclass, which has many helper methods similar to LDLib's. See the docs for those here or check the implementation in your own IDE atnet.minecraftforge.fluids.FluidUtil.javaPotential Compatibility Issues
Forge's FluidStacks are limited to integer amounts, rather than the long-based FluidStacks from LDLib. This could potentially cause issues in certain cases, specifically during interactions with AE2.
Further testing is required for this, however. From what I can tell, it would only affect people who attempt to use more than 2.147 million buckets in an ME hatch or an ME Pattern Buffer.
If this is a cause for concern, please let me know.
If I have missed ANYTHING or if there are ANY questions please let me know.
The first commit
4ef64c9are fairly simple switches and don't necessarily need the most attention. Please look over the other four commits well. Thanks.