Skip to content

Conversation

@WaitingIdly
Copy link
Collaborator

@WaitingIdly WaitingIdly commented Oct 3, 2024

changes in this PR:

  • update the GTCEu buildscript
  • enable spotless
    • ensure there is an empty line after each class declaration and before the closing brace.
    • change the @Target({ /* No targets allowed */}) comment for some documentation annotations to be @Target({}) // No targets allowed.
    • disable spotless for a segment of code in AltarInputOrder.
    • apply spotless to all of the files inside src/main/java/com/cleanroommc/groovyscript.
    • fixes a handful of files having the incorrect line ending.
    • fix inconsistent indentation.
  • current downsides:
    • some equations or methods which formerly took up multiple lines have been compacted into a single longer line, which may be harder to read.
    • when using an instanceof with a pattern variable, if the class being compared against has generics, such as Class<?>, the variable name will be Class<?>here without spaces.

@WaitingIdly WaitingIdly added the build-script Something in build scripts changed label Oct 3, 2024
# Conflicts:
#	src/main/java/com/cleanroommc/groovyscript/GroovyScript.java
#	src/main/java/com/cleanroommc/groovyscript/api/IDynamicGroovyProperty.java
#	src/main/java/com/cleanroommc/groovyscript/api/IGameObjectParser.java
#	src/main/java/com/cleanroommc/groovyscript/api/IRegistrar.java
#	src/main/java/com/cleanroommc/groovyscript/command/GSCommand.java
#	src/main/java/com/cleanroommc/groovyscript/compat/mods/ModPropertyContainer.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/immersiveengineering/TimeRecipeBuilder.java
#	src/main/java/com/cleanroommc/groovyscript/compat/mods/jei/JeiPlugin.java
#	src/main/java/com/cleanroommc/groovyscript/compat/mods/prodigytech/AtomicReshaper.java
#	src/main/java/com/cleanroommc/groovyscript/compat/mods/prodigytech/ExplosionFurnaceAdditives.java
#	src/main/java/com/cleanroommc/groovyscript/compat/mods/prodigytech/PrimordialisReactor.java
#	src/main/java/com/cleanroommc/groovyscript/compat/mods/prodigytech/SimpleRecipeHandler.java
#	src/main/java/com/cleanroommc/groovyscript/compat/mods/prodigytech/SimpleRecipeHandlerSecondaryOutput.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/core/mixin/groovy/MetaClassImplMixin.java
#	src/main/java/com/cleanroommc/groovyscript/gameobjects/Completer.java
#	src/main/java/com/cleanroommc/groovyscript/gameobjects/GameObjectHandler.java
#	src/main/java/com/cleanroommc/groovyscript/gameobjects/GameObjectHandlerManager.java
#	src/main/java/com/cleanroommc/groovyscript/mapper/ObjectMapper.java
#	src/main/java/com/cleanroommc/groovyscript/registry/AbstractCraftingRecipeBuilder.java
#	src/main/java/com/cleanroommc/groovyscript/sandbox/FileUtil.java
#	src/main/java/com/cleanroommc/groovyscript/sandbox/GroovyLogImpl.java
#	src/main/java/com/cleanroommc/groovyscript/sandbox/GroovyScriptSandbox.java
#	src/main/java/com/cleanroommc/groovyscript/sandbox/RunConfig.java
#	src/main/java/com/cleanroommc/groovyscript/sandbox/security/GroovySecurityManager.java
#	src/main/java/com/cleanroommc/groovyscript/server/GroovyScriptDocumentationProvider.java
#	src/main/java/com/cleanroommc/groovyscript/server/GroovyScriptLanguageServer.java
@brachy84 brachy84 merged commit 68ef30d into CleanroomMC:master Nov 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

build-script Something in build scripts changed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants