Skip to content

Commit 6332122

Browse files
committed
fix: checkstyle
1 parent 47f5f79 commit 6332122

4 files changed

Lines changed: 7 additions & 12 deletions

File tree

src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import com.google.gson.JsonElement;
4343
import com.google.gson.JsonObject;
4444
import groovy.xml.XmlUtil;
45+
import org.jspecify.annotations.Nullable;
4546
import org.gradle.api.JavaVersion;
4647
import org.gradle.api.Project;
4748
import org.gradle.api.artifacts.ModuleVersionIdentifier;
@@ -61,7 +62,6 @@
6162
import net.fabricmc.loom.util.gradle.GradleUtils;
6263
import net.fabricmc.loom.util.gradle.SourceSetReference;
6364

64-
import org.jspecify.annotations.Nullable;
6565
import org.relativitymc.neoloom.neoforge.NFRTMinecraftProvider;
6666

6767
public class RunConfig {

src/main/java/org/relativitymc/neoloom/neoforge/NFRTMinecraftLibraryProvider.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@
3636
import java.util.Set;
3737

3838
import com.google.gson.JsonObject;
39-
40-
import net.fabricmc.loom.util.Constants;
41-
42-
import net.fabricmc.loom.util.ZipUtils;
43-
4439
import org.gradle.api.GradleException;
4540
import org.gradle.api.Project;
4641
import org.gradle.api.artifacts.Configuration;
@@ -50,6 +45,8 @@
5045
import org.gradle.api.artifacts.ModuleVersionIdentifier;
5146
import org.gradle.api.artifacts.ResolvedArtifact;
5247

48+
import net.fabricmc.loom.util.Constants;
49+
import net.fabricmc.loom.util.ZipUtils;
5350
import net.fabricmc.loom.util.LoomVersions;
5451
import net.fabricmc.loom.LoomGradleExtension;
5552
import net.fabricmc.loom.configuration.providers.minecraft.MinecraftJarConfiguration;
@@ -225,6 +222,7 @@ public Path resolveUniversalJar() {
225222
public Path resolveFMLJar() {
226223
for (String libraryNotation : this.forgeUserdevConfiguration.librariesNotations()) {
227224
ExternalModuleDependency dependency = this.project.getDependencyFactory().create(libraryNotation);
225+
228226
if (isFML(Objects.requireNonNull(dependency.getGroup()), dependency.getName())) {
229227
for (ResolvedArtifact artifact : this.project.getConfigurations().detachedConfiguration(dependency).getResolvedConfiguration().getResolvedArtifacts()) {
230228
ModuleVersionIdentifier id = artifact.getModuleVersion().getId();

src/main/java/org/relativitymc/neoloom/neoforge/NFRTMinecraftProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424

2525
package org.relativitymc.neoloom.neoforge;
2626

27-
import org.relativitymc.neoloom.neoforge.meta.ForgeUserdevConfiguration;
28-
2927
import java.util.Objects;
3028

29+
import org.relativitymc.neoloom.neoforge.meta.ForgeUserdevConfiguration;
30+
3131
public interface NFRTMinecraftProvider {
3232
ForgeUserdevConfiguration getForgeUserdevConfiguration();
3333

src/main/java/org/relativitymc/neoloom/neoforge/meta/ForgeUserdevConfiguration.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ public record ForgeUserdevConfiguration(
4646
Map<String, List<String>> extraDependenciesNotations,
4747
Map<String, LaunchConfiguration> launchConfigurations
4848
) {
49-
5049
public static ForgeUserdevConfiguration fromUserdevJar(File userdevJar) {
5150
try {
5251
JsonObject userdevJson = ZipUtils.unpackGson(userdevJar.toPath(), "config.json", JsonObject.class);
5352

5453
int specVersion = userdevJson.get("spec").getAsInt();
54+
5555
if (specVersion != 2) {
5656
throw new UnsupportedOperationException("Unsupported userdev spec: " + specVersion);
5757
}
@@ -102,7 +102,6 @@ public record LaunchConfiguration(
102102
List<String> jvmArgs,
103103
Map<String, String> jvmProperties
104104
) {
105-
106105
public static LaunchConfiguration fromJsonObjectV2(JsonObject launchEntry) {
107106
return new LaunchConfiguration(
108107
launchEntry.get("main").getAsString(),
@@ -117,7 +116,5 @@ public static LaunchConfiguration fromJsonObjectV2(JsonObject launchEntry) {
117116
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))
118117
);
119118
}
120-
121119
}
122-
123120
}

0 commit comments

Comments
 (0)