Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
dd73a0f
update buildscript
WaitingIdly Sep 15, 2024
d6d1550
enable spotless
WaitingIdly Sep 15, 2024
522c9d0
prevent updating import order
WaitingIdly Sep 15, 2024
86d7441
export intellij settings to format
WaitingIdly Sep 15, 2024
8f976b8
adjust format more
WaitingIdly Sep 15, 2024
e5b07f2
adjust config more
WaitingIdly Sep 15, 2024
9bba90f
adjust even more
WaitingIdly Sep 15, 2024
d16cfd1
adjust more
WaitingIdly Sep 15, 2024
a79cb0d
adjust comments in doc
WaitingIdly Sep 15, 2024
507a8d6
fix enum declaration
WaitingIdly Sep 15, 2024
eb7c296
constructor param indent
WaitingIdly Sep 15, 2024
adbe256
improve ternary
WaitingIdly Sep 15, 2024
94a0b8c
more adjustments
WaitingIdly Sep 15, 2024
4252822
preserve some one-line code
WaitingIdly Sep 15, 2024
3bf294a
indent less arguments
WaitingIdly Sep 15, 2024
5edd743
fix import order to match current
WaitingIdly Oct 3, 2024
f46afa3
rename to Default
WaitingIdly Oct 3, 2024
830990b
disable formatter for AltarImportOrder
WaitingIdly Oct 3, 2024
3167511
apply spotless to primary package
WaitingIdly Oct 3, 2024
22f4c6d
ensure blank line near class declaration and closing
WaitingIdly Oct 3, 2024
33543d1
Merge branch 'master' into spotless-test
WaitingIdly Oct 6, 2024
428ad3c
reapply
WaitingIdly Oct 6, 2024
e2722fc
apply to ls
WaitingIdly Oct 6, 2024
ae606b6
move class arrays to constants
WaitingIdly Oct 6, 2024
5044e42
fix some botania whitespace
WaitingIdly Oct 6, 2024
021bdbe
no blank lines after last class body
WaitingIdly Oct 6, 2024
0d23379
method body one_line_if_empty
WaitingIdly Oct 6, 2024
04e89fc
fix weird linebreak
WaitingIdly Oct 6, 2024
8b57540
format command file
WaitingIdly Oct 6, 2024
0322b11
remove more empty lines at the end of classes
WaitingIdly Oct 6, 2024
2be0bbd
ah its -1 that applies that
WaitingIdly Oct 6, 2024
75d8441
enforce no blank lines at start of method
WaitingIdly Oct 6, 2024
89711fd
no blank lines before package
WaitingIdly Oct 6, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//version: 1720840170
//version: 1723428048
/*
* DO NOT CHANGE THIS FILE!
* Also, you may replace this file at any time if there is an update available.
Expand Down Expand Up @@ -1009,7 +1009,7 @@ abstract class RunHotswappableMinecraftTask extends RunMinecraftTask {

if (project.usesMixins.toBoolean()) {
this.extraJvmArgs.addAll(project.provider(() -> {
def mixinCfg = project.configurations.detachedConfiguration(project.dependencies.create('zone.rong:mixinbooter:9.1'))
def mixinCfg = project.configurations.detachedConfiguration(project.dependencies.create(project.mixinProviderSpec))
mixinCfg.canBeConsumed = false
mixinCfg.canBeResolved = true
mixinCfg.transitive = false
Expand Down Expand Up @@ -1391,7 +1391,7 @@ def getChangelog() {

// Buildscript updating

def buildscriptGradleVersion = '8.5'
def buildscriptGradleVersion = '8.9'

tasks.named('wrapper', Wrapper).configure {
gradleVersion = buildscriptGradleVersion
Expand Down
1 change: 0 additions & 1 deletion editors/vscode/src/features/TextureDecoration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,4 @@ export class TextureDecorationFeature extends TextDocumentLanguageFeature<boolea

return [registerTextureDecorationProvider(this._client.protocol2CodeConverter.asDocumentSelector(selector), provider), provider];
}

}
1 change: 0 additions & 1 deletion examples/classes/SimpleConversionRecipe.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ class SimpleConversionRecipe {
this.input = input
this.output = output
}

}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ mavenArtifactGroup = com.cleanroommc
# By default this will use the files found here: https://github.com/GregTechCEu/Buildscripts/tree/master/spotless
# to format your code. However, you can create your own version of these files and place them in your project's
# root directory to apply your own formatting options instead.
enableSpotless = false
enableSpotless = true

# Enable JUnit testing platform used for testing your code.
# Uses JUnit 5. See guide and documentation here: https://junit.org/junit5/docs/current/user-guide/
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
22 changes: 13 additions & 9 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading