keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Update libs to 1.0 versions, bump grgit, and fix tag search behaviour that resulted. 

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
This commit is contained in:
cpw 2019-08-29 23:34:58 -04:00
parent d9f6659f2c
commit 0d448a5e4f
No known key found for this signature in database
GPG Key ID: 8EB3DF749553B1B7
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
build.gradle
View File

@ -40,9 +40,9 @@ import org.objectweb.asm.ClassReader
plugins { plugins {
id 'net.minecrell.licenser' version '0.4' id 'net.minecrell.licenser' version '0.4'
id 'org.ajoberstar.grgit' version '2.3.0' id 'org.ajoberstar.grgit' version '3.1.1'
id 'de.undercouch.download' version '3.3.0' id 'de.undercouch.download' version '3.3.0'
id 'com.github.ben-manes.versions' version '0.20.0' id 'com.github.ben-manes.versions' version '0.22.0'
} }
apply plugin: 'eclipse' apply plugin: 'eclipse'
@ -58,7 +58,7 @@ ext {
MAPPING_CHANNEL = 'snapshot' MAPPING_CHANNEL = 'snapshot'
MAPPING_VERSION = '20190719-1.14.3' MAPPING_VERSION = '20190719-1.14.3'
MC_VERSION = '1.14.4' MC_VERSION = '1.14.4'
MCP_VERSION = '20190719.225934' MCP_VERSION = '20190829.143755'
} }
project(':mcp') { project(':mcp') {
@ -80,7 +80,7 @@ project(':clean') {
} }
dependencies { dependencies {
implementation 'net.minecraftforge:forgespi:0.13.+' implementation 'net.minecraftforge:forgespi:1.1.+'
} }
patcher { patcher {
parent = project(':mcp') parent = project(':mcp')
@ -191,8 +191,8 @@ project(':forge') {
def getVersion = { def getVersion = {
//TAG-offset-hash //TAG-offset-hash
def raw = grgit.describe(longDescr: true) def raw = grgit.describe(longDescr: true, tags:true)
def desc = (raw == null ? '0.0-0-unknown' : grgit.describe(longDescr: true)).split('-') as List def desc = (raw == null ? '0.0-0-unknown' : grgit.describe(longDescr: true, tags:true)).split('-') as List
def hash = desc.remove(desc.size() - 1) def hash = desc.remove(desc.size() - 1)
def offset = desc.remove(desc.size() - 1) def offset = desc.remove(desc.size() - 1)
def tag = desc.join('-') def tag = desc.join('-')
@ -406,20 +406,20 @@ project(':forge') {
installer 'org.ow2.asm:asm-tree:6.2' installer 'org.ow2.asm:asm-tree:6.2'
installer 'cpw.mods:modlauncher:3.2.+' installer 'cpw.mods:modlauncher:3.2.+'
installer 'cpw.mods:grossjava9hacks:1.1.+' installer 'cpw.mods:grossjava9hacks:1.1.+'
installer 'net.minecraftforge:accesstransformers:0.16.+:shadowed' installer 'net.minecraftforge:accesstransformers:1.0.+:shadowed'
installer 'net.minecraftforge:eventbus:0.10.+:service' installer 'net.minecraftforge:eventbus:1.0.+:service'
installer 'net.minecraftforge:forgespi:0.13.+' installer 'net.minecraftforge:forgespi:1.1.+'
installer 'net.minecraftforge:coremods:0.7.+' installer 'net.minecraftforge:coremods:1.0.+'
installer 'net.minecraftforge:unsafe:0.2.+' installer 'net.minecraftforge:unsafe:0.2.+'
installer 'com.electronwill.night-config:core:3.6.0' installer 'com.electronwill.night-config:core:3.6.0'
installer 'com.electronwill.night-config:toml:3.6.0' installer 'com.electronwill.night-config:toml:3.6.0'
installer 'org.jline:jline:3.9.0' installer 'org.jline:jline:3.12.+'
installer 'org.apache.maven:maven-artifact:3.6.0' installer 'org.apache.maven:maven-artifact:3.6.0'
installer 'net.jodah:typetools:0.6.0' installer 'net.jodah:typetools:0.6.0'
installer 'java3d:vecmath:1.5.2' installer 'java3d:vecmath:1.5.2'
installer 'org.apache.logging.log4j:log4j-api:2.11.2' installer 'org.apache.logging.log4j:log4j-api:2.11.2'
installer 'org.apache.logging.log4j:log4j-core:2.11.2' installer 'org.apache.logging.log4j:log4j-core:2.11.2'
installer 'net.minecrell:terminalconsoleappender:1.1.+' installer 'net.minecrell:terminalconsoleappender:1.2.+'
installer 'net.sf.jopt-simple:jopt-simple:5.0.4' installer 'net.sf.jopt-simple:jopt-simple:5.0.4'
fmllauncherImplementation 'com.google.guava:guava:21.0' fmllauncherImplementation 'com.google.guava:guava:21.0'
fmllauncherImplementation 'com.google.code.gson:gson:2.8.0' fmllauncherImplementation 'com.google.code.gson:gson:2.8.0'

5
src/fmllauncher/java/net/minecraftforge/fml/loading/moddiscovery/CoreModFile.java
View File

@ -47,6 +47,11 @@ public class CoreModFile implements ICoreModFile {
return this.internalPath; return this.internalPath;
} }
@Override
public Reader getAdditionalFile(final String fileName) throws IOException {
return Files.newBufferedReader(file.findResource(fileName));
}
@Override @Override
public String getOwnerId() { public String getOwnerId() {
return this.file.getModInfos().get(0).getModId(); return this.file.getModInfos().get(0).getModId();