Skip to content

Commit

Permalink
Fix checkstyle violations
Browse files Browse the repository at this point in the history
  • Loading branch information
shedaniel committed Apr 4, 2024
1 parent 63f00ee commit 7226922
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ private synchronized void setupMinecraft(ConfigContext configContext) throws Exc
if (extension.isForgeLike() && !(minecraftProvider instanceof ForgeMinecraftProvider)) {
throw new UnsupportedOperationException("Using Forge with split jars is not supported!");
}

extension.setMinecraftProvider(minecraftProvider);
minecraftProvider.provide();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,99 +37,99 @@

public abstract class SingleJarForgeMinecraftProvider extends SingleJarMinecraftProvider implements ForgeMinecraftProvider {
private final MinecraftPatchedProvider patchedProvider;

private SingleJarForgeMinecraftProvider(MinecraftMetadataProvider metadataProvider, ConfigContext configContext) {
super(metadataProvider, configContext, MappingsNamespace.OFFICIAL);
this.patchedProvider = new MinecraftPatchedProvider(configContext.project(), this, provideServer() ? MinecraftPatchedProvider.Type.SERVER_ONLY : MinecraftPatchedProvider.Type.CLIENT_ONLY);
}

public static SingleJarForgeMinecraftProvider.Server forgeServer(MinecraftMetadataProvider metadataProvider, ConfigContext configContext) {
return new SingleJarForgeMinecraftProvider.Server(metadataProvider, configContext);
}

public static SingleJarForgeMinecraftProvider.Client forgeClient(MinecraftMetadataProvider metadataProvider, ConfigContext configContext) {
return new SingleJarForgeMinecraftProvider.Client(metadataProvider, configContext);
}

@Override
protected boolean provideClient() {
// the client jar is needed for client-extra which the Forge userdev launch thing always checks for
return true;
}

@Override
protected void processJar() throws Exception {
// don't process the jar, it's created by the patched provider
}

@Override
public MinecraftPatchedProvider getPatchedProvider() {
return patchedProvider;
}

@Override
public Path getMinecraftEnvOnlyJar() {
return patchedProvider.getMinecraftPatchedJar();
}

@Override
public List<Path> getMinecraftJars() {
return List.of(patchedProvider.getMinecraftPatchedJar());
}

public static final class Server extends SingleJarForgeMinecraftProvider {
private Server(MinecraftMetadataProvider metadataProvider, ConfigContext configContext) {
super(metadataProvider, configContext);
}

@Override
public SingleJarEnvType type() {
return SingleJarEnvType.SERVER;
}

@Override
public Path getInputJar(SingleJarMinecraftProvider provider) throws Exception {
BundleMetadata serverBundleMetadata = provider.getServerBundleMetadata();

if (serverBundleMetadata == null) {
return provider.getMinecraftServerJar().toPath();
}

provider.extractBundledServerJar();
return provider.getMinecraftExtractedServerJar().toPath();
}

@Override
protected boolean provideServer() {
return true;
}

@Override
protected boolean provideClient() {
return false;
}
}

public static final class Client extends SingleJarForgeMinecraftProvider {
private Client(MinecraftMetadataProvider metadataProvider, ConfigContext configContext) {
super(metadataProvider, configContext);
}

@Override
public SingleJarEnvType type() {
return SingleJarEnvType.CLIENT;
}

@Override
public Path getInputJar(SingleJarMinecraftProvider provider) throws Exception {
return provider.getMinecraftClientJar().toPath();
}

@Override
protected boolean provideServer() {
return false;
}

@Override
protected boolean provideClient() {
return true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ private interface IntermediaryMinecraftProviderFactory<M extends MinecraftProvid
private interface NamedMinecraftProviderFactory<M extends MinecraftProvider> {
NamedMinecraftProvider<M> create(Project project, M minecraftProvider);
}

private interface SrgMinecraftProviderFactory<M extends MinecraftProvider> {
SrgMinecraftProvider<M> create(Project project, M minecraftProvider);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ private void downloadJars() throws IOException {
}
}
}

public final void extractBundledServerJar() throws IOException {
Preconditions.checkArgument(provideServer(), "Not configured to provide server jar");
Objects.requireNonNull(getServerBundleMetadata(), "Cannot bundled mc jar from none bundled server jar");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public MappingsNamespace getOfficialNamespace() {
}

protected abstract SingleJarEnvType type();

protected abstract Path getInputJar(SingleJarMinecraftProvider provider) throws Exception;

public static final class Server extends SingleJarMinecraftProvider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,10 @@

import java.util.List;

import net.fabricmc.loom.configuration.providers.minecraft.LegacyMergedMinecraftProvider;

import org.gradle.api.Project;

import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
import net.fabricmc.loom.configuration.providers.minecraft.LegacyMergedMinecraftProvider;
import net.fabricmc.loom.configuration.providers.minecraft.MergedMinecraftProvider;
import net.fabricmc.loom.configuration.providers.minecraft.MinecraftProvider;
import net.fabricmc.loom.configuration.providers.minecraft.SingleJarEnvType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,10 @@

import java.util.List;

import net.fabricmc.loom.configuration.providers.minecraft.LegacyMergedMinecraftProvider;

import org.gradle.api.Project;

import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
import net.fabricmc.loom.configuration.providers.minecraft.LegacyMergedMinecraftProvider;
import net.fabricmc.loom.configuration.providers.minecraft.MergedMinecraftProvider;
import net.fabricmc.loom.configuration.providers.minecraft.MinecraftProvider;
import net.fabricmc.loom.configuration.providers.minecraft.SingleJarEnvType;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java
Original file line number Diff line number Diff line change
Expand Up @@ -433,12 +433,15 @@ private ClassLineNumbers filterForgeLineNumbers(@Nullable ClassLineNumbers lineN
// Remove Forge and NeoForge classes from linemap
// TODO: We should instead not decompile Forge's classes at all
var lineMap = new HashMap<String, ClassLineNumbers.Entry>();

for (Map.Entry<String, ClassLineNumbers.Entry> entry : lineNumbers.lineMap().entrySet()) {
String name = entry.getKey();

if (!name.startsWith("net/minecraftforge/") && !name.startsWith("net/neoforged/")) {
lineMap.put(name, entry.getValue());
}
}

return new ClassLineNumbers(lineMap);
} else {
return lineNumbers;
Expand Down

0 comments on commit 7226922

Please sign in to comment.