Skip to content

Commit 7226922

Browse files
committed
Fix checkstyle violations
1 parent 63f00ee commit 7226922

8 files changed

+29
-27
lines changed

src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java

+1
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ private synchronized void setupMinecraft(ConfigContext configContext) throws Exc
212212
if (extension.isForgeLike() && !(minecraftProvider instanceof ForgeMinecraftProvider)) {
213213
throw new UnsupportedOperationException("Using Forge with split jars is not supported!");
214214
}
215+
215216
extension.setMinecraftProvider(minecraftProvider);
216217
minecraftProvider.provide();
217218

src/main/java/net/fabricmc/loom/configuration/providers/forge/minecraft/SingleJarForgeMinecraftProvider.java

+20-20
Original file line numberDiff line numberDiff line change
@@ -37,99 +37,99 @@
3737

3838
public abstract class SingleJarForgeMinecraftProvider extends SingleJarMinecraftProvider implements ForgeMinecraftProvider {
3939
private final MinecraftPatchedProvider patchedProvider;
40-
40+
4141
private SingleJarForgeMinecraftProvider(MinecraftMetadataProvider metadataProvider, ConfigContext configContext) {
4242
super(metadataProvider, configContext, MappingsNamespace.OFFICIAL);
4343
this.patchedProvider = new MinecraftPatchedProvider(configContext.project(), this, provideServer() ? MinecraftPatchedProvider.Type.SERVER_ONLY : MinecraftPatchedProvider.Type.CLIENT_ONLY);
4444
}
45-
45+
4646
public static SingleJarForgeMinecraftProvider.Server forgeServer(MinecraftMetadataProvider metadataProvider, ConfigContext configContext) {
4747
return new SingleJarForgeMinecraftProvider.Server(metadataProvider, configContext);
4848
}
49-
49+
5050
public static SingleJarForgeMinecraftProvider.Client forgeClient(MinecraftMetadataProvider metadataProvider, ConfigContext configContext) {
5151
return new SingleJarForgeMinecraftProvider.Client(metadataProvider, configContext);
5252
}
53-
53+
5454
@Override
5555
protected boolean provideClient() {
5656
// the client jar is needed for client-extra which the Forge userdev launch thing always checks for
5757
return true;
5858
}
59-
59+
6060
@Override
6161
protected void processJar() throws Exception {
6262
// don't process the jar, it's created by the patched provider
6363
}
64-
64+
6565
@Override
6666
public MinecraftPatchedProvider getPatchedProvider() {
6767
return patchedProvider;
6868
}
69-
69+
7070
@Override
7171
public Path getMinecraftEnvOnlyJar() {
7272
return patchedProvider.getMinecraftPatchedJar();
7373
}
74-
74+
7575
@Override
7676
public List<Path> getMinecraftJars() {
7777
return List.of(patchedProvider.getMinecraftPatchedJar());
7878
}
79-
79+
8080
public static final class Server extends SingleJarForgeMinecraftProvider {
8181
private Server(MinecraftMetadataProvider metadataProvider, ConfigContext configContext) {
8282
super(metadataProvider, configContext);
8383
}
84-
84+
8585
@Override
8686
public SingleJarEnvType type() {
8787
return SingleJarEnvType.SERVER;
8888
}
89-
89+
9090
@Override
9191
public Path getInputJar(SingleJarMinecraftProvider provider) throws Exception {
9292
BundleMetadata serverBundleMetadata = provider.getServerBundleMetadata();
93-
93+
9494
if (serverBundleMetadata == null) {
9595
return provider.getMinecraftServerJar().toPath();
9696
}
97-
97+
9898
provider.extractBundledServerJar();
9999
return provider.getMinecraftExtractedServerJar().toPath();
100100
}
101-
101+
102102
@Override
103103
protected boolean provideServer() {
104104
return true;
105105
}
106-
106+
107107
@Override
108108
protected boolean provideClient() {
109109
return false;
110110
}
111111
}
112-
112+
113113
public static final class Client extends SingleJarForgeMinecraftProvider {
114114
private Client(MinecraftMetadataProvider metadataProvider, ConfigContext configContext) {
115115
super(metadataProvider, configContext);
116116
}
117-
117+
118118
@Override
119119
public SingleJarEnvType type() {
120120
return SingleJarEnvType.CLIENT;
121121
}
122-
122+
123123
@Override
124124
public Path getInputJar(SingleJarMinecraftProvider provider) throws Exception {
125125
return provider.getMinecraftClientJar().toPath();
126126
}
127-
127+
128128
@Override
129129
protected boolean provideServer() {
130130
return false;
131131
}
132-
132+
133133
@Override
134134
protected boolean provideClient() {
135135
return true;

src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftJarConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ private interface IntermediaryMinecraftProviderFactory<M extends MinecraftProvid
176176
private interface NamedMinecraftProviderFactory<M extends MinecraftProvider> {
177177
NamedMinecraftProvider<M> create(Project project, M minecraftProvider);
178178
}
179-
179+
180180
private interface SrgMinecraftProviderFactory<M extends MinecraftProvider> {
181181
SrgMinecraftProvider<M> create(Project project, M minecraftProvider);
182182
}

src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ private void downloadJars() throws IOException {
134134
}
135135
}
136136
}
137-
137+
138138
public final void extractBundledServerJar() throws IOException {
139139
Preconditions.checkArgument(provideServer(), "Not configured to provide server jar");
140140
Objects.requireNonNull(getServerBundleMetadata(), "Cannot bundled mc jar from none bundled server jar");

src/main/java/net/fabricmc/loom/configuration/providers/minecraft/SingleJarMinecraftProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public MappingsNamespace getOfficialNamespace() {
128128
}
129129

130130
protected abstract SingleJarEnvType type();
131-
131+
132132
protected abstract Path getInputJar(SingleJarMinecraftProvider provider) throws Exception;
133133

134134
public static final class Server extends SingleJarMinecraftProvider {

src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/MojangMappedMinecraftProvider.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@
2626

2727
import java.util.List;
2828

29-
import net.fabricmc.loom.configuration.providers.minecraft.LegacyMergedMinecraftProvider;
30-
3129
import org.gradle.api.Project;
3230

3331
import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
32+
import net.fabricmc.loom.configuration.providers.minecraft.LegacyMergedMinecraftProvider;
3433
import net.fabricmc.loom.configuration.providers.minecraft.MergedMinecraftProvider;
3534
import net.fabricmc.loom.configuration.providers.minecraft.MinecraftProvider;
3635
import net.fabricmc.loom.configuration.providers.minecraft.SingleJarEnvType;

src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/SrgMinecraftProvider.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@
2626

2727
import java.util.List;
2828

29-
import net.fabricmc.loom.configuration.providers.minecraft.LegacyMergedMinecraftProvider;
30-
3129
import org.gradle.api.Project;
3230

3331
import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
32+
import net.fabricmc.loom.configuration.providers.minecraft.LegacyMergedMinecraftProvider;
3433
import net.fabricmc.loom.configuration.providers.minecraft.MergedMinecraftProvider;
3534
import net.fabricmc.loom.configuration.providers.minecraft.MinecraftProvider;
3635
import net.fabricmc.loom.configuration.providers.minecraft.SingleJarEnvType;

src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java

+3
Original file line numberDiff line numberDiff line change
@@ -433,12 +433,15 @@ private ClassLineNumbers filterForgeLineNumbers(@Nullable ClassLineNumbers lineN
433433
// Remove Forge and NeoForge classes from linemap
434434
// TODO: We should instead not decompile Forge's classes at all
435435
var lineMap = new HashMap<String, ClassLineNumbers.Entry>();
436+
436437
for (Map.Entry<String, ClassLineNumbers.Entry> entry : lineNumbers.lineMap().entrySet()) {
437438
String name = entry.getKey();
439+
438440
if (!name.startsWith("net/minecraftforge/") && !name.startsWith("net/neoforged/")) {
439441
lineMap.put(name, entry.getValue());
440442
}
441443
}
444+
442445
return new ClassLineNumbers(lineMap);
443446
} else {
444447
return lineNumbers;

0 commit comments

Comments
 (0)