generated from CleanroomMC/TemplateDevEnv
-
Notifications
You must be signed in to change notification settings - Fork 29
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
Make the Comp annotation easier to use #236
Merged
Merged
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
WaitingIdly
added
documentation
Improvements or additions to documentation
refactor
Something is rewritten
labels
Aug 31, 2024
# Conflicts: # src/main/java/com/cleanroommc/groovyscript/compat/mods/actuallyadditions/AtomicReconstructor.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/actuallyadditions/BallOfFur.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/actuallyadditions/Compost.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/actuallyadditions/Crusher.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/actuallyadditions/Empowerer.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/actuallyadditions/OilGen.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/actuallyadditions/TreasureChest.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/alchemistry/Atomizer.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/alchemistry/Combiner.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/alchemistry/Dissolver.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/alchemistry/Electrolyzer.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/alchemistry/Evaporator.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/alchemistry/Liquifier.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/astralsorcery/ChaliceInteraction.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/astralsorcery/Grindstone.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/betterwithmods/Cauldron.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/betterwithmods/Crucible.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/betterwithmods/Hopper.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/betterwithmods/Kiln.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/betterwithmods/MillStone.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/betterwithmods/Saw.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/betterwithmods/Turntable.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/bloodmagic/AlchemyArray.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/bloodmagic/AlchemyTable.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/bloodmagic/BloodAltar.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/bloodmagic/TartaricForge.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/botania/Apothecary.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/botania/BrewRecipe.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/botania/ElvenTrade.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/botania/ManaInfusion.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/botania/RuneAltar.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/botanicadditions/GaiaPlate.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/calculator/AlgorithmSeparator.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/calculator/AnalysingChamber.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/calculator/AtomicCalculator.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/calculator/BasicCalculator.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/calculator/ConductorMast.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/calculator/ExtractionChamber.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/calculator/FabricationChamber.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/calculator/FlawlessCalculator.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/calculator/GlowstoneExtractor.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/calculator/HealthProcessor.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/calculator/PrecisionChamber.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/calculator/ProcessingChamber.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/calculator/ReassemblyChamber.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/calculator/RedstoneExtractor.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/calculator/RestorationChamber.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/calculator/ScientificCalculator.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/calculator/StarchExtractor.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/calculator/StoneSeparator.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/compactmachines/Miniaturization.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/cyclic/Dehydrator.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/cyclic/Hydrator.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/cyclic/Melter.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/cyclic/Packager.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/cyclic/Solidifier.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/enderio/SagMill.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/enderio/SagMillGrinding.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/enderio/SliceNSplice.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/essentialcraft/MagicianTable.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/essentialcraft/RadiatingChamber.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/essentialcraft/WindRune.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/evilcraft/BloodInfuser.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/evilcraft/EnvironmentalAccumulator.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/extrabotany/Pedestal.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersiveengineering/AlloyKiln.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersiveengineering/ArcFurnace.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersiveengineering/BlastFurnace.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersiveengineering/BlastFurnaceFuel.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersiveengineering/BottlingMachine.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersiveengineering/CokeOven.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersiveengineering/Crusher.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersiveengineering/Fermenter.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersiveengineering/Mixer.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersiveengineering/Refinery.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersiveengineering/Squeezer.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersivepetroleum/Distillation.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersivetechnology/Boiler.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersivetechnology/BoilerFuel.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersivetechnology/CoolingTower.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersivetechnology/Distiller.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersivetechnology/ElectrolyticCrucibleBattery.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersivetechnology/GasTurbine.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersivetechnology/HeatExchanger.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersivetechnology/HighPressureSteamTurbine.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersivetechnology/MeltingCrucible.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersivetechnology/Radiator.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersivetechnology/SolarTower.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/immersivetechnology/SteamTurbine.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/inspirations/Cauldron.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/integrateddynamics/Squeezer.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/lazyae2/Aggregator.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/lazyae2/Centrifuge.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/lazyae2/Energizer.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/lazyae2/Etcher.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/mysticalagriculture/Reprocessor.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/pneumaticcraft/Explosion.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/pneumaticcraft/HeatFrameCooling.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/pneumaticcraft/PlasticMixer.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/pneumaticcraft/PressureChamber.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/pneumaticcraft/Refinery.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/pneumaticcraft/ThermopneumaticProcessingPlant.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/primaltech/ClayKiln.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/primaltech/StoneAnvil.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/primaltech/WaterSaw.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/primaltech/WoodenBasin.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/prodigytech/ExplosionFurnace.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/rustic/Alchemy.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/rustic/BrewingBarrel.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/rustic/CrushingTub.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/rustic/EvaporatingBasin.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/theaurorian/MoonlightForge.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/theaurorian/Scrapper.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/tinkersconstruct/Alloying.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/tinkersconstruct/CastingBasin.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/tinkersconstruct/CastingTable.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/tinkersconstruct/Drying.java # src/main/java/com/cleanroommc/groovyscript/compat/mods/woot/StygianIronAnvil.java
brachy84
approved these changes
Oct 3, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
probably fine
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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 in this PR:
@Comp
annotation works with the goal of making it easier to write.type
andvalue
elements of@Comp
, and deprecates thevalid
andrequirement
elements of@Property
.@Comp
annotations, you now have a single@Comp
annotation with multiple elements.String
value
element.type
element, there is atypes
element.types
element can be omitted.types
is not required for any@Comp
in our current codebase.Property#requirement
,Comp#unique
is used.not
andunique
elements are aString
, the other elements areint
.Integer.MAX_VALUE
in a@Comp
, as its redundant in it being anint
type.value
elements that are now migrated to beunique
elements.Comp.Type
enum declare the lang key in full.some examples of what this looks like