DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rebase reprod changes on 1.8

Browse Source
This commit is contained in:
Jonas Herzig
2017-09-02 17:53:09 +02:00
parent a976d8c58f
commit c21408a9d0
14 changed files with 331 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
gradle/reprod/patches/forgegradle/0001-Fix-compilation-with-newer-gradle-versions.patch Normal file
View File

@@ -0,0 +1,84 @@
From 5d778fec168a72d41df672ad38ee5f01973916ce Mon Sep 17 00:00:00 2001
From: Jonas Herzig <me@johni0702.de>
Date: Sat, 2 Sep 2017 15:40:15 +0200
Subject: [PATCH] Fix compilation with newer gradle versions
---
src/main/java/net/minecraftforge/gradle/tasks/CreateStartTask.java | 1 -
src/main/java/net/minecraftforge/gradle/user/TaskRecompileMc.java | 1 -
src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java | 1 -
.../java/net/minecraftforge/gradle/util/SourceDirSetSupplier.java | 4 ++--
src/main/java/net/minecraftforge/gradle/util/json/JsonFactory.java | 1 -
5 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/main/java/net/minecraftforge/gradle/tasks/CreateStartTask.java b/src/main/java/net/minecraftforge/gradle/tasks/CreateStartTask.java
index 1de9ac3..8d0a5a5 100644
--- a/src/main/java/net/minecraftforge/gradle/tasks/CreateStartTask.java
+++ b/src/main/java/net/minecraftforge/gradle/tasks/CreateStartTask.java
@@ -128,7 +128,6 @@ public class CreateStartTask extends CachedTask
LoggingManager log = getLogging();
LogLevel startLevel = getProject().getGradle().getStartParameter().getLogLevel();
if (startLevel.compareTo(LogLevel.LIFECYCLE) >= 0) {
- log.setLevel(LogLevel.ERROR);
}
// INVOKE!
this.getAnt().invokeMethod("javac", ImmutableMap.builder()
diff --git a/src/main/java/net/minecraftforge/gradle/user/TaskRecompileMc.java b/src/main/java/net/minecraftforge/gradle/user/TaskRecompileMc.java
index 224292c..f61618c 100644
--- a/src/main/java/net/minecraftforge/gradle/user/TaskRecompileMc.java
+++ b/src/main/java/net/minecraftforge/gradle/user/TaskRecompileMc.java
@@ -86,7 +86,6 @@ public class TaskRecompileMc extends CachedTask
LoggingManager log = getLogging();
LogLevel startLevel = getProject().getGradle().getStartParameter().getLogLevel();
if (startLevel.compareTo(LogLevel.LIFECYCLE) >= 0) {
- log.setLevel(LogLevel.ERROR);
}
// recompile
diff --git a/src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java b/src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java
index 98391fc..9408a07 100644
--- a/src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java
+++ b/src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java
@@ -37,7 +37,6 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import com.beust.jcommander.internal.Lists;
import org.gradle.api.Action;
import org.gradle.api.DefaultTask;
import org.gradle.api.NamedDomainObjectContainer;
diff --git a/src/main/java/net/minecraftforge/gradle/util/SourceDirSetSupplier.java b/src/main/java/net/minecraftforge/gradle/util/SourceDirSetSupplier.java
index 4e9dbe5..4f3744e 100644
--- a/src/main/java/net/minecraftforge/gradle/util/SourceDirSetSupplier.java
+++ b/src/main/java/net/minecraftforge/gradle/util/SourceDirSetSupplier.java
@@ -19,13 +19,13 @@
*/
package net.minecraftforge.gradle.util;
-import com.beust.jcommander.internal.Lists;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
import net.minecraftforge.srg2source.util.io.InputSupplier;
import net.minecraftforge.srg2source.util.io.OutputSupplier;
import org.gradle.api.file.FileVisitDetails;
import org.gradle.api.file.FileVisitor;
import org.gradle.api.file.SourceDirectorySet;
-import org.testng.collections.Maps;
import java.io.*;
import java.util.List;
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 b75f653..fa61537 100644
--- a/src/main/java/net/minecraftforge/gradle/util/json/JsonFactory.java
+++ b/src/main/java/net/minecraftforge/gradle/util/json/JsonFactory.java
@@ -26,7 +26,6 @@ import java.io.IOException;
import java.util.*;
import java.util.Map.Entry;
-import com.beust.jcommander.internal.Lists;
import com.google.common.base.Strings;
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
--
2.9.5

28
gradle/reprod/patches/forgegradle/0001-Replace-https-urls-with-http-for-proxy-witness.patch
View File

@@ -12,8 +12,8 @@ diff --git a/src/main/java/net/minecraftforge/gradle/common/BasePlugin.java b/sr
index df369f1..e3e50c0 100644
--- a/src/main/java/net/minecraftforge/gradle/common/BasePlugin.java
+++ b/src/main/java/net/minecraftforge/gradle/common/BasePlugin.java
@@ -393,6 +393,13 @@ public abstract class BasePlugin<K extends BaseExtension> implements Plugin<Proj
deps.add(CONFIG_FFI_DEPS, deps.localGroovy());
@@ -350,6 +350,13 @@ public abstract class BasePlugin<K extends BaseExtension> implements Plugin<Proj
// not required.. but you probably wanan implement this
}
+ private static String http(String url) {
@@ -26,7 +26,7 @@ index df369f1..e3e50c0 100644
@SuppressWarnings("serial")
private void makeCommonTasks()
{
@@ -402,7 +409,7 @@ public abstract class BasePlugin<K extends BaseExtension> implements Plugin<Proj
@@ -358,7 +365,7 @@ public abstract class BasePlugin<K extends BaseExtension> implements Plugin<Proj
@Override
public String call()
{
@@ -35,7 +35,7 @@ index df369f1..e3e50c0 100644
}
});
getVersionJson.setFile(delayedFile(JSON_VERSION));
@@ -486,7 +493,7 @@ public abstract class BasePlugin<K extends BaseExtension> implements Plugin<Proj
@@ -435,7 +442,7 @@ public abstract class BasePlugin<K extends BaseExtension> implements Plugin<Proj
@Override
public String call()
{
@@ -44,7 +44,7 @@ index df369f1..e3e50c0 100644
}
});
@@ -500,7 +507,7 @@ public abstract class BasePlugin<K extends BaseExtension> implements Plugin<Proj
@@ -449,7 +456,7 @@ public abstract class BasePlugin<K extends BaseExtension> implements Plugin<Proj
@Override
public String call()
{
@@ -61,15 +61,15 @@ index b42b1c2..a0753e0 100644
// urls
- public static final String URL_MC_MANIFEST = "https://launchermeta.mojang.com/mc/game/version_manifest.json";
+ public static final String URL_MC_MANIFEST = "http://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_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 = "http://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 List<String> URLS_MCP_JSON = Arrays.asList(
- public static final String URL_MC_MANIFEST = "https://launchermeta.mojang.com/mc/game/version_manifest.json";
+ public static final String URL_MC_MANIFEST = "http://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_ASSETS = "http://resources.download.minecraft.net";
- public static final String URL_LIBRARY = "https://libraries.minecraft.net/";
+ public static final String URL_LIBRARY = "http://libraries.minecraft.net/";
public static final String URL_FORGE_MAVEN = "http://files.minecraftforge.net/maven";
public static final String URL_MCP_JSON = "http://export.mcpbot.bspk.rs/versions.json";
--
2.5.5

161
gradle/reprod/patches/forgegradle/0003-Remove-all-buildscript-dependencies.patch
View File

@@ -1,161 +0,0 @@
From a4a52f38bd660caa61531ebecd2d11f764eb3691 Mon Sep 17 00:00:00 2001
From: Jonas Herzig <me@johni0702.de>
Date: Mon, 7 Aug 2017 19:52:46 +0200
Subject: [PATCH 3/5] Remove all buildscript dependencies
---
build.gradle | 130 -----------------------------------------------------------
1 file changed, 130 deletions(-)
diff --git a/build.gradle b/build.gradle
index 91ea99a..8959f8f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,21 +1,7 @@
-buildscript {
- repositories {
- maven {
- url "https://plugins.gradle.org/m2/"
- }
- }
- dependencies {
- classpath "com.gradle.publish:plugin-publish-plugin:0.9.1"
- classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0'
- }
-}
-
apply plugin: 'java'
apply plugin: 'idea'
apply plugin: 'eclipse'
apply plugin: 'maven'
-apply plugin: "com.gradle.plugin-publish"
-apply plugin: 'license'
group = 'net.minecraftforge.gradle'
version = '2.3-SNAPSHOT'
@@ -188,122 +174,6 @@ test {
exclude "**/ExtensionMcpMappingTest*"
}
-license {
- ext {
- description = 'A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins.'
- year = '2013'
- fullname = 'Minecraft Forge'
- }
- header rootProject.file('HEADER')
- include '**net/minecraftforge/gradle/**/*.java'
- excludes ([
- '**net/minecraftforge/gradle/util/ZipFileTree.java',
- '**net/minecraftforge/gradle/util/json/version/*',
- '**net/minecraftforge/gradle/util/patching/Base64.java',
- '**net/minecraftforge/gradle/util/patching/ContextualPatch.java'
- ])
- ignoreFailures false
- strictCheck true
- mapping {
- java = 'SLASHSTAR_STYLE'
- }
-}
-
-pluginBundle {
- website = 'http://www.gradle.org/'
- vcsUrl = 'https://github.com/MinecraftForge/ForgeGradle'
- description = 'Gradle plugin for all Minecraft mod development needs'
- tags = ['forge', 'minecraft', 'minecraftforge', 'sponge', 'mcp']
-
- plugins {
- patcher {
- id = 'net.minecraftforge.gradle.patcher'
- displayName = 'Minicraft Patcher Plugin'
- }
- tweakerClient {
- id = 'net.minecraftforge.gradle.tweaker-client'
- displayName = 'Mincraft Client Tweaker Plugin'
- }
- tweakerServer {
- id = 'net.minecraftforge.gradle.tweaker-server'
- displayName = 'Mincraft Server Tweaker Plugin'
- }
- forge {
- id = 'net.minecraftforge.gradle.forge'
- displayName = 'MincraftForge Mod Development Plugin'
- }
-
- launch4j {
- id = 'net.minecraftforge.gradle.launch4j'
- displayName = 'Specialized Launch4J Gradle Plugin'
- }
- }
-}
-
-uploadArchives {
- repositories.mavenDeployer {
-
- dependsOn 'build'
-
- if (project.hasProperty('forgeMavenPass'))
- {
- repository(url: "http://files.minecraftforge.net/maven/manage/upload") {
- authentication(userName: "forge", password: project.getProperty('forgeMavenPass'))
- }
- }
- else
- {
- // local repo folder. Might wanna juset use gradle install if you wanans end it to maven-local
- repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
- }
-
-
- pom {
- groupId = project.group
- version = project.version
- artifactId = project.archivesBaseName
- project {
- name project.archivesBaseName
- packaging 'jar'
- description 'Gradle plugin for Forge'
- url 'https://github.com/MinecraftForge/ForgeGradle'
-
- scm {
- url 'https://github.com/MinecraftForge/ForgeGradle'
- connection 'scm:git:git://github.com/MinecraftForge/ForgeGradle.git'
- developerConnection 'scm:git:git@github.com:MinecraftForge/ForgeGradle.git'
- }
-
- issueManagement {
- system 'github'
- url 'https://github.com/MinecraftForge/ForgeGradle/issues'
- }
-
- licenses {
- license {
- name 'Lesser GNU Public License, Version 2.1'
- url 'https://www.gnu.org/licenses/lgpl-2.1.html'
- distribution 'repo'
- }
- }
-
- developers {
- developer {
- id 'AbrarSyed'
- name 'Abrar Syed'
- roles { role 'developer' }
- }
- developer {
- id 'LexManos'
- name 'Lex Manos'
- roles { role 'developer' }
- }
- }
- }
- }
- }
-}
-
// write out version so its convenient for doc deployment
file('build').mkdirs()
file('build/version.txt').text = version;
--
2.5.5

10
gradle/reprod/patches/forgegradle/0004-Shade-all-the-things-because-we-don-t-include-deps-a.patch
View File

@@ -12,13 +12,13 @@ diff --git a/build.gradle b/build.gradle
index 8959f8f..0bf7941 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,26 +48,26 @@ dependencies {
@@ -62,26 +62,26 @@ dependencies {
compile gradleApi()
// moved to the beginning to be the overrider
- compile 'org.ow2.asm:asm-debug-all:5.1'
- compile 'org.ow2.asm:asm-debug-all:5.0.3'
- compile 'com.google.guava:guava:18.0'
+ shade 'org.ow2.asm:asm-debug-all:5.1'
+ shade 'org.ow2.asm:asm-debug-all:5.0.3'
+ shade 'com.google.guava:guava:18.0'
- compile 'net.sf.opencsv:opencsv:2.3' // reading CSVs.. also used by SpecialSource
@@ -34,12 +34,12 @@ index 8959f8f..0bf7941 100644
- 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.0.342-SNAPSHOT' // Fernflower Forge edition
- compile 'net.minecraftforge:fernflower:2.0-SNAPSHOT' // Fernflower Forge edition
+ shade 'com.github.jponge:lzma-java:1.3' // replaces the LZMA binary
+ shade 'com.nothome:javaxdelta:2.0.1' // GDIFF implementation for BinPatches
+ shade 'com.google.code.gson:gson:2.2.4' // Used instead of Argo for buuilding changelog.
+ shade 'com.github.tony19:named-regexp:0.2.3' // 1.7 Named regexp features
+ shade 'net.minecraftforge:forgeflower:1.0.342-SNAPSHOT' // Fernflower Forge edition
+ shade 'net.minecraftforge:fernflower:2.0-SNAPSHOT' // Fernflower Forge edition
shade 'net.md-5:SpecialSource:1.7.4' // deobf and reobs
// compile 'net.md-5:SpecialSource:1.7.4' // when md5 publishes

4
gradle/reprod/patches/forgegradle/0006-Replace-SNAPSHOT-deps-with-manually-built-ones.patch
View File

@@ -15,7 +15,7 @@ index bfadecd..774a015 100644
shade 'com.nothome:javaxdelta:2.0.1' // GDIFF implementation for BinPatches
shade 'com.google.code.gson:gson:2.2.4' // Used instead of Argo for buuilding changelog.
shade 'com.github.tony19:named-regexp:0.2.3' // 1.7 Named regexp features
- shade 'net.minecraftforge:forgeflower:1.0.342-SNAPSHOT' // Fernflower Forge edition
- shade 'net.minecraftforge:fernflower:2.0-SNAPSHOT' // Fernflower Forge edition
+ shade files('../forgeflower.jar') // Fernflower Forge edition
shade 'net.md-5:SpecialSource:1.7.4' // deobf and reobs
@@ -25,7 +25,7 @@ index bfadecd..774a015 100644
// mcp stuff
shade 'de.oceanlabs.mcp:RetroGuard:3.6.6'
- shade 'de.oceanlabs.mcp:mcinjector:3.4-SNAPSHOT'
- shade 'net.minecraftforge.srg2source:Srg2Source:4.0-SNAPSHOT'
- shade 'net.minecraftforge.srg2source:Srg2Source:3.3-SNAPSHOT'
+ shade files('../mcinjector.jar')
+ shade files('../srg2source.jar')