Skip to content

Commit

Permalink
1.16.3
Browse files Browse the repository at this point in the history
  • Loading branch information
jrbudda committed Sep 16, 2020
1 parent bcd273f commit fe56d92
Show file tree
Hide file tree
Showing 13 changed files with 151,197 additions and 128,617 deletions.
1,569 changes: 1,569 additions & 0 deletions installer/1.16.3.json

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions installer/Installer.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ public class Installer extends JPanel implements PropertyChangeListener
private static final boolean ALLOW_ZGC_INSTALL = true;
private static final boolean ALLOW_HRTF_INSTALL = false;
private static final boolean PROMPT_REMOVE_HRTF = false;
private static final String MINECRAFT_VERSION = "1.16.2";
private static final String MC_VERSION = "1.16.2";
private static final String MC_MD5 = "114f460c5ba72d0dd66a16ed399c0f6d";
private static final String OF_FILE_NAME = "1.16.2_HD_U_G3";
private static final String OF_MD5 = "0ecd18144e547a40dfae70fa58edc842";
private static final String MINECRAFT_VERSION = "1.16.3";
private static final String MC_VERSION = "1.16.3";
private static final String MC_MD5 = "1cc30661bbcf8c25a829f34f7fe16dd1";
private static final String OF_FILE_NAME = "1.16.3_HD_U_G3";
private static final String OF_MD5 = "6f70931e11cd91337988813f270e1891";
private static final String OF_VERSION_EXT = ".jar";
private static String FORGE_VERSION = "33.0.61";
private static String FORGE_VERSION = "34.0.7";
private static final String HOMEPAGE_LINK = "http://www.vivecraft.org";
private static final String DONATION_LINK = "https://www.patreon.com/jrbudda";
private static final String PROJECT_NAME = "Vivecraft";
Expand Down
2 changes: 1 addition & 1 deletion installer/vivecraft-forge.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"--fml.forgeGroup",
"net.minecraftforge",
"--fml.mcpVersion",
"20200812.004259"
"20200911.084530"
]
},
"libraries": [
Expand Down
256 changes: 236 additions & 20 deletions mcppatches/mappings/conf/config.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,242 @@
{
"mcinjector": {
"version": "de.oceanlabs.mcp:mcinjector:3.8.0:fatjar",
"args": ["--in", "{input}", "--out", "{output}", "--log", "{log}", "--level=INFO", "--lvt=LVT", "--exc", "{exceptions}", "--acc", "{access}", "--ctr", "{constructors}"]
"spec": 1,
"version": "1.16.3",
"data": {
"access": "config/access.txt",
"constructors": "config/constructors.txt",
"exceptions": "config/exceptions.txt",
"mappings": "config/joined.tsrg",
"inject": "config/inject/",
"statics": "config/static_methods.txt",
"patches": {
"client": "patches/client/",
"joined": "patches/joined/",
"server": "patches/server/"
}
},
"fernflower": {
"version": "net.minecraftforge:forgeflower:1.5.478.15",
"args": ["-din=1", "-rbr=1", "-dgs=1", "-asc=1", "-rsy=1", "-iec=1", "-jvn=1", "-isl=0", "-iib=1", "-log=TRACE", "-cfg", "{libraries}", "{input}", "{output}"],
"jvmargs": ["-Xmx4G"]
"steps": {
"joined": [
{
"type": "downloadManifest"
},
{
"type": "downloadJson"
},
{
"type": "downloadClient"
},
{
"type": "downloadServer"
},
{
"type": "strip",
"name": "stripClient",
"input": "{downloadClientOutput}"
},
{
"type": "strip",
"name": "stripServer",
"input": "{downloadServerOutput}"
},
{
"type": "merge",
"client": "{stripClientOutput}",
"server": "{stripServerOutput}",
"version": "1.16.3"
},
{
"type": "rename",
"input": "{mergeOutput}"
},
{
"type": "mcinject",
"input": "{renameOutput}"
},
{
"type": "listLibraries"
},
{
"type": "decompile",
"libraries": "{listLibrariesOutput}",
"input": "{mcinjectOutput}"
},
{
"type": "inject",
"input": "{decompileOutput}"
},
{
"type": "patch",
"input": "{injectOutput}"
}
],
"client": [
{
"type": "downloadManifest"
},
{
"type": "downloadJson"
},
{
"type": "downloadClient"
},
{
"type": "strip",
"input": "{downloadClientOutput}"
},
{
"type": "rename",
"input": "{stripOutput}"
},
{
"type": "mcinject",
"input": "{renameOutput}"
},
{
"type": "listLibraries"
},
{
"type": "decompile",
"libraries": "{listLibrariesOutput}",
"input": "{mcinjectOutput}"
},
{
"type": "inject",
"input": "{decompileOutput}"
},
{
"type": "patch",
"input": "{injectOutput}"
}
],
"server": [
{
"type": "downloadManifest"
},
{
"type": "downloadJson"
},
{
"type": "downloadServer"
},
{
"type": "strip",
"input": "{downloadServerOutput}"
},
{
"type": "rename",
"input": "{stripOutput}"
},
{
"type": "mcinject",
"input": "{renameOutput}"
},
{
"type": "listLibraries"
},
{
"type": "decompile",
"libraries": "{listLibrariesOutput}",
"input": "{mcinjectOutput}"
},
{
"type": "inject",
"input": "{decompileOutput}"
},
{
"type": "patch",
"input": "{injectOutput}"
}
]
},
"merge": {
"version": "net.minecraftforge:mergetool:1.1.1:fatjar",
"args": ["--client", "{client}", "--server", "{server}", "--ann", "{version}", "--output", "{output}", "--inject", "false"],
"jvmargs": []
},
"rename": {
"version": "net.md-5:SpecialSource:1.8.3:shaded",
"args": ["--in-jar", "{input}", "--out-jar", "{output}", "--srg-in", "{mappings}"],
"repo": "https://repo1.maven.org/maven2/"
"functions": {
"decompile": {
"version": "net.minecraftforge:forgeflower:1.5.478.15",
"args": [
"-din=1",
"-rbr=1",
"-dgs=1",
"-asc=1",
"-rsy=1",
"-iec=1",
"-jvn=1",
"-isl=0",
"-iib=1",
"-log=TRACE",
"-cfg",
"{libraries}",
"{input}",
"{output}"
],
"jvmargs": [
"-Xmx4G"
],
"repo": "https://files.minecraftforge.net/maven/"
},
"mcinject": {
"version": "de.oceanlabs.mcp:mcinjector:3.8.0:fatjar",
"args": [
"--in",
"{input}",
"--out",
"{output}",
"--log",
"{log}",
"--level=INFO",
"--lvt=LVT",
"--exc",
"{exceptions}",
"--acc",
"{access}",
"--ctr",
"{constructors}"
],
"repo": "https://files.minecraftforge.net/maven/"
},
"merge": {
"version": "net.minecraftforge:mergetool:1.1.1:fatjar",
"args": [
"--client",
"{client}",
"--server",
"{server}",
"--ann",
"{version}",
"--output",
"{output}",
"--inject",
"false"
],
"jvmargs": [

],
"repo": "https://files.minecraftforge.net/maven/"
},
"rename": {
"version": "net.md-5:SpecialSource:1.8.3:shaded",
"args": [
"--in-jar",
"{input}",
"--out-jar",
"{output}",
"--srg-in",
"{mappings}"
],
"repo": "https://repo1.maven.org/maven2/",
"jvmargs": [

]
}
},
"libraries": {
"client": ["com.google.code.findbugs:jsr305:3.0.1"],
"server": ["com.google.code.findbugs:jsr305:3.0.1"],
"joined": ["com.google.code.findbugs:jsr305:3.0.1", "net.minecraftforge:mergetool:1.0.9:api"]
"client": [
"com.google.code.findbugs:jsr305:3.0.1"
],
"server": [
"com.google.code.findbugs:jsr305:3.0.1"
],
"joined": [
"com.google.code.findbugs:jsr305:3.0.1",
"net.minecraftforge:mergetool:1.0.9:api"
]
}
}
}
Loading

0 comments on commit fe56d92

Please sign in to comment.