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.

Sign up for GitHub

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

Jump to bottom

Chemical stack reunification #8196

Merged
merged 77 commits into from
Aug 20, 2024
Merged

Chemical stack reunification #8196

merged 77 commits into from
Aug 20, 2024

Commits on Aug 6, 2024

  1. re-unify gas/infuse/pigment/slurry under Chemical

    @thiakil
    thiakil committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    69b0d00 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2024

  1. remove todo

    @thiakil
    thiakil committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    7188a93 View commit details
    Browse the repository at this point in the history

  2. merge infusion and chemical conversion and redo the hierarchy a little

    @thiakil
    thiakil committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    3cd1a17 View commit details
    Browse the repository at this point in the history

  3. remove some lingering references to old types

    @thiakil
    thiakil committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    0678da4 View commit details
    Browse the repository at this point in the history

  4. fix missed annotation

    @thiakil
    thiakil committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    28359b7 View commit details
    Browse the repository at this point in the history

  5. fix missed method removal

    @thiakil
    thiakil committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    f0124bf View commit details
    Browse the repository at this point in the history

  6. javadoc

    @thiakil
    thiakil committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    92706c1 View commit details
    Browse the repository at this point in the history

  7. recipe paths, fix pigment texture building

    @thiakil
    thiakil committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    4484d40 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. fix JEI

    @thiakil
    thiakil committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    f397ab6 View commit details
    Browse the repository at this point in the history

  2. add infuser to chemical conversion category

    @thiakil
    thiakil committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    e0bb686 View commit details
    Browse the repository at this point in the history

  3. add infusion recipes to the oxidizer

    @thiakil
    thiakil committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    01a06ea View commit details
    Browse the repository at this point in the history

  4. datagen

    @thiakil
    thiakil committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    6a8e05e View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2024

  1. Merge branch '1.21.x' into chemical-stack-reunification 

    # Conflicts:
#	src/api/java/mekanism/api/chemical/BasicChemicalTank.java
    @thiakil
    thiakil committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    19b75a2 View commit details
    Browse the repository at this point in the history

  2. fix textures for gas->chemical, lang entries

    @thiakil
    thiakil committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    e0d696f View commit details
    Browse the repository at this point in the history

  3. update JEI

    @thiakil
    thiakil committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    3c18a30 View commit details
    Browse the repository at this point in the history

  4. fix bad test

    @thiakil
    thiakil committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    58ebe06 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2024

  1. rename legacy method

    @thiakil
    thiakil committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    1be83ac View commit details
    Browse the repository at this point in the history

  2. fix multiblocks loading old data

    @thiakil
    thiakil committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    63f0e5e View commit details
    Browse the repository at this point in the history

  3. fix entangoloporter backcompat

    @thiakil
    thiakil committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    8e2c06e View commit details
    Browse the repository at this point in the history

  4. remove redundant ChemicalType enum

    @thiakil
    thiakil committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    ccfd688 View commit details
    Browse the repository at this point in the history

  5. fix docs

    @thiakil
    thiakil committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    566a11a View commit details
    Browse the repository at this point in the history

  6. fix dissolution loading

    @thiakil
    thiakil committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    3091f11 View commit details
    Browse the repository at this point in the history

  7. redundant generic

    @thiakil
    thiakil committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    26e38b2 View commit details
    Browse the repository at this point in the history

  8. accidentally removed override

    @thiakil
    thiakil committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    adec8cd View commit details
    Browse the repository at this point in the history

  9. add override

    @thiakil
    thiakil committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    0b909b2 View commit details
    Browse the repository at this point in the history

  10. fix dupes in dictionary GUI for tag types

    @thiakil
    thiakil committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    c234730 View commit details
    Browse the repository at this point in the history

  11. add gaseous attribute to chemicals, remove subclasses of Chemical Ren… 

    …derdata
    @thiakil
    thiakil committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    91a7388 View commit details
    Browse the repository at this point in the history

  12. remove generic, replace instanceof with null check

    @thiakil
    thiakil committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    892fde6 View commit details
    Browse the repository at this point in the history

  13. inline some codecs, remove redundant interfaces

    @thiakil
    thiakil committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    b2341c0 View commit details
    Browse the repository at this point in the history

  14. add missed annotations

    @thiakil
    thiakil committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    668d0cf View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2024

  1. remove some more redundant generics

    @thiakil
    thiakil committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    f8a3cc5 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2024

  1. fix CT example dupes

    @thiakil
    thiakil committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    b7cf4c0 View commit details
    Browse the repository at this point in the history

  2. inline some things now it's not 4x the variants

    @thiakil
    thiakil committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    148c4c2 View commit details
    Browse the repository at this point in the history

  3. remove unused variable

    @thiakil
    thiakil committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    554dd49 View commit details
    Browse the repository at this point in the history

  4. fixed being unable to load the new format

    @thiakil
    thiakil committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    fa8c66f View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. fix tube rendering chemical

    @thiakil
    thiakil committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    6add9b6 View commit details
    Browse the repository at this point in the history

  2. Merge branch '1.21.x' into chemical-stack-reunification

    @thiakil
    thiakil committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    b15fe84 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2024

  1. Merge branch '1.21.x' into chemical-stack-reunification

    @thiakil
    thiakil committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    94e9da0 View commit details
    Browse the repository at this point in the history

  2. inline redundant helper

    @thiakil
    thiakil committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    a6ce49d View commit details
    Browse the repository at this point in the history

  3. Add some missing since tags to javadocs in API, and continue fixing n… 

    …aming of certain methods in the API
    @pupnewfster
    pupnewfster committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    eb06650 View commit details
    Browse the repository at this point in the history

  4. Remove unused ingredient interfaces

    @pupnewfster
    pupnewfster committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    e306726 View commit details
    Browse the repository at this point in the history

  5. Rename GasAttributes to ChemicalAttributes

    @pupnewfster
    pupnewfster committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    3923cd4 View commit details
    Browse the repository at this point in the history

  6. Continue making field and method names more generic rather than refer… 

    …ring to specifically gas
    @pupnewfster
    pupnewfster committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    8e039f2 View commit details
    Browse the repository at this point in the history

  7. Remove intermediary GasToGasRecipe class

    @pupnewfster
    pupnewfster committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    5ff1ad4 View commit details
    Browse the repository at this point in the history

  8. Remove unnecessary intermediary ItemStackGasToItemStackRecipe

    @pupnewfster
    pupnewfster committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    129b5e9 View commit details
    Browse the repository at this point in the history

  9. Misc cleanup of generics in CraftTweaker code

    @pupnewfster
    pupnewfster committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    dd3432d View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2024

  1. game version in datagen cache headers

    @thiakil
    thiakil committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    0e2ed4b View commit details
    Browse the repository at this point in the history

  2. rename gas upgrade to chemical

    @thiakil
    thiakil committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    fd8993f View commit details
    Browse the repository at this point in the history

  3. Remove some unnecessary parameters

    @pupnewfster
    pupnewfster committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    5a3a44c View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2024

  1. Merge branch '1.21.x' into chemical-stack-reunification 

    # Conflicts:
#	src/datagen/generated/mekanism/.cache/04b62bfe5362d32ffc16660de8671fff69272496
#	src/datagen/generated/mekanism/.cache/23336412bda32e3d1b9476a2f7efe0b4cd9fe285
#	src/datagen/generated/mekanism/.cache/2ca94f3a6e22cb9eec299788405fc6e4ad158c09
#	src/datagen/generated/mekanism/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
#	src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55
#	src/datagen/generated/mekanism/.cache/f4271571320fe007f5d8ba9eb4461ed6922f6a93
#	src/datagen/generated/mekanismadditions/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
#	src/datagen/generated/mekanismgenerators/.cache/08f2b53f4cfddb5dc20bb23057cbafdfe1cdd910
#	src/datagen/generated/mekanismgenerators/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
#	src/datagen/generated/mekanismgenerators/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
#	src/datagen/generated/mekanismgenerators/.cache/de34ee0556eec16c961269bcb7ec3070f0579cfd
    @thiakil
    thiakil committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    8fed4b4 View commit details
    Browse the repository at this point in the history

  2. rerun datagen

    @thiakil
    thiakil committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    a56fd26 View commit details
    Browse the repository at this point in the history

  3. Remove unnecessary casts

    @pupnewfster
    pupnewfster committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    68effd3 View commit details
    Browse the repository at this point in the history

  4. Use static helper methods for creating chemical tanks

    @pupnewfster
    pupnewfster committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    929832b View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2024

  1. Remove chemical tank builders in favor of static methods in the actua… 

    …l tank classes
    @pupnewfster
    pupnewfster committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    3aa7f91 View commit details
    Browse the repository at this point in the history

  2. Remove some no longer necessary presetVariable hacks

    @pupnewfster
    pupnewfster committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    0a27dc5 View commit details
    Browse the repository at this point in the history

  3. Inline certain copy calls rather than bouncing via a helper method

    @pupnewfster
    pupnewfster committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    503e907 View commit details
    Browse the repository at this point in the history

  4. Reduce duplication in certain tooltips now that all chemicals are the… 

    … same type
    @pupnewfster
    pupnewfster committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    094b4a7 View commit details
    Browse the repository at this point in the history

  5. Cleanup class names to no longer reference BoxedChemicals

    @pupnewfster
    pupnewfster committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    5de8aeb View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. Update gui_objects to only have a single entry for chemicals

    @pupnewfster
    pupnewfster committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    b080eed View commit details
    Browse the repository at this point in the history

  2. Merge all inner classes for chemical tags into one

    @pupnewfster
    pupnewfster committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    531546a View commit details
    Browse the repository at this point in the history

  3. Fix and cleanup a handful of things with the CrT integration, and mak… 

    …e it properly use chemicals now
    @pupnewfster
    pupnewfster committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    34a8f1d View commit details
    Browse the repository at this point in the history

  4. Merge json things builders into a single chemical builder. Still unte… 

    …sted
    @pupnewfster
    pupnewfster committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    d179d08 View commit details
    Browse the repository at this point in the history

  5. Further cleanup and deduplicate chemical related recipe classes, and … 

    …add a perTickUsage method to ItemStackChemicalToItemStack recipes
    @pupnewfster
    pupnewfster committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    3c2ff30 View commit details
    Browse the repository at this point in the history

  6. Remove bouncer infusion conversion method

    @pupnewfster
    pupnewfster committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    76d8ef3 View commit details
    Browse the repository at this point in the history

  7. Deduplicate a couple cached recipe implementations

    @pupnewfster
    pupnewfster committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    adb9aef View commit details
    Browse the repository at this point in the history

  8. Cleanup chemical ingredient code

    @pupnewfster
    pupnewfster committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    b82394c View commit details
    Browse the repository at this point in the history

  9. Continued misc cleanup and remove GuiHybridGauge in favor of making t… 

    …he fission reactor use a proper MergedTank
    @pupnewfster
    pupnewfster committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    16de0ce View commit details
    Browse the repository at this point in the history

  10. Continued cleanup, and move away from CrT's NativeMethod annotation w… 

    …here we no longer have generics that prevent normal usage
    @pupnewfster
    pupnewfster committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    21274a0 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. Continued general code cleanup

    @pupnewfster
    pupnewfster committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    6c4d2d1 View commit details
    Browse the repository at this point in the history

  2. Replace update tag legacy chemical keys with chemical (no backcompat … 

    …necessary as it is only for syncing)
    @pupnewfster
    pupnewfster committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    e8e18c0 View commit details
    Browse the repository at this point in the history

  3. Replace certain keys in recipes with a more generic name

    @pupnewfster
    pupnewfster committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    97d16a2 View commit details
    Browse the repository at this point in the history

  4. Implement support for Item Chemical recipes to have specify if they u… 

    …se the chemical each tick
    @pupnewfster
    pupnewfster committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    74daf75 View commit details
    Browse the repository at this point in the history

  5. Merge TileEntityMetallurgicInfuserFactory into the ItemChemicalToItem… 

    … factory
    @pupnewfster
    pupnewfster committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    1e0f763 View commit details
    Browse the repository at this point in the history

  6. fix item model for chemical upgrade

    @thiakil
    thiakil committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    524955d View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/1.21.x' into chemical-stack-reun… 

    …ification

# Conflicts:
#	src/api/java/mekanism/api/SerializationConstants.java
#	src/main/java/mekanism/common/tile/component/config/slot/ChemicalSlotInfo.java
    @pupnewfster
    pupnewfster committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    6443d74 View commit details
    Browse the repository at this point in the history

  8. Adjust version in since tags

    @pupnewfster
    pupnewfster committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    da0a044 View commit details
    Browse the repository at this point in the history

  9. Files updated by running datagen

    @pupnewfster
    pupnewfster committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    14a9c3e View commit details
    Browse the repository at this point in the history