Make coolant types more generic #8365
Draft
Conversation
This file contains hidden or 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
bukowski912
force-pushed
the
coolant-refactor
branch
from
7247669 to
f509f84
Compare
thiakil
reviewed
Apr 2, 2025
src/api/java/mekanism/api/datamaps/chemical/attribute/IChemicalCoolant.java
Outdated
Show resolved
Hide resolved
thiakil
reviewed
Apr 2, 2025
src/api/java/mekanism/api/datamaps/chemical/attribute/HeatedCoolant.java
Outdated
Show resolved
Hide resolved
thiakil
reviewed
Apr 2, 2025
src/api/java/mekanism/api/datamaps/chemical/attribute/HeatedCoolant.java
Show resolved
Hide resolved
bukowski912
force-pushed
the
coolant-refactor
branch
from
618a1d8 to
892e2a3
Compare
bukowski912
force-pushed
the
coolant-refactor
branch
from
0232401 to
6d8d1c5
Compare
bukowski912
force-pushed
the
coolant-refactor
branch
from
769dce0 to
8168b67
Compare
thiakil
reviewed
Apr 4, 2025
src/api/java/mekanism/api/datamaps/chemical/attribute/IChemicalCoolant.java
Show resolved
Hide resolved
thiakil
reviewed
Apr 4, 2025
| throw new IllegalArgumentException("Coolant attributes must have a conductivity greater than zero and at most one! Conductivity: " + conductivity); | ||
| static void validateCoolantParams(Holder<?> otherVariant, double thermalEnthalpy, double conductivity) { | ||
| //noinspection unchecked,rawtypes | ||
| if (otherVariant.is((ResourceKey) MekanismAPI.EMPTY_CHEMICAL_KEY)) { |
Member
There was a problem hiding this comment.
there needs to be one of these if blocks for empty fluid too
thiakil
reviewed
Apr 4, 2025
| RecipeViewerUtils.synthetic(key.location(), "boiler", Mekanism.MODID), | ||
| IngredientCreatorAccess.chemicalStack().fromHolder(MekanismAPI.CHEMICAL_REGISTRY.getHolderOrThrow(key), coolantAmount), water, | ||
| steam, coolant.cool(coolantAmount), | ||
| steam, new ChemicalStack(coolant.otherChemical(), coolantAmount), |
Member
There was a problem hiding this comment.
this needs to check the type (and have a BoilerRecipeViewerRecipe variant for fluids)
thiakil
reviewed
Apr 4, 2025
| double portionToCool = coolantType.conductivity() * superheatedCoolantTank.getStored(); | ||
| long toCool = Math.round(portionToCool * (1 - heatCapacitor.getTemperature() / coolantType.temperature())); | ||
| ChemicalStack cooledCoolant = coolantType.cool(toCool); | ||
| ChemicalStack cooledCoolant = new ChemicalStack(coolantType.otherChemical(), toCool); |
Member
There was a problem hiding this comment.
this needs to be checked, not a blind cast
thiakil
reviewed
Apr 4, 2025
src/api/java/mekanism/api/datamaps/chemical/attribute/IChemicalCoolant.java
Outdated
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Changes proposed in this pull request:
IChemicalAttributefor aHolder<?>and a helper for aHolder<Chemical>CooledCoolantandHeatedCoolantto reflect these changes