From c89344527b9e68c6bbf7ea40479b97136e3ed791 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 17 Aug 2016 00:30:48 +0100 Subject: [PATCH] Load project deps from within gradle, should allow moduals to be built --- .../loom/AbstractPlugin.java | 42 +++++++++++++++- .../loom/LoomGradleExtension.java | 2 +- .../loom/LoomGradlePlugin.java | 10 ++-- .../loom/task/DownloadNewTask.java | 6 +-- .../loom/task/DownloadTask.java | 50 +++++++++++-------- .../loom/task/ExtractNativesTask.java | 4 +- .../loom/task/GenIdeaProjectTask.java | 10 ++-- .../loom/task/MapJarsTask.java | 6 +-- .../loom/util/Checksum.java | 2 +- .../loom/util/Constants.java | 6 +-- .../loom/util/IdeaRunConfig.java | 2 +- .../loom/util/ManifestVersion.java | 2 +- .../loom/util/OperatingSystem.java | 2 +- .../loom/util/Version.java | 2 +- .../loom/util/assets/AssetIndex.java | 2 +- .../loom/util/assets/AssetObject.java | 2 +- .../loom/util/delayed/DelayedFile.java | 4 +- .../loom/util/delayed/IDelayed.java | 4 +- .../loom/util/progress/ProgressLogger.java | 2 +- .../net.fabricmc.loom.properties | 2 +- 20 files changed, 103 insertions(+), 59 deletions(-) rename src/main/java/net/{fabric => fabricmc}/loom/AbstractPlugin.java (76%) rename src/main/java/net/{fabric => fabricmc}/loom/LoomGradleExtension.java (97%) rename src/main/java/net/{fabric => fabricmc}/loom/LoomGradlePlugin.java (89%) rename src/main/java/net/{fabric => fabricmc}/loom/task/DownloadNewTask.java (97%) rename src/main/java/net/{fabric => fabricmc}/loom/task/DownloadTask.java (80%) rename src/main/java/net/{fabric => fabricmc}/loom/task/ExtractNativesTask.java (96%) rename src/main/java/net/{fabric => fabricmc}/loom/task/GenIdeaProjectTask.java (97%) rename src/main/java/net/{fabric => fabricmc}/loom/task/MapJarsTask.java (96%) rename src/main/java/net/{fabric => fabricmc}/loom/util/Checksum.java (98%) rename src/main/java/net/{fabric => fabricmc}/loom/util/Constants.java (96%) rename src/main/java/net/{fabric => fabricmc}/loom/util/IdeaRunConfig.java (98%) rename src/main/java/net/{fabric => fabricmc}/loom/util/ManifestVersion.java (97%) rename src/main/java/net/{fabric => fabricmc}/loom/util/OperatingSystem.java (98%) rename src/main/java/net/{fabric => fabricmc}/loom/util/Version.java (99%) rename src/main/java/net/{fabric => fabricmc}/loom/util/assets/AssetIndex.java (97%) rename src/main/java/net/{fabric => fabricmc}/loom/util/assets/AssetObject.java (97%) rename src/main/java/net/{fabric => fabricmc}/loom/util/delayed/DelayedFile.java (95%) rename src/main/java/net/{fabric => fabricmc}/loom/util/delayed/IDelayed.java (93%) rename src/main/java/net/{fabric => fabricmc}/loom/util/progress/ProgressLogger.java (99%) diff --git a/src/main/java/net/fabric/loom/AbstractPlugin.java b/src/main/java/net/fabricmc/loom/AbstractPlugin.java similarity index 76% rename from src/main/java/net/fabric/loom/AbstractPlugin.java rename to src/main/java/net/fabricmc/loom/AbstractPlugin.java index 2c87459..314f7eb 100644 --- a/src/main/java/net/fabric/loom/AbstractPlugin.java +++ b/src/main/java/net/fabricmc/loom/AbstractPlugin.java @@ -22,13 +22,18 @@ * SOFTWARE. */ -package net.fabric.loom; +package net.fabricmc.loom; -import net.fabric.loom.util.Constants; +import com.google.gson.Gson; +import net.fabricmc.loom.task.DownloadTask; +import net.fabricmc.loom.util.Constants; import com.google.common.collect.ImmutableMap; +import net.fabricmc.loom.util.Version; +import org.gradle.api.Action; import org.gradle.api.Plugin; import org.gradle.api.Project; import org.gradle.api.Task; +import org.gradle.api.artifacts.repositories.FlatDirectoryArtifactRepository; import org.gradle.api.artifacts.repositories.MavenArtifactRepository; import org.gradle.api.plugins.JavaPlugin; import org.gradle.api.plugins.JavaPluginConvention; @@ -37,6 +42,10 @@ import org.gradle.api.tasks.javadoc.Javadoc; import org.gradle.plugins.ide.eclipse.model.EclipseModel; import org.gradle.plugins.ide.idea.model.IdeaModel; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; + public class AbstractPlugin implements Plugin { protected Project project; @@ -138,5 +147,34 @@ public class AbstractPlugin implements Plugin { Javadoc javadoc = (Javadoc) project.getTasks().getByName(JavaPlugin.JAVADOC_TASK_NAME); javadoc.setClasspath(main.getOutput().plus(main.getCompileClasspath())); + + project.afterEvaluate(project1 -> { + LoomGradleExtension extension = project1.getExtensions().getByType(LoomGradleExtension.class); + project1.getRepositories().flatDir(flatDirectoryArtifactRepository -> { + flatDirectoryArtifactRepository.dir(Constants.CACHE_FILES); + flatDirectoryArtifactRepository.setName("LoomCacheFiles"); + }); + + Gson gson = new Gson(); + try { + DownloadTask.downloadMcJson(extension, project1.getLogger()); + Version version = gson.fromJson(new FileReader(Constants.MINECRAFT_JSON.get(extension)), Version.class); + for (Version.Library library : version.libraries) { + if (library.allowed() && library.getFile() != null) { + String configName = Constants.CONFIG_MC_DEPENDENCIES; + if (library.name.contains("java3d") || library.name.contains("paulscode") || library.name.contains("lwjgl") || library.name.contains("twitch") || library.name.contains("jinput")) { + configName = Constants.CONFIG_MC_DEPENDENCIES_CLIENT; + } + project1.getDependencies().add(configName, library.getArtifactName()); + } + } + } catch (IOException e) { + e.printStackTrace(); + } + project1.getDependencies().add(Constants.CONFIG_MC_DEPENDENCIES, "net.minecraft:" + Constants.MINECRAFT_CLIENT_MAPPED_JAR.get(extension).getName().replace(".jar", "")); + + }); + + } } diff --git a/src/main/java/net/fabric/loom/LoomGradleExtension.java b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java similarity index 97% rename from src/main/java/net/fabric/loom/LoomGradleExtension.java rename to src/main/java/net/fabricmc/loom/LoomGradleExtension.java index 6c7c7c4..7c3c5c8 100644 --- a/src/main/java/net/fabric/loom/LoomGradleExtension.java +++ b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabric.loom; +package net.fabricmc.loom; public class LoomGradleExtension { public String version; diff --git a/src/main/java/net/fabric/loom/LoomGradlePlugin.java b/src/main/java/net/fabricmc/loom/LoomGradlePlugin.java similarity index 89% rename from src/main/java/net/fabric/loom/LoomGradlePlugin.java rename to src/main/java/net/fabricmc/loom/LoomGradlePlugin.java index 05ad580..935950d 100644 --- a/src/main/java/net/fabric/loom/LoomGradlePlugin.java +++ b/src/main/java/net/fabricmc/loom/LoomGradlePlugin.java @@ -22,12 +22,12 @@ * SOFTWARE. */ -package net.fabric.loom; +package net.fabricmc.loom; -import net.fabric.loom.task.DownloadTask; -import net.fabric.loom.task.ExtractNativesTask; -import net.fabric.loom.task.GenIdeaProjectTask; -import net.fabric.loom.task.MapJarsTask; +import net.fabricmc.loom.task.DownloadTask; +import net.fabricmc.loom.task.ExtractNativesTask; +import net.fabricmc.loom.task.GenIdeaProjectTask; +import net.fabricmc.loom.task.MapJarsTask; import org.gradle.api.DefaultTask; import org.gradle.api.Project; diff --git a/src/main/java/net/fabric/loom/task/DownloadNewTask.java b/src/main/java/net/fabricmc/loom/task/DownloadNewTask.java similarity index 97% rename from src/main/java/net/fabric/loom/task/DownloadNewTask.java rename to src/main/java/net/fabricmc/loom/task/DownloadNewTask.java index d93893d..6b21d01 100644 --- a/src/main/java/net/fabric/loom/task/DownloadNewTask.java +++ b/src/main/java/net/fabricmc/loom/task/DownloadNewTask.java @@ -22,10 +22,10 @@ * SOFTWARE. */ -package net.fabric.loom.task; +package net.fabricmc.loom.task; -import net.fabric.loom.util.Constants; -import net.fabric.loom.util.progress.ProgressLogger; +import net.fabricmc.loom.util.Constants; +import net.fabricmc.loom.util.progress.ProgressLogger; import org.gradle.api.DefaultTask; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.OutputFile; diff --git a/src/main/java/net/fabric/loom/task/DownloadTask.java b/src/main/java/net/fabricmc/loom/task/DownloadTask.java similarity index 80% rename from src/main/java/net/fabric/loom/task/DownloadTask.java rename to src/main/java/net/fabricmc/loom/task/DownloadTask.java index 5df57d7..0fb55be 100644 --- a/src/main/java/net/fabric/loom/task/DownloadTask.java +++ b/src/main/java/net/fabricmc/loom/task/DownloadTask.java @@ -22,27 +22,29 @@ * SOFTWARE. */ -package net.fabric.loom.task; +package net.fabricmc.loom.task; -import net.fabric.loom.util.Constants; -import net.fabric.loom.util.Version; +import net.fabricmc.loom.util.Constants; +import net.fabricmc.loom.util.Version; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import net.fabricmc.loom.LoomGradleExtension; +import net.fabricmc.loom.util.Checksum; +import net.fabricmc.loom.util.ManifestVersion; +import net.fabricmc.loom.util.assets.AssetIndex; +import net.fabricmc.loom.util.assets.AssetObject; +import net.fabricmc.loom.util.progress.ProgressLogger; import org.apache.commons.io.FileUtils; import org.gradle.api.DefaultTask; import org.gradle.api.artifacts.Configuration; import org.gradle.api.artifacts.dsl.DependencyHandler; +import org.gradle.api.logging.Logger; import org.gradle.api.tasks.TaskAction; -import net.fabric.loom.LoomGradleExtension; -import net.fabric.loom.util.Checksum; -import net.fabric.loom.util.ManifestVersion; -import net.fabric.loom.util.assets.AssetIndex; -import net.fabric.loom.util.assets.AssetObject; -import net.fabric.loom.util.progress.ProgressLogger; import java.io.File; import java.io.FileReader; import java.io.IOException; +import java.net.MalformedURLException; import java.net.URL; import java.util.Map; import java.util.Optional; @@ -53,19 +55,7 @@ public class DownloadTask extends DefaultTask { try { LoomGradleExtension extension = this.getProject().getExtensions().getByType(LoomGradleExtension.class); - if (!Constants.MINECRAFT_JSON.get(extension).exists()) { - this.getLogger().lifecycle(":downloading minecraft json"); - FileUtils.copyURLToFile(new URL("https://launchermeta.mojang.com/mc/game/version_manifest.json"), Constants.VERSION_MANIFEST); - ManifestVersion mcManifest = new GsonBuilder().create().fromJson(FileUtils.readFileToString(Constants.VERSION_MANIFEST), ManifestVersion.class); - - Optional optionalVersion = mcManifest.versions.stream().filter(versions -> versions.id.equalsIgnoreCase(extension.version)).findFirst(); - if (optionalVersion.isPresent()) { - FileUtils.copyURLToFile(new URL(optionalVersion.get().url), Constants.MINECRAFT_JSON.get(extension)); - } else { - this.getLogger().info(":failed downloading minecraft json"); - throw new RuntimeException("Failed downloading Minecraft json"); - } - } + downloadMcJson(extension, getLogger()); Gson gson = new Gson(); Version version = gson.fromJson(new FileReader(Constants.MINECRAFT_JSON.get(extension)), Version.class); @@ -145,4 +135,20 @@ public class DownloadTask extends DefaultTask { e.printStackTrace(); } } + + public static void downloadMcJson(LoomGradleExtension extension, Logger logger) throws IOException { + if (!Constants.MINECRAFT_JSON.get(extension).exists()) { + logger.lifecycle(":downloading minecraft json"); + FileUtils.copyURLToFile(new URL("https://launchermeta.mojang.com/mc/game/version_manifest.json"), Constants.VERSION_MANIFEST); + ManifestVersion mcManifest = new GsonBuilder().create().fromJson(FileUtils.readFileToString(Constants.VERSION_MANIFEST), ManifestVersion.class); + + Optional optionalVersion = mcManifest.versions.stream().filter(versions -> versions.id.equalsIgnoreCase(extension.version)).findFirst(); + if (optionalVersion.isPresent()) { + FileUtils.copyURLToFile(new URL(optionalVersion.get().url), Constants.MINECRAFT_JSON.get(extension)); + } else { + logger.info(":failed downloading minecraft json"); + throw new RuntimeException("Failed downloading Minecraft json"); + } + } + } } diff --git a/src/main/java/net/fabric/loom/task/ExtractNativesTask.java b/src/main/java/net/fabricmc/loom/task/ExtractNativesTask.java similarity index 96% rename from src/main/java/net/fabric/loom/task/ExtractNativesTask.java rename to src/main/java/net/fabricmc/loom/task/ExtractNativesTask.java index ac71860..35a8ca4 100644 --- a/src/main/java/net/fabric/loom/task/ExtractNativesTask.java +++ b/src/main/java/net/fabricmc/loom/task/ExtractNativesTask.java @@ -22,9 +22,9 @@ * SOFTWARE. */ -package net.fabric.loom.task; +package net.fabricmc.loom.task; -import net.fabric.loom.util.Constants; +import net.fabricmc.loom.util.Constants; import org.gradle.api.DefaultTask; import org.gradle.api.tasks.TaskAction; import org.zeroturnaround.zip.ZipUtil; diff --git a/src/main/java/net/fabric/loom/task/GenIdeaProjectTask.java b/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java similarity index 97% rename from src/main/java/net/fabric/loom/task/GenIdeaProjectTask.java rename to src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java index 908941b..4260d64 100644 --- a/src/main/java/net/fabric/loom/task/GenIdeaProjectTask.java +++ b/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java @@ -22,12 +22,12 @@ * SOFTWARE. */ -package net.fabric.loom.task; +package net.fabricmc.loom.task; -import net.fabric.loom.LoomGradleExtension; -import net.fabric.loom.util.Constants; -import net.fabric.loom.util.IdeaRunConfig; -import net.fabric.loom.util.Version; +import net.fabricmc.loom.LoomGradleExtension; +import net.fabricmc.loom.util.Constants; +import net.fabricmc.loom.util.IdeaRunConfig; +import net.fabricmc.loom.util.Version; import com.google.gson.Gson; import org.gradle.api.DefaultTask; import org.gradle.api.tasks.TaskAction; diff --git a/src/main/java/net/fabric/loom/task/MapJarsTask.java b/src/main/java/net/fabricmc/loom/task/MapJarsTask.java similarity index 96% rename from src/main/java/net/fabric/loom/task/MapJarsTask.java rename to src/main/java/net/fabricmc/loom/task/MapJarsTask.java index 8130b8f..d9dd9e9 100644 --- a/src/main/java/net/fabric/loom/task/MapJarsTask.java +++ b/src/main/java/net/fabricmc/loom/task/MapJarsTask.java @@ -22,13 +22,13 @@ * SOFTWARE. */ -package net.fabric.loom.task; +package net.fabricmc.loom.task; import cuchaz.enigma.Deobfuscator; import cuchaz.enigma.mapping.MappingsEnigmaReader; import cuchaz.enigma.throwables.MappingParseException; -import net.fabric.loom.LoomGradleExtension; -import net.fabric.loom.util.Constants; +import net.fabricmc.loom.LoomGradleExtension; +import net.fabricmc.loom.util.Constants; import org.apache.commons.io.FileUtils; import org.gradle.api.DefaultTask; import org.gradle.api.tasks.TaskAction; diff --git a/src/main/java/net/fabric/loom/util/Checksum.java b/src/main/java/net/fabricmc/loom/util/Checksum.java similarity index 98% rename from src/main/java/net/fabric/loom/util/Checksum.java rename to src/main/java/net/fabricmc/loom/util/Checksum.java index e3a1cc9..9a6ab22 100644 --- a/src/main/java/net/fabric/loom/util/Checksum.java +++ b/src/main/java/net/fabricmc/loom/util/Checksum.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabric.loom.util; +package net.fabricmc.loom.util; import com.google.common.hash.HashCode; import com.google.common.hash.Hashing; diff --git a/src/main/java/net/fabric/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java similarity index 96% rename from src/main/java/net/fabric/loom/util/Constants.java rename to src/main/java/net/fabricmc/loom/util/Constants.java index 0635132..c326ee7 100644 --- a/src/main/java/net/fabric/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -22,10 +22,10 @@ * SOFTWARE. */ -package net.fabric.loom.util; +package net.fabricmc.loom.util; -import net.fabric.loom.util.delayed.IDelayed; -import net.fabric.loom.util.delayed.DelayedFile; +import net.fabricmc.loom.util.delayed.IDelayed; +import net.fabricmc.loom.util.delayed.DelayedFile; import java.io.File; import java.net.URL; diff --git a/src/main/java/net/fabric/loom/util/IdeaRunConfig.java b/src/main/java/net/fabricmc/loom/util/IdeaRunConfig.java similarity index 98% rename from src/main/java/net/fabric/loom/util/IdeaRunConfig.java rename to src/main/java/net/fabricmc/loom/util/IdeaRunConfig.java index 6515a3e..6faa9b0 100644 --- a/src/main/java/net/fabric/loom/util/IdeaRunConfig.java +++ b/src/main/java/net/fabricmc/loom/util/IdeaRunConfig.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabric.loom.util; +package net.fabricmc.loom.util; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; diff --git a/src/main/java/net/fabric/loom/util/ManifestVersion.java b/src/main/java/net/fabricmc/loom/util/ManifestVersion.java similarity index 97% rename from src/main/java/net/fabric/loom/util/ManifestVersion.java rename to src/main/java/net/fabricmc/loom/util/ManifestVersion.java index 528ed97..d18fcf2 100644 --- a/src/main/java/net/fabric/loom/util/ManifestVersion.java +++ b/src/main/java/net/fabricmc/loom/util/ManifestVersion.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabric.loom.util; +package net.fabricmc.loom.util; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/net/fabric/loom/util/OperatingSystem.java b/src/main/java/net/fabricmc/loom/util/OperatingSystem.java similarity index 98% rename from src/main/java/net/fabric/loom/util/OperatingSystem.java rename to src/main/java/net/fabricmc/loom/util/OperatingSystem.java index 04f33da..21692ed 100644 --- a/src/main/java/net/fabric/loom/util/OperatingSystem.java +++ b/src/main/java/net/fabricmc/loom/util/OperatingSystem.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabric.loom.util; +package net.fabricmc.loom.util; public class OperatingSystem { public static String getOS() { diff --git a/src/main/java/net/fabric/loom/util/Version.java b/src/main/java/net/fabricmc/loom/util/Version.java similarity index 99% rename from src/main/java/net/fabric/loom/util/Version.java rename to src/main/java/net/fabricmc/loom/util/Version.java index 877fe6b..90d879d 100644 --- a/src/main/java/net/fabric/loom/util/Version.java +++ b/src/main/java/net/fabricmc/loom/util/Version.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabric.loom.util; +package net.fabricmc.loom.util; import com.google.gson.JsonObject; diff --git a/src/main/java/net/fabric/loom/util/assets/AssetIndex.java b/src/main/java/net/fabricmc/loom/util/assets/AssetIndex.java similarity index 97% rename from src/main/java/net/fabric/loom/util/assets/AssetIndex.java rename to src/main/java/net/fabricmc/loom/util/assets/AssetIndex.java index 6f9a5a2..8e111cc 100644 --- a/src/main/java/net/fabric/loom/util/assets/AssetIndex.java +++ b/src/main/java/net/fabricmc/loom/util/assets/AssetIndex.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabric.loom.util.assets; +package net.fabricmc.loom.util.assets; import java.util.HashSet; import java.util.LinkedHashMap; diff --git a/src/main/java/net/fabric/loom/util/assets/AssetObject.java b/src/main/java/net/fabricmc/loom/util/assets/AssetObject.java similarity index 97% rename from src/main/java/net/fabric/loom/util/assets/AssetObject.java rename to src/main/java/net/fabricmc/loom/util/assets/AssetObject.java index acc4e8f..ead0e3b 100644 --- a/src/main/java/net/fabric/loom/util/assets/AssetObject.java +++ b/src/main/java/net/fabricmc/loom/util/assets/AssetObject.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabric.loom.util.assets; +package net.fabricmc.loom.util.assets; public class AssetObject { private String hash; diff --git a/src/main/java/net/fabric/loom/util/delayed/DelayedFile.java b/src/main/java/net/fabricmc/loom/util/delayed/DelayedFile.java similarity index 95% rename from src/main/java/net/fabric/loom/util/delayed/DelayedFile.java rename to src/main/java/net/fabricmc/loom/util/delayed/DelayedFile.java index 081397a..20e144f 100644 --- a/src/main/java/net/fabric/loom/util/delayed/DelayedFile.java +++ b/src/main/java/net/fabricmc/loom/util/delayed/DelayedFile.java @@ -22,9 +22,9 @@ * SOFTWARE. */ -package net.fabric.loom.util.delayed; +package net.fabricmc.loom.util.delayed; -import net.fabric.loom.LoomGradleExtension; +import net.fabricmc.loom.LoomGradleExtension; import java.io.File; import java.util.function.Function; diff --git a/src/main/java/net/fabric/loom/util/delayed/IDelayed.java b/src/main/java/net/fabricmc/loom/util/delayed/IDelayed.java similarity index 93% rename from src/main/java/net/fabric/loom/util/delayed/IDelayed.java rename to src/main/java/net/fabricmc/loom/util/delayed/IDelayed.java index 8653929..97445ef 100644 --- a/src/main/java/net/fabric/loom/util/delayed/IDelayed.java +++ b/src/main/java/net/fabricmc/loom/util/delayed/IDelayed.java @@ -22,9 +22,9 @@ * SOFTWARE. */ -package net.fabric.loom.util.delayed; +package net.fabricmc.loom.util.delayed; -import net.fabric.loom.LoomGradleExtension; +import net.fabricmc.loom.LoomGradleExtension; public interface IDelayed { T get(LoomGradleExtension extension); diff --git a/src/main/java/net/fabric/loom/util/progress/ProgressLogger.java b/src/main/java/net/fabricmc/loom/util/progress/ProgressLogger.java similarity index 99% rename from src/main/java/net/fabric/loom/util/progress/ProgressLogger.java rename to src/main/java/net/fabricmc/loom/util/progress/ProgressLogger.java index 5c9b9af..166e3ee 100644 --- a/src/main/java/net/fabric/loom/util/progress/ProgressLogger.java +++ b/src/main/java/net/fabricmc/loom/util/progress/ProgressLogger.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabric.loom.util.progress; +package net.fabricmc.loom.util.progress; import org.gradle.api.Project; diff --git a/src/main/resources/META-INF/gradle-plugins/net.fabricmc.loom.properties b/src/main/resources/META-INF/gradle-plugins/net.fabricmc.loom.properties index 0babbd0..dffb4b5 100644 --- a/src/main/resources/META-INF/gradle-plugins/net.fabricmc.loom.properties +++ b/src/main/resources/META-INF/gradle-plugins/net.fabricmc.loom.properties @@ -1 +1 @@ -implementation-class=net.fabric.loom.LoomGradlePlugin \ No newline at end of file +implementation-class=net.fabricmc.loom.LoomGradlePlugin \ No newline at end of file