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

add Thermal Expansion compat #152

Merged
merged 24 commits into from
May 1, 2024

Conversation

WaitingIdly
Copy link
Collaborator

changes in this PR:

  • fix error in .editorconfig, and make groovy indent by 4 for RecipeBuilders, since thats how our code is formatted.
  • fix a javadoc typo in RegistryDescription.
  • changed the appearance of /gs hand by:
    • making the section text be light purple instead of colorless/green
    • indenting non-title text with with -
    • making only the first few lines of Tile Entity NBT get printed (otherwise it could be so many lines you couldn't see the top lines). you can still view and copy the full text in the tooltip.
    • making fluid print nbt data (realised it was missing due to needing it for thermal potions)
    • fixing a bug where Thermal Expansion machines couldnt be printed due to using a NBTTagByteArray.
  • added NBT matching for FluidStackMixin and made it implement INbtIngredient, since some fluids use NBT data.
  • create AbstractReloadableStorage, which contains two arraylists for backup and scripted.
    • implemented it for VirtualizedRegistry, Chisel Carving, Inspirations Anvil Smashing, Mekanism Infusion, Thaumcraft Research, and Tinker's Complement Melter.
  • some minor documentation changes:
    • allow recipe builder methods to respect the commented value being true.
    • log (debug) if there are no recipeBuilderMethods for a property or if there are no registrationMethods.
    • made a private method that was always returning a singleton list just return a String.
  • add Thermal Expansion compat:
    • Machines:
      • Brewer, Centrifuge (as standard and CentrifugeMobs), Charger, Compactor, Crucible, Enchanter, Extruder[*], Furnace (as both standard and FurnacePyrolysis), Insolator, Precipitator[*], Pulverizer, Refinery (as both standard and RefineryPotion), Sawmill, Smelter, Transposer (split into TransposerExtract and TransposerFill).
    • Devices:
      • Coolant, Diffuser[*], Factorizer, Fisher[*] (as both standard and FisherBait[*]), Tapper[*] (as both standard, TapperFertilizer[*], and TapperTree[*]), XpCollector[*].
    • Dynamos:
      • Compression, Enervation, Magmatic, Numismatic (as both standard and Lapidary), Reactant, Steam.
    • [*] indicates that i could not find this compat implemented in ModTweaker.
  • and lang keys & examples file for the above

Copy link
Member

@brachy84 brachy84 left a comment

Choose a reason for hiding this comment

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

I definitly reviewed all 7000 lines of code


public abstract class VirtualizedRegistry<R> extends NamedRegistry implements IScriptReloadable {

private Collection<R> backup, scripted;
private final AbstractReloadableStorage<R> recipeStorage;
Copy link
Member

Choose a reason for hiding this comment

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

Im thinking it might be better to have VirtualizedRegistry extend AbstractReloadableStorage?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

the current code structure requires that VirtualizedRegistry extends NamedRegistry. since NamedRegistry definitely shouldnt extend AbstractReloadableStorage, this plan isnt viable.

@brachy84 brachy84 merged commit ab64a4b into CleanroomMC:master May 1, 2024
@WaitingIdly WaitingIdly deleted the thermal-attempt-uhm branch May 1, 2024 05:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants