diff --git a/build.gradle b/build.gradle index 750f24fdd..e787b5f7c 100644 --- a/build.gradle +++ b/build.gradle @@ -17,9 +17,9 @@ apply plugin: 'maven' apply plugin: "com.gradle.plugin-publish" //apply plugin: 'license' -group = 'net.minecraftforge.gradle' -version = '2.3-SNAPSHOT' -//version = '2.2.1' +group = 'org.dimdev' +version = '2.4-SNAPSHOT' + archivesBaseName = 'ForgeGradle' targetCompatibility = '1.8' sourceCompatibility = '1.8' @@ -28,7 +28,7 @@ repositories { mavenLocal() maven { name = "forge" - url = "http://files.minecraftforge.net/maven" + url = "https://files.minecraftforge.net/maven" } maven { // because Srg2Source needs an eclipse dependency. @@ -74,7 +74,7 @@ dependencies { compile 'com.nothome:javaxdelta:2.0.1' // GDIFF implementation for BinPatches compile 'com.google.code.gson:gson:2.2.4' // Used instead of Argo for buuilding changelog. compile 'com.github.tony19:named-regexp:0.2.3' // 1.7 Named regexp features - compile 'net.minecraftforge:forgeflower:1.5.380.22' // Fernflower Forge edition + compile 'net.minecraftforge:forgeflower:1.5.380.26' // Fernflower Forge edition shade 'net.md-5:SpecialSource:1.8.3' // deobf and reobf @@ -172,7 +172,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) { artifacts { archives jar - archives javadocJar + //archives javadocJar } test { @@ -218,7 +218,7 @@ uploadArchives { if (project.hasProperty('forgeMavenPass')) { - repository(url: "http://files.minecraftforge.net/maven/manage/upload") { + repository(url: "https://files.minecraftforge.net/maven/manage/upload") { authentication(userName: "forge", password: project.getProperty('forgeMavenPass')) } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 28861d273..deedc7fa5 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 115e6ac0a..a95009c3b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/edu/sc/seis/launch4j/Launch4jPlugin.java b/src/main/java/edu/sc/seis/launch4j/Launch4jPlugin.java index 217f94ccc..d8a748a93 100644 --- a/src/main/java/edu/sc/seis/launch4j/Launch4jPlugin.java +++ b/src/main/java/edu/sc/seis/launch4j/Launch4jPlugin.java @@ -37,7 +37,7 @@ public class Launch4jPlugin implements Plugin static final String TASK_RUN_NAME = "createExe"; static final String TASK_LAUNCH4J_NAME = "launch4j"; - static final String URL_LAUNCH4J = "http://files.minecraftforge.net/launch4j/launch4j-3.8.0-" + Constants.OPERATING_SYSTEM + ".zip"; + static final String URL_LAUNCH4J = "https://files.minecraftforge.net/launch4j/launch4j-3.8.0-" + Constants.OPERATING_SYSTEM + ".zip"; static final String ZIP_LAUNCH4J = "build/launch4j.zip"; static final String DIR_LAUNCH4J = "build/launch4j"; diff --git a/src/main/java/net/minecraftforge/gradle/common/BaseExtension.java b/src/main/java/net/minecraftforge/gradle/common/BaseExtension.java index 8afce6f61..4ca45892b 100644 --- a/src/main/java/net/minecraftforge/gradle/common/BaseExtension.java +++ b/src/main/java/net/minecraftforge/gradle/common/BaseExtension.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,6 +30,7 @@ import java.net.URL; import java.util.Arrays; import java.util.Map; +import java.util.Map.Entry; public abstract class BaseExtension { @@ -248,7 +249,61 @@ public void setMappings(String mappings) } protected void checkMappings() { + // mappings or mc version are null + if (mappingsChannel == null || Strings.isNullOrEmpty(version)) + return; + + // set now. replacer.putReplacement(Constants.REPLACE_MCP_MCVERSION, version); + + // gotta do this after setting the MC version + if (mappingsCustom != null) + return; + + // check if it exists + Map versionMap = mcpJson.get(version); + String channel = getMappingsChannelNoSubtype(); + if (versionMap != null) + { + int[] channelList = versionMap.get(channel); + if (channelList == null) + throw new GradleConfigurationException("There is no such MCP mapping channel named " + channel); + + // all is well with the world + if (searchArray(channelList, mappingsVersion)) + return; + } + + // if it gets here.. it wasnt found. Now we try to actually find it.. + for (Entry> mcEntry : mcpJson.entrySet()) + { + for (Entry channelEntry : mcEntry.getValue().entrySet()) + { + // found it! + if (searchArray(channelEntry.getValue(), mappingsVersion)) + { + boolean rightMc = mcEntry.getKey().equals(version); + boolean rightChannel = channelEntry.getKey().equals(channel); + + // right channel, but wrong mc + if (rightChannel && !rightMc) + { + project.getLogger().warn("Fuzzing selected mapping '" + getMappings() + "' to designed MC version " + mcEntry.getKey()); + replacer.putReplacement(Constants.REPLACE_MCP_MCVERSION, mcEntry.getKey()); // set MC version + return; + } + + // right MC , but wrong channel + else if (rightMc && !rightChannel) + { + throw new GradleConfigurationException("Selected mapping '" + getMappings() + "' doesnt exist! Perhaps you meant '" + channelEntry.getKey() + "_" + mappingsVersion + "'?"); + } + } + } + } + + // wasnt found + throw new GradleConfigurationException("The specified mapping '" + getMappings() + "' does not exist!"); } @SuppressWarnings("unused") diff --git a/src/main/java/net/minecraftforge/gradle/common/BasePlugin.java b/src/main/java/net/minecraftforge/gradle/common/BasePlugin.java index 785e9ca3a..e9835bfc4 100644 --- a/src/main/java/net/minecraftforge/gradle/common/BasePlugin.java +++ b/src/main/java/net/minecraftforge/gradle/common/BasePlugin.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -223,7 +223,7 @@ protected void afterEvaluate() // ApplyFernFlowerTask ffTask = ((ApplyFernFlowerTask) project.getTasks().getByName("decompileJar")); // ffTask.setClasspath(javaConv.getSourceSets().getByName("main").getCompileClasspath()); - // http://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp_config/1.13.1/mcp_config-1.13.1.zip + // https://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp_config/1.13.1/mcp_config-1.13.1.zip project.getDependencies().add(CONFIG_MAPPINGS, ImmutableMap.of( "group", "de.oceanlabs.mcp", "name", delayedString("mcp_" + REPLACE_MCP_CHANNEL).call(), diff --git a/src/main/java/net/minecraftforge/gradle/common/Constants.java b/src/main/java/net/minecraftforge/gradle/common/Constants.java index 2d989792c..cd3f6ed1a 100644 --- a/src/main/java/net/minecraftforge/gradle/common/Constants.java +++ b/src/main/java/net/minecraftforge/gradle/common/Constants.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -116,11 +116,11 @@ public Boolean call(Object o) // urls public static final String URL_MC_MANIFEST = "https://launchermeta.mojang.com/mc/game/version_manifest.json"; - public static final String URL_FF = "http://files.minecraftforge.net/fernflower-fix-1.0.zip"; + public static final String URL_FF = "https://files.minecraftforge.net/fernflower-fix-1.0.zip"; public static final String URL_ASSETS = "http://resources.download.minecraft.net"; public static final String URL_LIBRARY = "https://libraries.minecraft.net/"; // Mojang's Cloudflare front end //public static final String URL_LIBRARY = "https://minecraft-libraries.s3.amazonaws.com/"; // Mojang's AWS server, as Cloudflare is having issues, TODO: Switch back to above when their servers are fixed. - public static final String URL_FORGE_MAVEN = "http://files.minecraftforge.net/maven"; + public static final String URL_FORGE_MAVEN = "https://files.minecraftforge.net/maven"; public static final List URLS_MCP_JSON = Arrays.asList( URL_FORGE_MAVEN + "/de/oceanlabs/mcp/versions.json", "http://export.mcpbot.bspk.rs/versions.json" diff --git a/src/main/java/net/minecraftforge/gradle/patcher/PatcherConstants.java b/src/main/java/net/minecraftforge/gradle/patcher/PatcherConstants.java index b86395111..1ac08445f 100644 --- a/src/main/java/net/minecraftforge/gradle/patcher/PatcherConstants.java +++ b/src/main/java/net/minecraftforge/gradle/patcher/PatcherConstants.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,7 +29,7 @@ private PatcherConstants() {} // installer stuff static final String REPLACE_INSTALLER = "{INSTALLER}"; - static final String INSTALLER_URL = "http://files.minecraftforge.net/maven/net/minecraftforge/installer/" + REPLACE_INSTALLER + "/installer-" + REPLACE_INSTALLER + "-shrunk.jar"; + static final String INSTALLER_URL = "https://files.minecraftforge.net/maven/net/minecraftforge/installer/" + REPLACE_INSTALLER + "/installer-" + REPLACE_INSTALLER + "-shrunk.jar"; // new project defaults static final String DEFAULT_PATCHES_DIR = "patches"; diff --git a/src/main/java/net/minecraftforge/gradle/patcher/PatcherExtension.java b/src/main/java/net/minecraftforge/gradle/patcher/PatcherExtension.java index 64818ad10..b0ea3ab30 100644 --- a/src/main/java/net/minecraftforge/gradle/patcher/PatcherExtension.java +++ b/src/main/java/net/minecraftforge/gradle/patcher/PatcherExtension.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/patcher/PatcherPlugin.java b/src/main/java/net/minecraftforge/gradle/patcher/PatcherPlugin.java index a87107d75..0bbfed3ed 100644 --- a/src/main/java/net/minecraftforge/gradle/patcher/PatcherPlugin.java +++ b/src/main/java/net/minecraftforge/gradle/patcher/PatcherPlugin.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/patcher/PatcherProject.java b/src/main/java/net/minecraftforge/gradle/patcher/PatcherProject.java index dd8dbc4fe..5ccde3280 100644 --- a/src/main/java/net/minecraftforge/gradle/patcher/PatcherProject.java +++ b/src/main/java/net/minecraftforge/gradle/patcher/PatcherProject.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/patcher/PatcherProjectFactory.java b/src/main/java/net/minecraftforge/gradle/patcher/PatcherProjectFactory.java index d93baf9d6..f30f74b63 100644 --- a/src/main/java/net/minecraftforge/gradle/patcher/PatcherProjectFactory.java +++ b/src/main/java/net/minecraftforge/gradle/patcher/PatcherProjectFactory.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/patcher/TaskCompressLZMA.java b/src/main/java/net/minecraftforge/gradle/patcher/TaskCompressLZMA.java index 5dd450c19..5e6177566 100644 --- a/src/main/java/net/minecraftforge/gradle/patcher/TaskCompressLZMA.java +++ b/src/main/java/net/minecraftforge/gradle/patcher/TaskCompressLZMA.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/patcher/TaskExtractExcModifiers.java b/src/main/java/net/minecraftforge/gradle/patcher/TaskExtractExcModifiers.java index eeb441360..211f1c26e 100644 --- a/src/main/java/net/minecraftforge/gradle/patcher/TaskExtractExcModifiers.java +++ b/src/main/java/net/minecraftforge/gradle/patcher/TaskExtractExcModifiers.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/patcher/TaskExtractNew.java b/src/main/java/net/minecraftforge/gradle/patcher/TaskExtractNew.java index a9bc5f2ad..0542cb611 100644 --- a/src/main/java/net/minecraftforge/gradle/patcher/TaskExtractNew.java +++ b/src/main/java/net/minecraftforge/gradle/patcher/TaskExtractNew.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/patcher/TaskGenBinPatches.java b/src/main/java/net/minecraftforge/gradle/patcher/TaskGenBinPatches.java index 0c9f28df2..6093d7e23 100644 --- a/src/main/java/net/minecraftforge/gradle/patcher/TaskGenBinPatches.java +++ b/src/main/java/net/minecraftforge/gradle/patcher/TaskGenBinPatches.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/patcher/TaskGenIdeaRun.java b/src/main/java/net/minecraftforge/gradle/patcher/TaskGenIdeaRun.java index f4a6d4683..d53b48833 100644 --- a/src/main/java/net/minecraftforge/gradle/patcher/TaskGenIdeaRun.java +++ b/src/main/java/net/minecraftforge/gradle/patcher/TaskGenIdeaRun.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/patcher/TaskGenPatches.java b/src/main/java/net/minecraftforge/gradle/patcher/TaskGenPatches.java index e77e1838e..46aba1e33 100644 --- a/src/main/java/net/minecraftforge/gradle/patcher/TaskGenPatches.java +++ b/src/main/java/net/minecraftforge/gradle/patcher/TaskGenPatches.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/patcher/TaskGenSubprojects.java b/src/main/java/net/minecraftforge/gradle/patcher/TaskGenSubprojects.java index cf16e473a..89c076d27 100644 --- a/src/main/java/net/minecraftforge/gradle/patcher/TaskGenSubprojects.java +++ b/src/main/java/net/minecraftforge/gradle/patcher/TaskGenSubprojects.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/patcher/TaskMergeFiles.java b/src/main/java/net/minecraftforge/gradle/patcher/TaskMergeFiles.java index 814601fda..69a42cb16 100644 --- a/src/main/java/net/minecraftforge/gradle/patcher/TaskMergeFiles.java +++ b/src/main/java/net/minecraftforge/gradle/patcher/TaskMergeFiles.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/patcher/TaskProcessJson.java b/src/main/java/net/minecraftforge/gradle/patcher/TaskProcessJson.java index 0ddc2eef1..b5950158d 100644 --- a/src/main/java/net/minecraftforge/gradle/patcher/TaskProcessJson.java +++ b/src/main/java/net/minecraftforge/gradle/patcher/TaskProcessJson.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/patcher/TaskReobfuscate.java b/src/main/java/net/minecraftforge/gradle/patcher/TaskReobfuscate.java index c379565ba..49df1c38b 100644 --- a/src/main/java/net/minecraftforge/gradle/patcher/TaskReobfuscate.java +++ b/src/main/java/net/minecraftforge/gradle/patcher/TaskReobfuscate.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/patcher/TaskSubprojectCall.java b/src/main/java/net/minecraftforge/gradle/patcher/TaskSubprojectCall.java index a35b39614..1accb4a46 100644 --- a/src/main/java/net/minecraftforge/gradle/patcher/TaskSubprojectCall.java +++ b/src/main/java/net/minecraftforge/gradle/patcher/TaskSubprojectCall.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/AbstractEditJarTask.java b/src/main/java/net/minecraftforge/gradle/tasks/AbstractEditJarTask.java index 6cb6d0ff3..2af6d6cf8 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/AbstractEditJarTask.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/AbstractEditJarTask.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/AccessTransformJar.java b/src/main/java/net/minecraftforge/gradle/tasks/AccessTransformJar.java index 25c2ef3d5..c316845f9 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/AccessTransformJar.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/AccessTransformJar.java @@ -37,16 +37,22 @@ public void doTask() throws IOException { AccessTransformationSet transformations = new AccessTransformationSet(); for (File file : getAts()) { if (file.getName().endsWith(".jar")) { - JarFile jar = new JarFile(file); - ZipEntry entry = jar.getEntry("access_transformations.at"); - if (entry != null) { - try (Scanner scanner = new Scanner(jar.getInputStream(entry))) { - while (scanner.hasNextLine()) { - transformations.addMinimumAccessLevel(scanner.nextLine()); + try (JarFile jar = new JarFile(file)) { + ZipEntry entry = jar.getEntry("access_transformations.at"); + + if (entry != null) { + getLogger().info("Found transformer in " + file); + + try (Scanner scanner = new Scanner(jar.getInputStream(entry))) { + while (scanner.hasNextLine()) { + transformations.addMinimumAccessLevel(scanner.nextLine()); + } } } - } + } } else { + getLogger().info("Found transformer in " + file); + try (Scanner scanner = new Scanner(file)) { while (scanner.hasNextLine()) { transformations.addMinimumAccessLevel(scanner.nextLine()); @@ -82,6 +88,9 @@ public void doTask() throws IOException { out.closeEntry(); } } + + //Make sure there aren't any more transformations that failed to find their classes + transformations.ensureClear(); } private static byte[] readStream(InputStream inputStream) throws IOException { diff --git a/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java b/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java index faa0a1f33..1164a0d77 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/CreateStartTask.java b/src/main/java/net/minecraftforge/gradle/tasks/CreateStartTask.java index b54854a9e..d5845084f 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/CreateStartTask.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/CreateStartTask.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/CrowdinDownload.java b/src/main/java/net/minecraftforge/gradle/tasks/CrowdinDownload.java index 439cd5e35..4116d9442 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/CrowdinDownload.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/CrowdinDownload.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/DeobfuscateJar.java b/src/main/java/net/minecraftforge/gradle/tasks/DeobfuscateJar.java index 2f6bdde1c..1f87c8bf4 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/DeobfuscateJar.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/DeobfuscateJar.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/Download.java b/src/main/java/net/minecraftforge/gradle/tasks/Download.java index 03ee4b4bf..8080c1504 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/Download.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/Download.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/DownloadAssetsTask.java b/src/main/java/net/minecraftforge/gradle/tasks/DownloadAssetsTask.java index d99ae7c25..1bdc35cef 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/DownloadAssetsTask.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/DownloadAssetsTask.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/EtagDownloadTask.java b/src/main/java/net/minecraftforge/gradle/tasks/EtagDownloadTask.java index bcb4825ec..0317bb84a 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/EtagDownloadTask.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/EtagDownloadTask.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/ExtractConfigTask.java b/src/main/java/net/minecraftforge/gradle/tasks/ExtractConfigTask.java index 71badd526..fa21d776d 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/ExtractConfigTask.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/ExtractConfigTask.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/ExtractS2SRangeTask.java b/src/main/java/net/minecraftforge/gradle/tasks/ExtractS2SRangeTask.java index c6db43134..6025908aa 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/ExtractS2SRangeTask.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/ExtractS2SRangeTask.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/ExtractTask.java b/src/main/java/net/minecraftforge/gradle/tasks/ExtractTask.java index 5ce02c7e7..ea000ad46 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/ExtractTask.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/ExtractTask.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/GenEclipseRunTask.java b/src/main/java/net/minecraftforge/gradle/tasks/GenEclipseRunTask.java index 8f966efd2..01f2bd321 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/GenEclipseRunTask.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/GenEclipseRunTask.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/GenSrgs.java b/src/main/java/net/minecraftforge/gradle/tasks/GenSrgs.java index 8fac112de..ecc9b4c7b 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/GenSrgs.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/GenSrgs.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/JenkinsChangelog.java b/src/main/java/net/minecraftforge/gradle/tasks/JenkinsChangelog.java index b876863d2..db8440698 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/JenkinsChangelog.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/JenkinsChangelog.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/MergeJars.java b/src/main/java/net/minecraftforge/gradle/tasks/MergeJars.java index 7dba23b45..daf0fb9a7 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/MergeJars.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/MergeJars.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/ObtainFernFlowerTask.java b/src/main/java/net/minecraftforge/gradle/tasks/ObtainFernFlowerTask.java index 49e215c46..cafa4ea2a 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/ObtainFernFlowerTask.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/ObtainFernFlowerTask.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/PatchSourcesTask.java b/src/main/java/net/minecraftforge/gradle/tasks/PatchSourcesTask.java index d7e4cae20..9509d852e 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/PatchSourcesTask.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/PatchSourcesTask.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/PostDecompileTask.java b/src/main/java/net/minecraftforge/gradle/tasks/PostDecompileTask.java index 876773f79..5dabc13dc 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/PostDecompileTask.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/PostDecompileTask.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/RemapSources.java b/src/main/java/net/minecraftforge/gradle/tasks/RemapSources.java index 740834c92..884bd761e 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/RemapSources.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/RemapSources.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/SignJar.java b/src/main/java/net/minecraftforge/gradle/tasks/SignJar.java index 258ad584f..82a51e330 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/SignJar.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/SignJar.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/SplitJarTask.java b/src/main/java/net/minecraftforge/gradle/tasks/SplitJarTask.java index 37999a6e4..cc08e8015 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/SplitJarTask.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/SplitJarTask.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/TaskExtractAnnotationsText.java b/src/main/java/net/minecraftforge/gradle/tasks/TaskExtractAnnotationsText.java index 357b1a1f9..ee4d5e31b 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/TaskExtractAnnotationsText.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/TaskExtractAnnotationsText.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/fernflower/AdvancedJadRenamer.java b/src/main/java/net/minecraftforge/gradle/tasks/fernflower/AdvancedJadRenamer.java index 5f33ce09f..c518d2552 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/fernflower/AdvancedJadRenamer.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/fernflower/AdvancedJadRenamer.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/fernflower/AdvancedJadRenamerFactory.java b/src/main/java/net/minecraftforge/gradle/tasks/fernflower/AdvancedJadRenamerFactory.java index 04d3e500a..b2b85e091 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/fernflower/AdvancedJadRenamerFactory.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/fernflower/AdvancedJadRenamerFactory.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/fernflower/ApplyFernFlowerTask.java b/src/main/java/net/minecraftforge/gradle/tasks/fernflower/ApplyFernFlowerTask.java index bbb8365d1..ff0f5e7c2 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/fernflower/ApplyFernFlowerTask.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/fernflower/ApplyFernFlowerTask.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/fernflower/ArtifactSaver.java b/src/main/java/net/minecraftforge/gradle/tasks/fernflower/ArtifactSaver.java index df3538b6e..c5a02d076 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/fernflower/ArtifactSaver.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/fernflower/ArtifactSaver.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/fernflower/ByteCodeProvider.java b/src/main/java/net/minecraftforge/gradle/tasks/fernflower/ByteCodeProvider.java index 7e61e0b4c..9720bb488 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/fernflower/ByteCodeProvider.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/fernflower/ByteCodeProvider.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/fernflower/FernFlowerInvoker.java b/src/main/java/net/minecraftforge/gradle/tasks/fernflower/FernFlowerInvoker.java index 626bad8c2..ae9e1f946 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/fernflower/FernFlowerInvoker.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/fernflower/FernFlowerInvoker.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/tasks/fernflower/FernFlowerSettings.java b/src/main/java/net/minecraftforge/gradle/tasks/fernflower/FernFlowerSettings.java index 9dd039356..ee5b38900 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/fernflower/FernFlowerSettings.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/fernflower/FernFlowerSettings.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/IReobfuscator.java b/src/main/java/net/minecraftforge/gradle/user/IReobfuscator.java index 49b16388a..a0adf3495 100644 --- a/src/main/java/net/minecraftforge/gradle/user/IReobfuscator.java +++ b/src/main/java/net/minecraftforge/gradle/user/IReobfuscator.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/ReobfMappingType.java b/src/main/java/net/minecraftforge/gradle/user/ReobfMappingType.java index 1dd330404..15e492744 100644 --- a/src/main/java/net/minecraftforge/gradle/user/ReobfMappingType.java +++ b/src/main/java/net/minecraftforge/gradle/user/ReobfMappingType.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/ReobfTaskFactory.java b/src/main/java/net/minecraftforge/gradle/user/ReobfTaskFactory.java index f63990687..c238ff472 100644 --- a/src/main/java/net/minecraftforge/gradle/user/ReobfTaskFactory.java +++ b/src/main/java/net/minecraftforge/gradle/user/ReobfTaskFactory.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/ReobfTransformer.java b/src/main/java/net/minecraftforge/gradle/user/ReobfTransformer.java index 9ab31e4f4..b234a0e17 100644 --- a/src/main/java/net/minecraftforge/gradle/user/ReobfTransformer.java +++ b/src/main/java/net/minecraftforge/gradle/user/ReobfTransformer.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/TaskDepDummy.java b/src/main/java/net/minecraftforge/gradle/user/TaskDepDummy.java index 177121dfa..69f8b4d1b 100644 --- a/src/main/java/net/minecraftforge/gradle/user/TaskDepDummy.java +++ b/src/main/java/net/minecraftforge/gradle/user/TaskDepDummy.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/TaskExtractAnnotations.java b/src/main/java/net/minecraftforge/gradle/user/TaskExtractAnnotations.java index bee670776..4c8bb5373 100644 --- a/src/main/java/net/minecraftforge/gradle/user/TaskExtractAnnotations.java +++ b/src/main/java/net/minecraftforge/gradle/user/TaskExtractAnnotations.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/TaskExtractDepAts.java b/src/main/java/net/minecraftforge/gradle/user/TaskExtractDepAts.java index 63aa4652d..9855ef94f 100644 --- a/src/main/java/net/minecraftforge/gradle/user/TaskExtractDepAts.java +++ b/src/main/java/net/minecraftforge/gradle/user/TaskExtractDepAts.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/TaskRecompileMc.java b/src/main/java/net/minecraftforge/gradle/user/TaskRecompileMc.java index 1397b80e5..dd53534f7 100644 --- a/src/main/java/net/minecraftforge/gradle/user/TaskRecompileMc.java +++ b/src/main/java/net/minecraftforge/gradle/user/TaskRecompileMc.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/TaskSingleDeobfBin.java b/src/main/java/net/minecraftforge/gradle/user/TaskSingleDeobfBin.java index ade943278..e0952afca 100644 --- a/src/main/java/net/minecraftforge/gradle/user/TaskSingleDeobfBin.java +++ b/src/main/java/net/minecraftforge/gradle/user/TaskSingleDeobfBin.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/TaskSingleReobf.java b/src/main/java/net/minecraftforge/gradle/user/TaskSingleReobf.java index ca5182b84..ee24ba491 100644 --- a/src/main/java/net/minecraftforge/gradle/user/TaskSingleReobf.java +++ b/src/main/java/net/minecraftforge/gradle/user/TaskSingleReobf.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/TaskSourceCopy.java b/src/main/java/net/minecraftforge/gradle/user/TaskSourceCopy.java index 6a317aa28..59456f997 100644 --- a/src/main/java/net/minecraftforge/gradle/user/TaskSourceCopy.java +++ b/src/main/java/net/minecraftforge/gradle/user/TaskSourceCopy.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/UserBaseExtension.java b/src/main/java/net/minecraftforge/gradle/user/UserBaseExtension.java index aaa0a73fd..16ad15864 100644 --- a/src/main/java/net/minecraftforge/gradle/user/UserBaseExtension.java +++ b/src/main/java/net/minecraftforge/gradle/user/UserBaseExtension.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java b/src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java index 0820fad9b..c3d2fa2ba 100644 --- a/src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java +++ b/src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -210,6 +210,7 @@ public void execute(TaskSourceCopy t) ConfigurableFileCollection col = project.files(getStartDir()); col.builtBy(TASK_MAKE_START); project.getDependencies().add(CONFIG_START, col); + project.getDependencies().add(CONFIG_START, "net.minecraft:launchwrapper:1.12"); } // TODO: do some GradleStart stuff based on the MC version? diff --git a/src/main/java/net/minecraftforge/gradle/user/UserConstants.java b/src/main/java/net/minecraftforge/gradle/user/UserConstants.java index abb3d5477..c848c5268 100644 --- a/src/main/java/net/minecraftforge/gradle/user/UserConstants.java +++ b/src/main/java/net/minecraftforge/gradle/user/UserConstants.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/UserVanillaBasePlugin.java b/src/main/java/net/minecraftforge/gradle/user/UserVanillaBasePlugin.java index e8fcb189c..d033e9354 100644 --- a/src/main/java/net/minecraftforge/gradle/user/UserVanillaBasePlugin.java +++ b/src/main/java/net/minecraftforge/gradle/user/UserVanillaBasePlugin.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/liteloader/LiteModJson.java b/src/main/java/net/minecraftforge/gradle/user/liteloader/LiteModJson.java index bc68e53d4..d103999c0 100644 --- a/src/main/java/net/minecraftforge/gradle/user/liteloader/LiteModJson.java +++ b/src/main/java/net/minecraftforge/gradle/user/liteloader/LiteModJson.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/liteloader/LiteModTask.java b/src/main/java/net/minecraftforge/gradle/user/liteloader/LiteModTask.java index e1b410a8f..088d555de 100644 --- a/src/main/java/net/minecraftforge/gradle/user/liteloader/LiteModTask.java +++ b/src/main/java/net/minecraftforge/gradle/user/liteloader/LiteModTask.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/liteloader/LiteloaderExtension.java b/src/main/java/net/minecraftforge/gradle/user/liteloader/LiteloaderExtension.java index c7fdbc0e3..1317735d8 100644 --- a/src/main/java/net/minecraftforge/gradle/user/liteloader/LiteloaderExtension.java +++ b/src/main/java/net/minecraftforge/gradle/user/liteloader/LiteloaderExtension.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/liteloader/LiteloaderPlugin.java b/src/main/java/net/minecraftforge/gradle/user/liteloader/LiteloaderPlugin.java index 872028234..afcb44670 100644 --- a/src/main/java/net/minecraftforge/gradle/user/liteloader/LiteloaderPlugin.java +++ b/src/main/java/net/minecraftforge/gradle/user/liteloader/LiteloaderPlugin.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/patcherUser/PatcherUserBasePlugin.java b/src/main/java/net/minecraftforge/gradle/user/patcherUser/PatcherUserBasePlugin.java index 083935123..34a9cc1ec 100644 --- a/src/main/java/net/minecraftforge/gradle/user/patcherUser/PatcherUserBasePlugin.java +++ b/src/main/java/net/minecraftforge/gradle/user/patcherUser/PatcherUserBasePlugin.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/patcherUser/PatcherUserConstants.java b/src/main/java/net/minecraftforge/gradle/user/patcherUser/PatcherUserConstants.java index c0ab4ca00..4c8b58dad 100644 --- a/src/main/java/net/minecraftforge/gradle/user/patcherUser/PatcherUserConstants.java +++ b/src/main/java/net/minecraftforge/gradle/user/patcherUser/PatcherUserConstants.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/patcherUser/TaskApplyBinPatches.java b/src/main/java/net/minecraftforge/gradle/user/patcherUser/TaskApplyBinPatches.java index f429ba833..219a7c517 100644 --- a/src/main/java/net/minecraftforge/gradle/user/patcherUser/TaskApplyBinPatches.java +++ b/src/main/java/net/minecraftforge/gradle/user/patcherUser/TaskApplyBinPatches.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/ForgeExtension.java b/src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/ForgeExtension.java index 62bc0d374..6d64e6223 100644 --- a/src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/ForgeExtension.java +++ b/src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/ForgeExtension.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -31,12 +31,9 @@ import net.minecraftforge.gradle.user.UserBaseExtension; import net.minecraftforge.gradle.user.UserBasePlugin; import net.minecraftforge.gradle.util.GradleConfigurationException; -import net.minecraftforge.gradle.util.json.forgeversion.ForgeBuild; -import net.minecraftforge.gradle.util.json.forgeversion.ForgeVersion; public class ForgeExtension extends UserBaseExtension { - protected ForgeVersion forgeJson; private String forgeVersion; private String coreMod = null; @@ -75,7 +72,7 @@ public void setForgeVersion(String forgeVersion) * * @param inVersion The version * - * @see http://files.minecraftforge.net + * @see https://files.minecraftforge.net */ @Override public void setVersion(String inVersion) @@ -92,7 +89,7 @@ public void setVersion(String inVersion) // ---------------------------------------- // Code to check the forge version and stuff - // ---------------------------------------- + // ---------------------------------------- private static final String JUST_MC = "(\\d+\\.\\d+(?:\\.\\d+)?[_pre\\d]*)"; private static final String JUST_API = "((?:\\d+\\.){3}(\\d+))((?:-[\\w\\.]+)?)"; @@ -103,183 +100,63 @@ public void setVersion(String inVersion) private void checkAndSetVersion(String str) { str = str.trim(); - - // build number - if (isAllNums(str)) - { - boolean worked = getFromBuildNumber(str); - if (worked) - return; - } - - // promotions - if (this.forgeJson != null && this.forgeJson.promos != null && this.forgeJson.promos.containsKey(str)) - { - boolean worked = getFromBuildNumber(this.forgeJson.promos.get(str)); - LOGGER.lifecycle("Selected version " + this.forgeVersion); - if (worked) - return; - } - - // matches just an API version - Matcher matcher = API.matcher(str); - if (matcher.matches()) - { - String branch = Strings.emptyToNull(matcher.group(3)); - String forgeVersion = matcher.group(1); - - try - { - ForgeBuild build = this.forgeJson.number.get(Integer.valueOf(matcher.group(2))); - - if (build == null) - { - throw new GradleConfigurationException("No such version exists!"); - } - - boolean branchMatches = false; - if (branch == null) - branchMatches = Strings.isNullOrEmpty(build.branch); - else - branchMatches = branch.substring(1).equals(build.branch); - - String outBranch = build.branch; - if (outBranch == null) - outBranch = ""; - else - outBranch = "-" + build.branch; - - if (!build.version.equals(forgeVersion) || !branchMatches) - { - throw new GradleConfigurationException(str + " is an invalid version! did you mean '" + build.version + outBranch + "' ?"); - } - - version = build.mcversion.replace("_", "-"); - this.forgeVersion = build.version; - if (!Strings.isNullOrEmpty(build.branch) && !"null".equals(build.branch)) - this.forgeVersion += outBranch; - - } - catch (GradleConfigurationException e) - { - throw e; - } - catch (Exception e)// everythng but the gradle exception - { - System.out.println("Error occurred parsing version!"); - - version = "1.8";// just gonna guess.. since we dont know.. - this.forgeVersion = forgeVersion; - if (!Strings.isNullOrEmpty(branch) && !"null".equals(branch)) - this.forgeVersion += branch; - } - - return; - } - - // matches standard form. - matcher = STANDARD.matcher(str); - if (matcher.matches()) - { - String branch = matcher.group(4); - String mcversion = matcher.group(1); - - String forgeVersion = matcher.group(2); - String buildNumber = matcher.group(3); - - try - { - if ("0".equals(buildNumber)) - { - LOGGER.lifecycle("Assuming custom forge version!"); - version = mcversion; - this.forgeVersion = forgeVersion + branch; - return; - } - - ForgeBuild build = this.forgeJson.number.get(Integer.parseInt(buildNumber)); - - if (build == null) - { - throw new GradleConfigurationException("No such version exists!"); - } - - boolean branchMatches = false; - if (Strings.isNullOrEmpty(branch)) - branchMatches = Strings.isNullOrEmpty(build.branch); - else - branchMatches = branch.substring(1).equals(build.branch); - - boolean mcMatches = build.mcversion.equals(mcversion); - - String outBranch = build.branch; - if (outBranch == null) - outBranch = ""; - else - outBranch = "-" + build.branch; - - if (!build.version.equals(forgeVersion) || !branchMatches || !mcMatches) - { - throw new GradleConfigurationException(str + " is an invalid version! did you mean '" + build.mcversion + "-" + build.version + outBranch + "' ?"); - } - - version = build.mcversion.replace("_", "-"); - this.forgeVersion = build.version; - if (!Strings.isNullOrEmpty(build.branch) && !"null".equals(build.branch)) - this.forgeVersion += outBranch; - } - catch (GradleConfigurationException e) - { - throw e; - } - catch (Exception e)// everythng but the gradle exception - { - System.out.println("Error occurred parsing version!"); - - version = mcversion; - this.forgeVersion = forgeVersion; - if (!Strings.isNullOrEmpty(branch) && !"null".equals(branch)) - this.forgeVersion += branch; - } - - return; - } - - throw new GradleConfigurationException("Invalid version notation, or version doesnt exist! The following are valid notations. Buildnumber, version, version-branch, mcversion-version-branch, and pomotion"); + int idx = str.indexOf('-'); + if (idx == -1) + throw new IllegalArgumentException("You must specify the full forge version, including MC version in your build.gradle. Example: 1.12.2-14.23.5.2811"); + this.version = str.substring(0, idx); //MC Version + this.forgeVersion = str.substring(idx + 1); + + /* + * Old FG used to use a horribly outdated MASSIVE json file for trying to be 'smart' when processing the version information. + * It tried to allow for many 'shortcuts' when specifying the Forge version. + * All of this are horribly and stupid, and should of never existed in the first place. + * So I'm gutting them. + * + * But will document them here to the best of my understanding, so that if people need them we can re-implement them in less horribly hacky ways. + * + * JUST the build number: + * Prior to 1.13, Forge used a unique build number to identify all versions. So in theory you could pick an exact build with just the build number. + * Example: + * Input: 2815 + * Output: 1.12.2-14.23.5.2815 + * Solution: + * Download maven-metadata.xml, loop through all versions doing: + * key = ver.split('-')[0].rsplit('.', 1)[1] + * if (!map.containsKey(key)) //This is important because metadata is ordered oldest to newest, and new versions could duplicate the build number + * map.put(key, ver) + * + * + * Promotion Name: + * We publish 'promoted' builds of Forge. Typically 'latest' and 'recommended'. Simple enough way to make a auto updating version. + * Example: + * Input: 1.8-recommended + * Output: 1.8-11.14.4.1563 + * Solution: + * Again, Abrar downloaded a 2MB MASSIVE json file, when a slim json would do. + * https://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json + * + * + * API-Wildcards: + * Abrar tried to emulate dynamic versions which would be introduced into gradle far afterwords. + * Example: + * Input: 14.23.5.1 + * Output: 1.12.2-14.23.5.2811 + * Solution: + * Again, can be solved using maven-metadata.xml, use Apache's ArtifactVersion library to parse out a easy comparable version for everything in the metadata, and the version the user input. + * Set MinVersion = ArtifactVersion(input) + * prefix = input.substring(0, input.lastIndexOf('.')) + * MaxVersion = ArtifactVersion(prefix.rsplit('.', 1)[0] + '.' + (int(prefix.rsplit('.', 1)[1]) + 1)) + * + * Then find the max version that fits: MinVersion <= Version < MaxVersion + * + * Full Version: + * Example: + * Input: 1.12.2-14.23.5.2811 + * Output: 1.12.2-14.23.5.2811 + * + * This was just used to verify the version existed. This can be done via maven-metadata.xml + */ } - - private boolean isAllNums(String in) - { - for (char c : in.toCharArray()) - { - if (!Character.isDigit(c)) - return false; - } - - return true; - } - - private boolean getFromBuildNumber(String str) - { - return getFromBuildNumber(Integer.valueOf(str)); - } - - private boolean getFromBuildNumber(Integer num) - { - ForgeBuild build = this.forgeJson.number.get(num); - if (build != null) - { - version = build.mcversion.replace("_", "-"); - this.forgeVersion = build.version; - if (!Strings.isNullOrEmpty(build.branch) && !"null".equals(build.branch)) - this.forgeVersion += "-" + build.branch; - - return true; - } - else - return false; - } - /** * Get the coremod class for the mod * diff --git a/src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/ForgePlugin.java b/src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/ForgePlugin.java index 4fcdfbc0d..a5af29d5c 100644 --- a/src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/ForgePlugin.java +++ b/src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/ForgePlugin.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -31,8 +31,6 @@ import org.gradle.api.tasks.bundling.Jar; import com.google.common.base.Strings; -import com.google.gson.JsonSyntaxException; - import net.minecraftforge.gradle.common.Constants; import net.minecraftforge.gradle.tasks.CreateStartTask; import net.minecraftforge.gradle.user.ReobfMappingType; @@ -41,10 +39,8 @@ import net.minecraftforge.gradle.user.UserConstants; import net.minecraftforge.gradle.user.patcherUser.PatcherUserBasePlugin; import net.minecraftforge.gradle.util.GradleConfigurationException; -import net.minecraftforge.gradle.util.json.JsonFactory; import net.minecraftforge.gradle.util.json.fgversion.FGVersion; import net.minecraftforge.gradle.util.json.fgversion.FGVersionWrapper; -import net.minecraftforge.gradle.util.json.forgeversion.ForgeVersion; public class ForgePlugin extends PatcherUserBasePlugin { @@ -52,9 +48,6 @@ public class ForgePlugin extends PatcherUserBasePlugin @Override protected void applyUserPlugin() { - // set the version info into the extension object - setForgeVersionJson(); - super.applyUserPlugin(); // setup reobf @@ -62,7 +55,7 @@ protected void applyUserPlugin() TaskSingleReobf reobf = (TaskSingleReobf) project.getTasks().getByName(TASK_REOBF); reobf.addPreTransformer(new McVersionTransformer(delayedString(REPLACE_MC_VERSION))); } - + // add coremod loading hack to gradle start { CreateStartTask makeStart = ((CreateStartTask)project.getTasks().getByName(UserConstants.TASK_MAKE_START)); @@ -72,7 +65,7 @@ protected void applyUserPlugin() } makeStart.addExtraLine("net.minecraftforge.gradle.GradleForgeHacks.searchCoremods(this);"); } - + // configure eclipse task to do extra stuff. project.getTasks().getByName("eclipse").doLast(new Action() { @@ -140,7 +133,7 @@ protected void afterEvaluate() // add manifest things { Jar jarTask = (Jar) project.getTasks().getByName("jar"); - + if (!Strings.isNullOrEmpty(ext.getCoreMod())) { jarTask.getManifest().getAttributes().put("FMLCorePlugin", ext.getCoreMod()); @@ -148,43 +141,23 @@ protected void afterEvaluate() } } - private void setForgeVersionJson() - { - File jsonCache = cacheFile("ForgeVersion.json"); - File etagFile = new File(jsonCache.getAbsolutePath() + ".etag"); - String url = Constants.URL_FORGE_MAVEN + "/net/minecraftforge/forge/json"; - - try - { - getExtension().forgeJson = JsonFactory.GSON.fromJson(getWithEtag(url, jsonCache, etagFile), ForgeVersion.class); - } - catch(NullPointerException e) - { - getExtension().forgeJson = null; - } - catch(JsonSyntaxException e) - { - getExtension().forgeJson = null; - } - } - @Override protected void onVersionCheck(FGVersion version, FGVersionWrapper wrapper) { String forgeVersion = getExtension().getForgeVersion(); - + // isolate build number int index = forgeVersion.indexOf('-'); if (index >= 0) forgeVersion = forgeVersion.substring(0, index); index = forgeVersion.lastIndexOf('.'); forgeVersion.substring(index + 1); - + int buildNum = Integer.parseInt(forgeVersion); - + int minBuild = version.ext.get("forgeMinBuild").getAsInt(); int maxBuild = version.ext.get("forgeMaxBuild").getAsInt(); - + if (buildNum < minBuild) throw new GradleConfigurationException("This version of ForgeGradle ("+getExtension().forgeGradleVersion+") does not support forge builds less than #"+minBuild); else if (buildNum > maxBuild) @@ -256,7 +229,7 @@ protected List getServerRunArgs(ForgeExtension ext) { return ext.getResolvedServerRunArgs(); } - + @Override protected List getClientJvmArgs(ForgeExtension ext) { diff --git a/src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/McVersionTransformer.java b/src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/McVersionTransformer.java index b66c6712e..8d83aaf7d 100644 --- a/src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/McVersionTransformer.java +++ b/src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/McVersionTransformer.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/patcherUser/generic/GenericPatcherUserExtension.java b/src/main/java/net/minecraftforge/gradle/user/patcherUser/generic/GenericPatcherUserExtension.java index 156a0f72e..7ef8f263b 100644 --- a/src/main/java/net/minecraftforge/gradle/user/patcherUser/generic/GenericPatcherUserExtension.java +++ b/src/main/java/net/minecraftforge/gradle/user/patcherUser/generic/GenericPatcherUserExtension.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/patcherUser/generic/GenericPatcherUserPlugin.java b/src/main/java/net/minecraftforge/gradle/user/patcherUser/generic/GenericPatcherUserPlugin.java index 384de097f..9e05d6a12 100644 --- a/src/main/java/net/minecraftforge/gradle/user/patcherUser/generic/GenericPatcherUserPlugin.java +++ b/src/main/java/net/minecraftforge/gradle/user/patcherUser/generic/GenericPatcherUserPlugin.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/tweakers/ClientTweaker.java b/src/main/java/net/minecraftforge/gradle/user/tweakers/ClientTweaker.java index 7fbe4af61..4c43271a4 100644 --- a/src/main/java/net/minecraftforge/gradle/user/tweakers/ClientTweaker.java +++ b/src/main/java/net/minecraftforge/gradle/user/tweakers/ClientTweaker.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/tweakers/ServerTweaker.java b/src/main/java/net/minecraftforge/gradle/user/tweakers/ServerTweaker.java index 589087321..43e6a6ed7 100644 --- a/src/main/java/net/minecraftforge/gradle/user/tweakers/ServerTweaker.java +++ b/src/main/java/net/minecraftforge/gradle/user/tweakers/ServerTweaker.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/tweakers/TweakerExtension.java b/src/main/java/net/minecraftforge/gradle/user/tweakers/TweakerExtension.java index e2c759687..4ba02478e 100644 --- a/src/main/java/net/minecraftforge/gradle/user/tweakers/TweakerExtension.java +++ b/src/main/java/net/minecraftforge/gradle/user/tweakers/TweakerExtension.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/user/tweakers/TweakerPlugin.java b/src/main/java/net/minecraftforge/gradle/user/tweakers/TweakerPlugin.java index ed66928cd..bf9d6b3e9 100644 --- a/src/main/java/net/minecraftforge/gradle/user/tweakers/TweakerPlugin.java +++ b/src/main/java/net/minecraftforge/gradle/user/tweakers/TweakerPlugin.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/AnnotationUtils.java b/src/main/java/net/minecraftforge/gradle/util/AnnotationUtils.java index e7a4c2bfd..a183ec877 100644 --- a/src/main/java/net/minecraftforge/gradle/util/AnnotationUtils.java +++ b/src/main/java/net/minecraftforge/gradle/util/AnnotationUtils.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/CopyInto.java b/src/main/java/net/minecraftforge/gradle/util/CopyInto.java index 28456e874..df22a915b 100644 --- a/src/main/java/net/minecraftforge/gradle/util/CopyInto.java +++ b/src/main/java/net/minecraftforge/gradle/util/CopyInto.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/ExtractionVisitor.java b/src/main/java/net/minecraftforge/gradle/util/ExtractionVisitor.java index a2a8b26f9..4d2c57bc6 100644 --- a/src/main/java/net/minecraftforge/gradle/util/ExtractionVisitor.java +++ b/src/main/java/net/minecraftforge/gradle/util/ExtractionVisitor.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/FileLogListenner.java b/src/main/java/net/minecraftforge/gradle/util/FileLogListenner.java index 6bdf55a6c..5155683da 100644 --- a/src/main/java/net/minecraftforge/gradle/util/FileLogListenner.java +++ b/src/main/java/net/minecraftforge/gradle/util/FileLogListenner.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/GradleConfigurationException.java b/src/main/java/net/minecraftforge/gradle/util/GradleConfigurationException.java index 88fae32cf..f4c2a72a1 100644 --- a/src/main/java/net/minecraftforge/gradle/util/GradleConfigurationException.java +++ b/src/main/java/net/minecraftforge/gradle/util/GradleConfigurationException.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/MultiDirSupplier.java b/src/main/java/net/minecraftforge/gradle/util/MultiDirSupplier.java index 81d3f0b3d..981bf52eb 100644 --- a/src/main/java/net/minecraftforge/gradle/util/MultiDirSupplier.java +++ b/src/main/java/net/minecraftforge/gradle/util/MultiDirSupplier.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/PredefInputSupplier.java b/src/main/java/net/minecraftforge/gradle/util/PredefInputSupplier.java index e4553f9c0..5fed82b75 100644 --- a/src/main/java/net/minecraftforge/gradle/util/PredefInputSupplier.java +++ b/src/main/java/net/minecraftforge/gradle/util/PredefInputSupplier.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/SequencedInputSupplier.java b/src/main/java/net/minecraftforge/gradle/util/SequencedInputSupplier.java index 35eaca136..fe5838529 100644 --- a/src/main/java/net/minecraftforge/gradle/util/SequencedInputSupplier.java +++ b/src/main/java/net/minecraftforge/gradle/util/SequencedInputSupplier.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/SourceDirSetSupplier.java b/src/main/java/net/minecraftforge/gradle/util/SourceDirSetSupplier.java index fffdd25b6..c9725fb30 100644 --- a/src/main/java/net/minecraftforge/gradle/util/SourceDirSetSupplier.java +++ b/src/main/java/net/minecraftforge/gradle/util/SourceDirSetSupplier.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/ThrowableUtil.java b/src/main/java/net/minecraftforge/gradle/util/ThrowableUtil.java index 772b3f55c..59e44113a 100644 --- a/src/main/java/net/minecraftforge/gradle/util/ThrowableUtil.java +++ b/src/main/java/net/minecraftforge/gradle/util/ThrowableUtil.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/caching/Annotated.java b/src/main/java/net/minecraftforge/gradle/util/caching/Annotated.java index 7969c960c..041d79b42 100644 --- a/src/main/java/net/minecraftforge/gradle/util/caching/Annotated.java +++ b/src/main/java/net/minecraftforge/gradle/util/caching/Annotated.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/caching/CacheCheckSpec.java b/src/main/java/net/minecraftforge/gradle/util/caching/CacheCheckSpec.java index bbec8b520..ed9321e3f 100644 --- a/src/main/java/net/minecraftforge/gradle/util/caching/CacheCheckSpec.java +++ b/src/main/java/net/minecraftforge/gradle/util/caching/CacheCheckSpec.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/caching/CacheContainer.java b/src/main/java/net/minecraftforge/gradle/util/caching/CacheContainer.java index e7c0435bd..399fe8ac2 100644 --- a/src/main/java/net/minecraftforge/gradle/util/caching/CacheContainer.java +++ b/src/main/java/net/minecraftforge/gradle/util/caching/CacheContainer.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/caching/CacheUtil.java b/src/main/java/net/minecraftforge/gradle/util/caching/CacheUtil.java index 13ce36ff6..13e056f04 100644 --- a/src/main/java/net/minecraftforge/gradle/util/caching/CacheUtil.java +++ b/src/main/java/net/minecraftforge/gradle/util/caching/CacheUtil.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/caching/Cached.java b/src/main/java/net/minecraftforge/gradle/util/caching/Cached.java index a977ce0d4..085511009 100644 --- a/src/main/java/net/minecraftforge/gradle/util/caching/Cached.java +++ b/src/main/java/net/minecraftforge/gradle/util/caching/Cached.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/caching/CachedTask.java b/src/main/java/net/minecraftforge/gradle/util/caching/CachedTask.java index 7ee271576..7789d1704 100644 --- a/src/main/java/net/minecraftforge/gradle/util/caching/CachedTask.java +++ b/src/main/java/net/minecraftforge/gradle/util/caching/CachedTask.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/caching/ICachableTask.java b/src/main/java/net/minecraftforge/gradle/util/caching/ICachableTask.java index ec98b0b8b..6e696d2b4 100644 --- a/src/main/java/net/minecraftforge/gradle/util/caching/ICachableTask.java +++ b/src/main/java/net/minecraftforge/gradle/util/caching/ICachableTask.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/caching/WriteCacheAction.java b/src/main/java/net/minecraftforge/gradle/util/caching/WriteCacheAction.java index f839284a6..16848a09b 100644 --- a/src/main/java/net/minecraftforge/gradle/util/caching/WriteCacheAction.java +++ b/src/main/java/net/minecraftforge/gradle/util/caching/WriteCacheAction.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/delayed/DelayedBase.java b/src/main/java/net/minecraftforge/gradle/util/delayed/DelayedBase.java index db7270ebd..c00ced3e5 100644 --- a/src/main/java/net/minecraftforge/gradle/util/delayed/DelayedBase.java +++ b/src/main/java/net/minecraftforge/gradle/util/delayed/DelayedBase.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/delayed/DelayedFile.java b/src/main/java/net/minecraftforge/gradle/util/delayed/DelayedFile.java index 7d3247f56..23732d2c9 100644 --- a/src/main/java/net/minecraftforge/gradle/util/delayed/DelayedFile.java +++ b/src/main/java/net/minecraftforge/gradle/util/delayed/DelayedFile.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/delayed/DelayedFileTree.java b/src/main/java/net/minecraftforge/gradle/util/delayed/DelayedFileTree.java index b7b6cf085..438b752c4 100644 --- a/src/main/java/net/minecraftforge/gradle/util/delayed/DelayedFileTree.java +++ b/src/main/java/net/minecraftforge/gradle/util/delayed/DelayedFileTree.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/delayed/DelayedString.java b/src/main/java/net/minecraftforge/gradle/util/delayed/DelayedString.java index 6905aae9d..a0eea7d45 100644 --- a/src/main/java/net/minecraftforge/gradle/util/delayed/DelayedString.java +++ b/src/main/java/net/minecraftforge/gradle/util/delayed/DelayedString.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/delayed/ReplacementProvider.java b/src/main/java/net/minecraftforge/gradle/util/delayed/ReplacementProvider.java index b6f8c3265..553d79b2b 100644 --- a/src/main/java/net/minecraftforge/gradle/util/delayed/ReplacementProvider.java +++ b/src/main/java/net/minecraftforge/gradle/util/delayed/ReplacementProvider.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/delayed/TokenReplacer.java b/src/main/java/net/minecraftforge/gradle/util/delayed/TokenReplacer.java index 75977cb6f..7ecb6b14d 100644 --- a/src/main/java/net/minecraftforge/gradle/util/delayed/TokenReplacer.java +++ b/src/main/java/net/minecraftforge/gradle/util/delayed/TokenReplacer.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/json/DateAdapter.java b/src/main/java/net/minecraftforge/gradle/util/json/DateAdapter.java index 15501649a..dd4d8a3c9 100644 --- a/src/main/java/net/minecraftforge/gradle/util/json/DateAdapter.java +++ b/src/main/java/net/minecraftforge/gradle/util/json/DateAdapter.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/json/EnumAdaptorFactory.java b/src/main/java/net/minecraftforge/gradle/util/json/EnumAdaptorFactory.java index 04682fda7..b0fa96f6b 100644 --- a/src/main/java/net/minecraftforge/gradle/util/json/EnumAdaptorFactory.java +++ b/src/main/java/net/minecraftforge/gradle/util/json/EnumAdaptorFactory.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/json/FileAdapter.java b/src/main/java/net/minecraftforge/gradle/util/json/FileAdapter.java index 89f76da6e..908b7380b 100644 --- a/src/main/java/net/minecraftforge/gradle/util/json/FileAdapter.java +++ b/src/main/java/net/minecraftforge/gradle/util/json/FileAdapter.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/json/GLConstantGroup.java b/src/main/java/net/minecraftforge/gradle/util/json/GLConstantGroup.java index 00242d0c6..1920ef37e 100644 --- a/src/main/java/net/minecraftforge/gradle/util/json/GLConstantGroup.java +++ b/src/main/java/net/minecraftforge/gradle/util/json/GLConstantGroup.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/json/JsonFactory.java b/src/main/java/net/minecraftforge/gradle/util/json/JsonFactory.java index b200d0788..71125d251 100644 --- a/src/main/java/net/minecraftforge/gradle/util/json/JsonFactory.java +++ b/src/main/java/net/minecraftforge/gradle/util/json/JsonFactory.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -39,8 +39,6 @@ import net.minecraftforge.gradle.util.json.LiteLoaderJson.VersionObject; import net.minecraftforge.gradle.util.json.fgversion.FGVersionDeserializer; import net.minecraftforge.gradle.util.json.fgversion.FGVersionWrapper; -import net.minecraftforge.gradle.util.json.forgeversion.ForgeArtifact; -import net.minecraftforge.gradle.util.json.forgeversion.ForgeArtifactAdapter; import net.minecraftforge.gradle.util.json.version.AssetIndex; import net.minecraftforge.gradle.util.json.version.ManifestVersion; import net.minecraftforge.gradle.util.json.version.Version; @@ -57,7 +55,6 @@ public class JsonFactory builder.registerTypeAdapter(Date.class, new DateAdapter()); builder.registerTypeAdapter(File.class, new FileAdapter()); builder.registerTypeAdapter(VersionObject.class, new LiteLoaderJson.VersionAdapter()); - builder.registerTypeAdapter(ForgeArtifact.class, new ForgeArtifactAdapter()); builder.registerTypeAdapter(FGVersionWrapper.class, new FGVersionDeserializer()); builder.registerTypeAdapter(FGVersionWrapper.class, new FGVersionDeserializer()); builder.registerTypeAdapter(new TypeToken>() {}.getType(), new MojangManifestAdapter()); diff --git a/src/main/java/net/minecraftforge/gradle/util/json/LiteLoaderJson.java b/src/main/java/net/minecraftforge/gradle/util/json/LiteLoaderJson.java index 249d295d3..6bdf4c78d 100644 --- a/src/main/java/net/minecraftforge/gradle/util/json/LiteLoaderJson.java +++ b/src/main/java/net/minecraftforge/gradle/util/json/LiteLoaderJson.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/json/MCInjectorStruct.java b/src/main/java/net/minecraftforge/gradle/util/json/MCInjectorStruct.java index 8bef8283b..d0e660680 100644 --- a/src/main/java/net/minecraftforge/gradle/util/json/MCInjectorStruct.java +++ b/src/main/java/net/minecraftforge/gradle/util/json/MCInjectorStruct.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/json/MojangManifestAdapter.java b/src/main/java/net/minecraftforge/gradle/util/json/MojangManifestAdapter.java index bc90aa621..f28938cc7 100644 --- a/src/main/java/net/minecraftforge/gradle/util/json/MojangManifestAdapter.java +++ b/src/main/java/net/minecraftforge/gradle/util/json/MojangManifestAdapter.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseDep.java b/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseDep.java index 6801419d4..4b5150326 100644 --- a/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseDep.java +++ b/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseDep.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseError.java b/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseError.java index 223501b73..8535b7025 100644 --- a/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseError.java +++ b/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseError.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseMetadata.java b/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseMetadata.java index 42763f4fe..5ee2f0d23 100644 --- a/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseMetadata.java +++ b/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseMetadata.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseMetadataChild.java b/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseMetadataChild.java index 0f38e5515..1026dc063 100644 --- a/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseMetadataChild.java +++ b/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseMetadataChild.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseProjectDep.java b/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseProjectDep.java index 8c94b164c..f5ee9ab9e 100644 --- a/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseProjectDep.java +++ b/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseProjectDep.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseRelations.java b/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseRelations.java index f436b7c58..e6d55bea0 100644 --- a/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseRelations.java +++ b/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseRelations.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseReply.java b/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseReply.java index 5530a18bc..581281caf 100644 --- a/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseReply.java +++ b/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseReply.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseVersion.java b/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseVersion.java index 5c2b03350..93cfb2490 100644 --- a/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseVersion.java +++ b/src/main/java/net/minecraftforge/gradle/util/json/curse/CurseVersion.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGBuildStatus.java b/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGBuildStatus.java index 7485c1be0..b9b3709de 100644 --- a/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGBuildStatus.java +++ b/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGBuildStatus.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGVersion.java b/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGVersion.java index 9886b080c..92a856c8b 100644 --- a/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGVersion.java +++ b/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGVersion.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGVersionDeserializer.java b/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGVersionDeserializer.java index 20e157cf0..c03b81dc6 100644 --- a/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGVersionDeserializer.java +++ b/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGVersionDeserializer.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGVersionWrapper.java b/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGVersionWrapper.java index b83cff820..b3a60cfbb 100644 --- a/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGVersionWrapper.java +++ b/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGVersionWrapper.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/json/forgeversion/ForgeArtifact.java b/src/main/java/net/minecraftforge/gradle/util/json/forgeversion/ForgeArtifact.java deleted file mode 100644 index 5a1974806..000000000 --- a/src/main/java/net/minecraftforge/gradle/util/json/forgeversion/ForgeArtifact.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA - */ -package net.minecraftforge.gradle.util.json.forgeversion; - -public class ForgeArtifact -{ - public String ext, classifier, hash; -} diff --git a/src/main/java/net/minecraftforge/gradle/util/json/forgeversion/ForgeArtifactAdapter.java b/src/main/java/net/minecraftforge/gradle/util/json/forgeversion/ForgeArtifactAdapter.java deleted file mode 100644 index cb4c8465d..000000000 --- a/src/main/java/net/minecraftforge/gradle/util/json/forgeversion/ForgeArtifactAdapter.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA - */ -package net.minecraftforge.gradle.util.json.forgeversion; - -import java.io.IOException; - -import com.google.gson.TypeAdapter; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; - -public class ForgeArtifactAdapter extends TypeAdapter -{ - - @Override - public void write(JsonWriter out, ForgeArtifact value) throws IOException - { - // dont really need to do this.. but wtvr... - out.beginArray(); - out.value(value.ext); - out.value(value.classifier); - out.value(value.hash); - out.endArray(); - } - - @Override - public ForgeArtifact read(JsonReader in) throws IOException - { - ForgeArtifact out = new ForgeArtifact(); - - in.beginArray(); - - out.ext = in.nextString(); - out.classifier = in.nextString(); - out.hash = in.nextString(); - - in.endArray(); - - return out; - } - -} diff --git a/src/main/java/net/minecraftforge/gradle/util/json/forgeversion/ForgeBuild.java b/src/main/java/net/minecraftforge/gradle/util/json/forgeversion/ForgeBuild.java deleted file mode 100644 index 07fd30b32..000000000 --- a/src/main/java/net/minecraftforge/gradle/util/json/forgeversion/ForgeBuild.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA - */ -package net.minecraftforge.gradle.util.json.forgeversion; - -import java.util.List; - -public class ForgeBuild -{ - public String branch, mcversion, jobver, version; - public short build; - public double modified; - public List Files; -} diff --git a/src/main/java/net/minecraftforge/gradle/util/json/forgeversion/ForgeVersion.java b/src/main/java/net/minecraftforge/gradle/util/json/forgeversion/ForgeVersion.java deleted file mode 100644 index 97d7328fc..000000000 --- a/src/main/java/net/minecraftforge/gradle/util/json/forgeversion/ForgeVersion.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA - */ -package net.minecraftforge.gradle.util.json.forgeversion; - -import java.util.List; -import java.util.Map; - -public class ForgeVersion -{ - public String adfly, artifact, homepage, name, webpath; - public Map> branches, mcversion; - public Map number; - public Map promos; -} diff --git a/src/main/java/net/minecraftforge/gradle/util/mcp/FFPatcher.java b/src/main/java/net/minecraftforge/gradle/util/mcp/FFPatcher.java index a05de5af7..bce2f2f41 100644 --- a/src/main/java/net/minecraftforge/gradle/util/mcp/FFPatcher.java +++ b/src/main/java/net/minecraftforge/gradle/util/mcp/FFPatcher.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/mcp/FmlCleanup.java b/src/main/java/net/minecraftforge/gradle/util/mcp/FmlCleanup.java index 87bfec19d..ad985e5d1 100644 --- a/src/main/java/net/minecraftforge/gradle/util/mcp/FmlCleanup.java +++ b/src/main/java/net/minecraftforge/gradle/util/mcp/FmlCleanup.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/mcp/GLConstantFixer.java b/src/main/java/net/minecraftforge/gradle/util/mcp/GLConstantFixer.java index b7d393d98..3f06afe6f 100644 --- a/src/main/java/net/minecraftforge/gradle/util/mcp/GLConstantFixer.java +++ b/src/main/java/net/minecraftforge/gradle/util/mcp/GLConstantFixer.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/mcp/JavadocAdder.java b/src/main/java/net/minecraftforge/gradle/util/mcp/JavadocAdder.java index 63e757e1a..15ca2001c 100644 --- a/src/main/java/net/minecraftforge/gradle/util/mcp/JavadocAdder.java +++ b/src/main/java/net/minecraftforge/gradle/util/mcp/JavadocAdder.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/mcp/McpCleanup.java b/src/main/java/net/minecraftforge/gradle/util/mcp/McpCleanup.java index 75534b756..f0af6e3b2 100644 --- a/src/main/java/net/minecraftforge/gradle/util/mcp/McpCleanup.java +++ b/src/main/java/net/minecraftforge/gradle/util/mcp/McpCleanup.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/mcp/ReobfExceptor.java b/src/main/java/net/minecraftforge/gradle/util/mcp/ReobfExceptor.java index de57b2165..de5cf5b67 100644 --- a/src/main/java/net/minecraftforge/gradle/util/mcp/ReobfExceptor.java +++ b/src/main/java/net/minecraftforge/gradle/util/mcp/ReobfExceptor.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/net/minecraftforge/gradle/util/patching/BinPatches.java b/src/main/java/net/minecraftforge/gradle/util/patching/BinPatches.java index 16b8fcd80..d7e61f18b 100644 --- a/src/main/java/net/minecraftforge/gradle/util/patching/BinPatches.java +++ b/src/main/java/net/minecraftforge/gradle/util/patching/BinPatches.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/java/org/dimdev/accesstransform/AccessLevel.java b/src/main/java/org/dimdev/accesstransform/AccessLevel.java index a5b7a8a81..e480af654 100644 --- a/src/main/java/org/dimdev/accesstransform/AccessLevel.java +++ b/src/main/java/org/dimdev/accesstransform/AccessLevel.java @@ -41,4 +41,9 @@ public static AccessLevel fromString(String string) { return new AccessLevel(Visibility.valueOf(string), isFinal); } + + @Override + public String toString() { + return "Access<" + visibility + (isFinal ? '+' : '-') + "F>"; + } } diff --git a/src/main/java/org/dimdev/accesstransform/AccessTransformationSet.java b/src/main/java/org/dimdev/accesstransform/AccessTransformationSet.java index 7c6cd46c3..634024beb 100644 --- a/src/main/java/org/dimdev/accesstransform/AccessTransformationSet.java +++ b/src/main/java/org/dimdev/accesstransform/AccessTransformationSet.java @@ -1,17 +1,73 @@ package org.dimdev.accesstransform; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; -import java.util.Set; + +import org.dimdev.accesstransform.ElementReference.Kind; public class AccessTransformationSet { - private final Map transformations = new HashMap<>(); - private final Set affectedClasses = new HashSet<>(); + public static class Transformation { + final Map methods = new HashMap<>(); + final Map fields = new HashMap<>(); + private final String name; + AccessLevel access; + + public Transformation(String name) { + this.name = name; + } + + public boolean wantsAccessChange() { + return access != null; + } + + public AccessLevel getAccessChange() { + return access; + } + + public boolean wantsMethodChange() { + return !methods.isEmpty(); + } + + public AccessLevel popMethod(String name, String description) { + return methods.remove(new ElementReference(Kind.METHOD, this.name, name, description)); + } + + public boolean wantsFieldChange() { + return !fields.isEmpty(); + } + + public AccessLevel popField(String name, String description) { + return fields.remove(new ElementReference(Kind.FIELD, this.name, name, description)); + } + + public void ensureClear() { + if (!methods.isEmpty() || !fields.isEmpty()) { + throw new IllegalStateException("Additional transformations to " + name + " missed: methods: " + methods + ", fields: " + fields); + } + } + } + private final Map transformations = new HashMap<>(); public void addMimimumAccessLevel(ElementReference elementReference, AccessLevel accessLevel) { - transformations.put(elementReference, AccessLevel.union(transformations.get(elementReference), accessLevel)); - affectedClasses.add(elementReference.kind == ElementReference.Kind.CLASS ? elementReference.name : elementReference.owner); + switch (elementReference.kind) { + case CLASS: { + Transformation transform = transformations.computeIfAbsent(elementReference.name, Transformation::new); + transform.access = AccessLevel.union(transform.access, accessLevel); + break; + } + + case METHOD: { + Transformation transform = transformations.computeIfAbsent(elementReference.owner, Transformation::new); + transform.methods.put(elementReference, AccessLevel.union(transform.methods.get(elementReference), accessLevel)); + break; + } + + case FIELD: { + Transformation transform = transformations.computeIfAbsent(elementReference.owner, Transformation::new); + transform.fields.put(elementReference, AccessLevel.union(transform.fields.get(elementReference), accessLevel)); + break; + } + } } public void addMinimumAccessLevel(String string) { @@ -24,15 +80,13 @@ public void addMinimumAccessLevel(String string) { addMimimumAccessLevel(ElementReference.fromString(elementReference), AccessLevel.fromString(accessLevel)); } - public AccessLevel getMinimumAccessLevel(ElementReference elementReference) { - return transformations.get(elementReference); - } - - public boolean isClassAffected(String name) { - return affectedClasses.contains(name); + public Transformation popTransformations(String name) { + return transformations.remove(name); } - public boolean isEmpty() { - return transformations.size() == 0; + public void ensureClear() { + if (!transformations.isEmpty()) { + throw new IllegalStateException("Additional class transformations missed for " + transformations.keySet()); + } } } diff --git a/src/main/java/org/dimdev/accesstransform/AccessTransformer.java b/src/main/java/org/dimdev/accesstransform/AccessTransformer.java index 2ceb84549..2e6c381c1 100644 --- a/src/main/java/org/dimdev/accesstransform/AccessTransformer.java +++ b/src/main/java/org/dimdev/accesstransform/AccessTransformer.java @@ -1,6 +1,5 @@ package org.dimdev.accesstransform; - import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Opcodes; @@ -8,6 +7,8 @@ import org.objectweb.asm.tree.FieldNode; import org.objectweb.asm.tree.MethodNode; +import org.dimdev.accesstransform.AccessTransformationSet.Transformation; + public class AccessTransformer { private final AccessTransformationSet transformations; @@ -16,36 +17,43 @@ public AccessTransformer(AccessTransformationSet transformations) { } public byte[] transformClass(String name, byte[] bytes) { - if (bytes == null || !transformations.isClassAffected(name)) { - return bytes; + Transformation transform = transformations.popTransformations(name); + if (bytes == null || transform == null) { + return bytes; //Nothing to do } ClassNode clazz = new ClassNode(); ClassReader reader = new ClassReader(bytes); reader.accept(clazz, 0); - // Transform class access level - clazz.access = getNewAccessLevel(new ElementReference(ElementReference.Kind.CLASS, null, name, null), clazz.access); + if (transform.wantsAccessChange()) { + // Transform class access level + clazz.access = getNewAccessLevel(clazz.access, transform.access); + } - for (FieldNode field : clazz.fields) { - field.access = getNewAccessLevel(new ElementReference(ElementReference.Kind.FIELD, name, field.name, field.desc), field.access); + if (transform.wantsFieldChange()) { + for (FieldNode field : clazz.fields) { + AccessLevel access = transform.popField(field.name, field.desc); + if (access != null) field.access = getNewAccessLevel(field.access, access); + } } - for (MethodNode method : clazz.methods) { - method.access = getNewAccessLevel(new ElementReference(ElementReference.Kind.METHOD, name, method.name, method.desc), method.access); + if (transform.wantsMethodChange()) { + for (MethodNode method : clazz.methods) { + AccessLevel access = transform.popMethod(method.name, method.desc); + if (access != null) method.access = getNewAccessLevel(method.access, access); + } } + //Make sure there aren't any other transformations requested for this class + transform.ensureClear(); + ClassWriter writer = new ClassWriter(0); clazz.accept(writer); return writer.toByteArray(); } - private int getNewAccessLevel(ElementReference elementReference, int access) { - AccessLevel minimumAccessLevel = transformations.getMinimumAccessLevel(elementReference); - if (minimumAccessLevel == null) { - return access; - } - + private int getNewAccessLevel(int access, AccessLevel minimumAccessLevel) { AccessLevel.Visibility visibility; if ((access & Opcodes.ACC_PUBLIC) != 0) { visibility = AccessLevel.Visibility.PUBLIC; diff --git a/src/main/java/org/dimdev/accesstransform/ElementReference.java b/src/main/java/org/dimdev/accesstransform/ElementReference.java index ba38e3f72..6a33e7a11 100644 --- a/src/main/java/org/dimdev/accesstransform/ElementReference.java +++ b/src/main/java/org/dimdev/accesstransform/ElementReference.java @@ -57,4 +57,9 @@ public boolean equals(Object obj) { public int hashCode() { return Objects.hash(kind, owner, name, desc); } + + @Override + public String toString() { + return "Reference<" + (kind == Kind.CLASS ? name : owner + '#' + name + desc) + '>'; + } } diff --git a/src/main/resources/net/minecraftforge/gradle/GradleForgeHacks.java b/src/main/resources/net/minecraftforge/gradle/GradleForgeHacks.java index 33a882397..77b29fda7 100644 --- a/src/main/resources/net/minecraftforge/gradle/GradleForgeHacks.java +++ b/src/main/resources/net/minecraftforge/gradle/GradleForgeHacks.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -72,10 +72,10 @@ public static void searchCoremods(GradleStartCommon common) { // no core searching GradleStartCommon.LOGGER.info("GradleStart coremod searching disabled!"); - + // remove it so it cant potentially screw up the bonced start class common.extras.remove(NO_CORE_SEARCH); - + return; } diff --git a/src/main/resources/net/minecraftforge/gradle/GradleStartCommon.java b/src/main/resources/net/minecraftforge/gradle/GradleStartCommon.java index 46231e99c..034996f57 100644 --- a/src/main/resources/net/minecraftforge/gradle/GradleStartCommon.java +++ b/src/main/resources/net/minecraftforge/gradle/GradleStartCommon.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/resources/net/minecraftforge/gradle/tweakers/AccessTransformerTweaker.java b/src/main/resources/net/minecraftforge/gradle/tweakers/AccessTransformerTweaker.java index ab03c372c..f20fc8c27 100644 --- a/src/main/resources/net/minecraftforge/gradle/tweakers/AccessTransformerTweaker.java +++ b/src/main/resources/net/minecraftforge/gradle/tweakers/AccessTransformerTweaker.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/main/resources/net/minecraftforge/gradle/tweakers/CoremodTweaker.java b/src/main/resources/net/minecraftforge/gradle/tweakers/CoremodTweaker.java index 4c567a737..23e4b424b 100644 --- a/src/main/resources/net/minecraftforge/gradle/tweakers/CoremodTweaker.java +++ b/src/main/resources/net/minecraftforge/gradle/tweakers/CoremodTweaker.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/common/TestConstants.java b/src/test/java/net/minecraftforge/gradle/common/TestConstants.java index 3547f249a..9c1e75461 100644 --- a/src/test/java/net/minecraftforge/gradle/common/TestConstants.java +++ b/src/test/java/net/minecraftforge/gradle/common/TestConstants.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/patcher/TestTaskExtractExcModifiers.java b/src/test/java/net/minecraftforge/gradle/patcher/TestTaskExtractExcModifiers.java index 4e2e6791b..78720ad16 100644 --- a/src/test/java/net/minecraftforge/gradle/patcher/TestTaskExtractExcModifiers.java +++ b/src/test/java/net/minecraftforge/gradle/patcher/TestTaskExtractExcModifiers.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/patcher/TestTaskExtractNew.java b/src/test/java/net/minecraftforge/gradle/patcher/TestTaskExtractNew.java index 51453bce2..7d1b9bc23 100644 --- a/src/test/java/net/minecraftforge/gradle/patcher/TestTaskExtractNew.java +++ b/src/test/java/net/minecraftforge/gradle/patcher/TestTaskExtractNew.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/tasks/TestAbstractEditJarTask.java b/src/test/java/net/minecraftforge/gradle/tasks/TestAbstractEditJarTask.java index be26b8842..47fe4b1ba 100644 --- a/src/test/java/net/minecraftforge/gradle/tasks/TestAbstractEditJarTask.java +++ b/src/test/java/net/minecraftforge/gradle/tasks/TestAbstractEditJarTask.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/tasks/TestDeobfuscateJar.java b/src/test/java/net/minecraftforge/gradle/tasks/TestDeobfuscateJar.java index cd63abb73..08b848310 100644 --- a/src/test/java/net/minecraftforge/gradle/tasks/TestDeobfuscateJar.java +++ b/src/test/java/net/minecraftforge/gradle/tasks/TestDeobfuscateJar.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/tasks/TestGenSrgs.java b/src/test/java/net/minecraftforge/gradle/tasks/TestGenSrgs.java index 681d64636..2e1f9edd2 100644 --- a/src/test/java/net/minecraftforge/gradle/tasks/TestGenSrgs.java +++ b/src/test/java/net/minecraftforge/gradle/tasks/TestGenSrgs.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/tasks/TestMergeJars.java b/src/test/java/net/minecraftforge/gradle/tasks/TestMergeJars.java index b9d6ad81c..4e39eb29b 100644 --- a/src/test/java/net/minecraftforge/gradle/tasks/TestMergeJars.java +++ b/src/test/java/net/minecraftforge/gradle/tasks/TestMergeJars.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/tasks/fernflower/TestArtifactSaver.java b/src/test/java/net/minecraftforge/gradle/tasks/fernflower/TestArtifactSaver.java index 56c0d6e3f..93f4b49d3 100644 --- a/src/test/java/net/minecraftforge/gradle/tasks/fernflower/TestArtifactSaver.java +++ b/src/test/java/net/minecraftforge/gradle/tasks/fernflower/TestArtifactSaver.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/testsupport/JarComparison.java b/src/test/java/net/minecraftforge/gradle/testsupport/JarComparison.java index 4c261124e..ce272b279 100644 --- a/src/test/java/net/minecraftforge/gradle/testsupport/JarComparison.java +++ b/src/test/java/net/minecraftforge/gradle/testsupport/JarComparison.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/testsupport/TaskTest.java b/src/test/java/net/minecraftforge/gradle/testsupport/TaskTest.java index 5267c4d4e..b9f3996d2 100644 --- a/src/test/java/net/minecraftforge/gradle/testsupport/TaskTest.java +++ b/src/test/java/net/minecraftforge/gradle/testsupport/TaskTest.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/testsupport/TestResource.java b/src/test/java/net/minecraftforge/gradle/testsupport/TestResource.java index 5717eb03b..3d5f9ad5b 100644 --- a/src/test/java/net/minecraftforge/gradle/testsupport/TestResource.java +++ b/src/test/java/net/minecraftforge/gradle/testsupport/TestResource.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/testsupport/UsesTemporaryFiles.java b/src/test/java/net/minecraftforge/gradle/testsupport/UsesTemporaryFiles.java index 81682273a..c8795ddba 100644 --- a/src/test/java/net/minecraftforge/gradle/testsupport/UsesTemporaryFiles.java +++ b/src/test/java/net/minecraftforge/gradle/testsupport/UsesTemporaryFiles.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/user/TestTaskDepDummy.java b/src/test/java/net/minecraftforge/gradle/user/TestTaskDepDummy.java index 3cf4a7682..8f0cf10c9 100644 --- a/src/test/java/net/minecraftforge/gradle/user/TestTaskDepDummy.java +++ b/src/test/java/net/minecraftforge/gradle/user/TestTaskDepDummy.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/user/TestTaskExtractDepAts.java b/src/test/java/net/minecraftforge/gradle/user/TestTaskExtractDepAts.java index d88f489d3..345d7077e 100644 --- a/src/test/java/net/minecraftforge/gradle/user/TestTaskExtractDepAts.java +++ b/src/test/java/net/minecraftforge/gradle/user/TestTaskExtractDepAts.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/user/TestTaskRecompileMc.java b/src/test/java/net/minecraftforge/gradle/user/TestTaskRecompileMc.java index f00312eed..159b0e1e9 100644 --- a/src/test/java/net/minecraftforge/gradle/user/TestTaskRecompileMc.java +++ b/src/test/java/net/minecraftforge/gradle/user/TestTaskRecompileMc.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/user/TestTaskSingleDeobfBin.java b/src/test/java/net/minecraftforge/gradle/user/TestTaskSingleDeobfBin.java index 4b6670893..75433a61e 100644 --- a/src/test/java/net/minecraftforge/gradle/user/TestTaskSingleDeobfBin.java +++ b/src/test/java/net/minecraftforge/gradle/user/TestTaskSingleDeobfBin.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/user/TestTaskSingleReobf.java b/src/test/java/net/minecraftforge/gradle/user/TestTaskSingleReobf.java index c901756d2..092bef135 100644 --- a/src/test/java/net/minecraftforge/gradle/user/TestTaskSingleReobf.java +++ b/src/test/java/net/minecraftforge/gradle/user/TestTaskSingleReobf.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/user/patcherUser/TaskApplyBinPatchesTest.java b/src/test/java/net/minecraftforge/gradle/user/patcherUser/TaskApplyBinPatchesTest.java index acfb253d9..7a81a34d2 100644 --- a/src/test/java/net/minecraftforge/gradle/user/patcherUser/TaskApplyBinPatchesTest.java +++ b/src/test/java/net/minecraftforge/gradle/user/patcherUser/TaskApplyBinPatchesTest.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/util/MultiDirSupplierTest.java b/src/test/java/net/minecraftforge/gradle/util/MultiDirSupplierTest.java index 033765d96..6f97736c2 100644 --- a/src/test/java/net/minecraftforge/gradle/util/MultiDirSupplierTest.java +++ b/src/test/java/net/minecraftforge/gradle/util/MultiDirSupplierTest.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/util/mcp/FmlCleanupTest.java b/src/test/java/net/minecraftforge/gradle/util/mcp/FmlCleanupTest.java index de3f5a4f5..459b287fa 100644 --- a/src/test/java/net/minecraftforge/gradle/util/mcp/FmlCleanupTest.java +++ b/src/test/java/net/minecraftforge/gradle/util/mcp/FmlCleanupTest.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/util/mcp/JavadocInserterTest.java b/src/test/java/net/minecraftforge/gradle/util/mcp/JavadocInserterTest.java index be59b1f9e..3c2e26319 100644 --- a/src/test/java/net/minecraftforge/gradle/util/mcp/JavadocInserterTest.java +++ b/src/test/java/net/minecraftforge/gradle/util/mcp/JavadocInserterTest.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/util/mcp/StripCommentsTest.java b/src/test/java/net/minecraftforge/gradle/util/mcp/StripCommentsTest.java index 0f8bc2fb2..ee85bd358 100644 --- a/src/test/java/net/minecraftforge/gradle/util/mcp/StripCommentsTest.java +++ b/src/test/java/net/minecraftforge/gradle/util/mcp/StripCommentsTest.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/versions/ExtensionForgeVersionTest.java b/src/test/java/net/minecraftforge/gradle/versions/ExtensionForgeVersionTest.java deleted file mode 100644 index 6f15be578..000000000 --- a/src/test/java/net/minecraftforge/gradle/versions/ExtensionForgeVersionTest.java +++ /dev/null @@ -1,162 +0,0 @@ -/* - * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA - */ -package net.minecraftforge.gradle.versions; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import net.minecraftforge.gradle.user.patcherUser.forge.ForgeExtension; -import net.minecraftforge.gradle.user.patcherUser.forge.ForgePlugin; -import net.minecraftforge.gradle.util.GradleConfigurationException; - -import org.gradle.api.Project; -import org.gradle.testfixtures.ProjectBuilder; -import org.junit.Before; -import org.junit.Test; - -import com.google.common.collect.ImmutableMap; - -public class ExtensionForgeVersionTest -{ - private Project testProject; - private ForgeExtension ext; - - @Before - public void setupProject() - { - this.testProject = ProjectBuilder.builder().build(); - assertNotNull(this.testProject); - this.testProject.apply(ImmutableMap.of("plugin", ForgePlugin.class)); - - this.ext = this.testProject.getExtensions().findByType(ForgeExtension.class); // unlike getByType(), does not throw exception - assertNotNull(this.ext); - this.ext.setSuppressVersionTest(true); - } - - // Invalid version notation! The following are valid notations. BuildNumber, version, version-branch, mcversion-version-branch, and pomotion (sic) - - @Test - public void testValidBuildNumber() - { - // buildnumber - this.ext.setVersion("965"); - assertEquals(this.ext.getVersion(), "1.6.4"); - assertEquals(this.ext.getForgeVersion(), "9.11.1.965"); - } - - @Test - public void testValidPromotion() - { - // promotion - this.ext.setVersion("1.6.4-recommended"); - assertEquals(this.ext.getVersion(), "1.6.4"); - assertEquals(this.ext.getForgeVersion(), "9.11.1.1345"); - } - - @Test - public void testValidBuildNumberNoBranch() - { - // buildnumber (no branch) - this.ext.setVersion("1256"); - assertEquals(this.ext.getVersion(), "1.7.10"); - assertEquals(this.ext.getForgeVersion(), "10.13.2.1256"); - } - - @Test - public void testValidBuildNumberWithBranch() - { - // buildnumber (with branch) - this.ext.setVersion("1257"); - assertEquals(this.ext.getVersion(), "1.8"); - assertEquals(this.ext.getForgeVersion(), "11.14.0.1257-1.8"); - } - - @Test - public void testValidVersion() - { - // version - this.ext.setVersion("10.13.2.1256"); - assertEquals(this.ext.getVersion(), "1.7.10"); - assertEquals(this.ext.getForgeVersion(), "10.13.2.1256"); - } - - @Test - public void testValidMcVersionWithVersion() - { - // mcversion-version - this.ext.setVersion("1.7.10-10.13.2.1256"); - assertEquals(this.ext.getVersion(), "1.7.10"); - assertEquals(this.ext.getForgeVersion(), "10.13.2.1256"); - } - - @Test - public void testValidVersionWithBranch() - { - // version-branch - this.ext.setVersion("11.14.0.1257-1.8"); - assertEquals(this.ext.getVersion(), "1.8"); - assertEquals(this.ext.getForgeVersion(), "11.14.0.1257-1.8"); - } - - @Test - public void testValidMcVersionWithVersionAndBranch() - { - // mcversion-version-branch - this.ext.setVersion("1.8-11.14.0.1257-1.8"); - assertEquals(this.ext.getVersion(), "1.8"); - assertEquals(this.ext.getForgeVersion(), "11.14.0.1257-1.8"); - } - - // Invalid formats - - @Test(expected = GradleConfigurationException.class) - public void testInvalidBuild() - { - // 1.8 build skipped due to 1.7.10 - this.ext.setVersion("11.14.0.1256-1.8"); - } - - @Test(expected = GradleConfigurationException.class) - public void testInvalidBuildWithMcVersion() - { - // 1.8 build skipped due to 1.7.10 (with MC version) - this.ext.setVersion("1.8-11.14.0.1256-1.8"); - } - - @Test(expected = GradleConfigurationException.class) - public void testInvalidMcVersion() - { - // invalid MC version - this.ext.setVersion("1.7.10-9.11.1.965"); - } - - @Test(expected = GradleConfigurationException.class) - public void testInvalidMcVersionWithBranch() - { - // invalid MC version (with branch) - this.ext.setVersion("1.7.10-11.14.0.1257-1.8"); - } - - @Test(expected = GradleConfigurationException.class) - public void testInvalidBranch() - { - // invalid branch - this.ext.setVersion("1.7.10-11.14.0.1256-1.8"); - } -} diff --git a/src/test/java/net/minecraftforge/gradle/versions/ExtensionLiteLoaderVersionTest.java b/src/test/java/net/minecraftforge/gradle/versions/ExtensionLiteLoaderVersionTest.java index d9e00e686..6d857e85c 100644 --- a/src/test/java/net/minecraftforge/gradle/versions/ExtensionLiteLoaderVersionTest.java +++ b/src/test/java/net/minecraftforge/gradle/versions/ExtensionLiteLoaderVersionTest.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/test/java/net/minecraftforge/gradle/versions/ExtensionMcpMappingTest.java b/src/test/java/net/minecraftforge/gradle/versions/ExtensionMcpMappingTest.java index f07a49171..98bcb2ddc 100644 --- a/src/test/java/net/minecraftforge/gradle/versions/ExtensionMcpMappingTest.java +++ b/src/test/java/net/minecraftforge/gradle/versions/ExtensionMcpMappingTest.java @@ -1,6 +1,6 @@ /* * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins. - * Copyright (C) 2013-2018 Minecraft Forge + * Copyright (C) 2013-2019 Minecraft Forge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public