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

Merge branch '1.11.2-dev' into 1.12-dev

Browse Source
This commit is contained in:
Jonas Herzig
2018-01-17 00:18:04 +01:00
parent d7dc2badf8 87335cd243
commit dc1bc1ee8e
65 changed files with 2237 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,75 @@
From 7127699cb761a518cce8872b0b78694e357f21fe Mon Sep 17 00:00:00 2001
From: Jonas Herzig <me@johni0702.de>
Date: Mon, 28 Aug 2017 17:50:38 +0200
Subject: [PATCH] Replace https urls with http for proxy-witness
---
.../java/net/minecraftforge/gradle/common/BasePlugin.java | 13 ++++++++++---
.../java/net/minecraftforge/gradle/common/Constants.java | 4 ++--
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/net/minecraftforge/gradle/common/BasePlugin.java b/src/main/java/net/minecraftforge/gradle/common/BasePlugin.java
index df369f1..e3e50c0 100644
--- a/src/main/java/net/minecraftforge/gradle/common/BasePlugin.java
+++ b/src/main/java/net/minecraftforge/gradle/common/BasePlugin.java
@@ -350,6 +350,13 @@ public abstract class BasePlugin<K extends BaseExtension> implements Plugin<Proj
deps.add(CONFIG_FFI_DEPS, deps.localGroovy());
}
+ private static String http(String url) {
+ if (url.startsWith("https://")) {
+ url = "http" + url.substring("https".length());
+ }
+ return url;
+ }
+
@SuppressWarnings("serial")
private void makeCommonTasks()
{
@@ -358,7 +365,7 @@ public abstract class BasePlugin<K extends BaseExtension> implements Plugin<Proj
@Override
public String call()
{
- return mcManifest.get(getExtension().getVersion()).url;
+ return http(mcManifest.get(getExtension().getVersion()).url);
}
});
getVersionJson.setFile(delayedFile(JSON_VERSION));
@@ -435,7 +442,7 @@ public abstract class BasePlugin<K extends BaseExtension> implements Plugin<Proj
@Override
public String call()
{
- return mcVersionJson.getClientUrl();
+ return http(mcVersionJson.getClientUrl());
}
});
@@ -449,7 +456,7 @@ public abstract class BasePlugin<K extends BaseExtension> implements Plugin<Proj
@Override
public String call()
{
- return mcVersionJson.getServerUrl();
+ return http(mcVersionJson.getServerUrl());
}
});
diff --git a/src/main/java/net/minecraftforge/gradle/common/Constants.java b/src/main/java/net/minecraftforge/gradle/common/Constants.java
index b42b1c2..a0753e0 100644
--- a/src/main/java/net/minecraftforge/gradle/common/Constants.java
+++ b/src/main/java/net/minecraftforge/gradle/common/Constants.java
@@ -115,10 +115,10 @@ public class Constants
// 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(
--
2.5.5

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

@@ -0,0 +1,41 @@
From 2309fc9515d4010c5d9db89008660e3e60ea529b Mon Sep 17 00:00:00 2001
From: Jonas Herzig <me@johni0702.de>
Date: Sat, 26 Aug 2017 17:40:48 +0200
Subject: [PATCH] Replace SNAPSHOT deps with manually built ones
---
build.gradle | 49 +++----------------------------------------------
1 file changed, 3 insertions(+), 46 deletions(-)
diff --git a/build.gradle b/build.gradle
index bfadecd..774a015 100644
--- a/build.gradle
+++ b/build.gradle
@@ -67,10 +67,10 @@ 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.0.342-SNAPSHOT' // Fernflower Forge edition
+ compile 'reprod:forgeflower:0' // Fernflower Forge edition
- shade 'net.md-5:SpecialSource:1.8.1-SNAPSHOT' // deobf and reobs
- // shade 'net.md-5:SpecialSource:1.8.1' // when md5 publishes
+ // shade 'net.md-5:SpecialSource:1.8.1-SNAPSHOT' // deobf and reobs
+ shade 'net.md-5:SpecialSource:1.8.1' // when md5 publishes
// because curse
compile 'org.apache.httpcomponents:httpclient:4.3.3'
@@ -78,8 +78,8 @@ dependencies {
// 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 'reprod:mcinjector:0'
+ shade 'reprod:srg2source:0'
//Stuff used in the GradleStart classes
compileOnly 'com.mojang:authlib:1.5.16'
--
2.5.5