From 2c5e50b5a3a3680049517c2165e389d2e3f3bc00 Mon Sep 17 00:00:00 2001 From: asie Date: Wed, 24 Oct 2018 22:07:18 +0200 Subject: [PATCH] ongoing de-OMLification --- README.md | 4 ++-- src/main/java/net/fabricmc/loom/mixin/MixinServiceGradle.java | 2 +- src/main/java/net/fabricmc/loom/task/DownloadTask.java | 4 ++-- .../gradle-plugins/com.openmodloader.gradle.properties | 1 - .../META-INF/gradle-plugins/net.fabricmc.gradle.properties | 1 + 5 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 src/main/resources/META-INF/gradle-plugins/com.openmodloader.gradle.properties create mode 100644 src/main/resources/META-INF/gradle-plugins/net.fabricmc.gradle.properties diff --git a/README.md b/README.md index 1a28f51..968e67f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# OpenGradle -Gradle plugin for OpenModLoader +# fabric-loom +Gradle plugin for Fabric Usage: `gradlew setup idea` (Use `./gradle` on macOS and Linux) diff --git a/src/main/java/net/fabricmc/loom/mixin/MixinServiceGradle.java b/src/main/java/net/fabricmc/loom/mixin/MixinServiceGradle.java index d38c8a5..6d0c1a1 100644 --- a/src/main/java/net/fabricmc/loom/mixin/MixinServiceGradle.java +++ b/src/main/java/net/fabricmc/loom/mixin/MixinServiceGradle.java @@ -22,7 +22,7 @@ public class MixinServiceGradle extends MixinServiceLaunchWrapper implements ICl @Override public String getName() { - return "OpenModLoaderGradle"; + return "FabricGradle"; } @Override diff --git a/src/main/java/net/fabricmc/loom/task/DownloadTask.java b/src/main/java/net/fabricmc/loom/task/DownloadTask.java index e4a1f4c..7422344 100644 --- a/src/main/java/net/fabricmc/loom/task/DownloadTask.java +++ b/src/main/java/net/fabricmc/loom/task/DownloadTask.java @@ -75,7 +75,7 @@ public class DownloadTask extends DefaultTask { if (!Constants.MAPPINGS_ZIP.get(extension).exists() && extension.hasPomf()) { this.getLogger().lifecycle(":downloading mappings"); try { - FileUtils.copyURLToFile(new URL("http://modmuss50.me:8080/job/OpenModLoader/job/pomf/job/" + extension.version + "/" + extension.pomfVersion + "/artifact/build/libs/pomf-enigma-" + extension.version + "." + extension.pomfVersion + ".zip"), Constants.MAPPINGS_ZIP.get(extension)); + FileUtils.copyURLToFile(new URL("http://modmuss50.me:8080/job/FabricMC/job/pomf/job/" + extension.version + "/" + extension.pomfVersion + "/artifact/build/libs/pomf-enigma-" + extension.version + "." + extension.pomfVersion + ".zip"), Constants.MAPPINGS_ZIP.get(extension)); } catch (Exception e) { throw new RuntimeException("Failed to download mappings", e); } @@ -103,7 +103,7 @@ public class DownloadTask extends DefaultTask { if (!Constants.MAPPINGS_TINY_GZ.get(extension).exists() && !extension.localMappings) { getLogger().lifecycle(":downloading tiny mappings"); try { - FileUtils.copyURLToFile(new URL("http://modmuss50.me:8080/job/OpenModLoader/job/pomf/job/" + extension.version + "/" + extension.pomfVersion + "/artifact/build/libs/pomf-tiny-" + extension.version + "." + extension.pomfVersion + ".gz"), Constants.MAPPINGS_TINY_GZ.get(extension)); + FileUtils.copyURLToFile(new URL("http://modmuss50.me:8080/job/FabricMC/job/pomf/job/" + extension.version + "/" + extension.pomfVersion + "/artifact/build/libs/pomf-tiny-" + extension.version + "." + extension.pomfVersion + ".gz"), Constants.MAPPINGS_TINY_GZ.get(extension)); } catch (Exception e) { throw new RuntimeException("Failed to download mappings", e); } diff --git a/src/main/resources/META-INF/gradle-plugins/com.openmodloader.gradle.properties b/src/main/resources/META-INF/gradle-plugins/com.openmodloader.gradle.properties deleted file mode 100644 index dffb4b5..0000000 --- a/src/main/resources/META-INF/gradle-plugins/com.openmodloader.gradle.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=net.fabricmc.loom.LoomGradlePlugin \ No newline at end of file diff --git a/src/main/resources/META-INF/gradle-plugins/net.fabricmc.gradle.properties b/src/main/resources/META-INF/gradle-plugins/net.fabricmc.gradle.properties new file mode 100644 index 0000000..8b29c32 --- /dev/null +++ b/src/main/resources/META-INF/gradle-plugins/net.fabricmc.gradle.properties @@ -0,0 +1 @@ +implementation-class=net.fabricmc.loom.LoomGradlePlugin