myraid collection of backports, frontports, sideports and, in one ins…

…tance, an underport
jrbudda · Jun 5, 2019 · 71713f0 · 71713f0
1 parent 7e58cbc
commit 71713f0
Show file tree

Hide file tree

Showing 187 changed files with 6,346 additions and 4,129 deletions.
diff --git a/installer/Installer.java b/installer/Installer.java
@@ -36,7 +36,7 @@ public class Installer extends JPanel  implements PropertyChangeListener
 	private String tempDir = System.getProperty("java.io.tmpdir");
 
 	private static final boolean ALLOW_FORGE_INSTALL = true; 
-	private static final boolean DEFAULT_FORGE_INSTALL = false; 
+	private static final boolean DEFAULT_FORGE_INSTALL = true; 
 	private static final boolean ALLOW_HYDRA_INSTALL = false; 
 	private static final boolean ALLOW_KATVR_INSTALL = true; 
 	private static final boolean ALLOW_KIOSK_INSTALL = true; 
@@ -62,7 +62,7 @@ public class Installer extends JPanel  implements PropertyChangeListener
     private static final String OF_JSON_NAME      = "1.12.2_HD_U_E3";
     private static final String OF_MD5            = "7EC95C57AC1A224D6EB93BD370E4AC37";
     private static final String OF_VERSION_EXT    = ".jar";
-    private static String FORGE_VERSION     = "14.23.5.2796";
+    private static String FORGE_VERSION     = "14.23.5.2838";
 	/* END OF DO NOT RENAME */
 
 	private static final String DEFAULT_PROFILE_NAME = "ViveCraft " + MINECRAFT_VERSION;
@@ -326,7 +326,7 @@ public Installer(File target)
 		Integer[] rams = {1,2,4,6,8};
 
 		ramAllocation = new JComboBox(rams);
-		ramAllocation.setSelectedIndex(1);
+		ramAllocation.setSelectedIndex(2);
 		ramAllocation.setToolTipText(
 				"<html>" +
 						"Select the amount of Ram, in GB to allocate to the Vivecraft profile.<br>" +
@@ -1225,7 +1225,7 @@ public int read(byte[] buff) throws IOException {
 							if(isMultiMC && useForge.isSelected()) {
 								JSONArray tw = (JSONArray) root.get("+tweakers");
 								tw = new JSONArray();
-								tw.put("com.mtbs3d.minecrift.tweaker.MinecriftForgeTweaker");
+								tw.put("org.vivecraft.tweaker.MinecriftForgeTweaker");
 								tw.put("net.minecraftforge.fml.common.launcher.FMLTweaker");
 								tw.put("optifine.OptiFineForgeTweaker");
 								root.put("+tweakers", tw);

diff --git a/installer/vivecraft-1.12.2-forge.json b/installer/vivecraft-1.12.2-forge.json
@@ -10,7 +10,7 @@
 	"mcVersion": "$MCVERSION",
 	"mainClass": "net.minecraft.launchwrapper.Launch",
 	"type": "release",
-	"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --tweakClass com.mtbs3d.minecrift.tweaker.MinecriftForgeTweaker --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker --tweakClass optifine.OptiFineForgeTweaker  --versionType Forge",
+	"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --tweakClass org.vivecraft.tweaker.MinecriftForgeTweaker --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker --tweakClass optifine.OptiFineForgeTweaker  --versionType Forge",
 	"order": 6,
 	"libraries": [
 	{
@@ -31,14 +31,19 @@
 		"clientreq": true
 	},
 	{
-		"name": "jline:jline:2.13",
+		"name": "org.jline:jline:3.5.1",
 		"url": "http://files.minecraftforge.net/maven/",
 		"checksums": [
-		"2d9530d0a25daffaffda7c35037b046b627bb171"
+			"51800e9d7a13608894a5a28eed0f5c7fa2f300fb"
 		],
 		"serverreq": true,
 		"clientreq": false
 	},
+	{
+		"name": "net.java.dev.jna:jna:4.4.0",
+		"serverreq": true,
+		"clientreq": false
+	},
 	{
 		"name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
 		"url": "http://files.minecraftforge.net/maven/",

diff --git a/installer/vivecraft-1.12.2-multimc.json b/installer/vivecraft-1.12.2-multimc.json
@@ -1,7 +1,7 @@
 {
 	"+tweakers": [
 	"optifine.OptiFineTweaker",
-	"com.mtbs3d.minecrift.tweaker.MinecriftVanillaTweaker"
+	"org.vivecraft.tweaker.MinecriftVanillaTweaker"
 	],
 	"libraries": [
 	{

diff --git a/installer/vivecraft-1.12.2.json b/installer/vivecraft-1.12.2.json
@@ -10,7 +10,7 @@
 	"mcVersion": "$MCVERSION",
 	"mainClass": "net.minecraft.launchwrapper.Launch",
 	"jar": "$MCVERSION",
-	"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --versionType ${version_type} --tweakClass optifine.OptiFineTweaker --tweakClass com.mtbs3d.minecrift.tweaker.MinecriftVanillaTweaker",
+	"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --versionType ${version_type} --tweakClass optifine.OptiFineTweaker --tweakClass org.vivecraft.tweaker.MinecriftVanillaTweaker",
 	"order": 6,
 	"libraries": [
 	{

diff --git a/minecriftversion.py b/minecriftversion.py
@@ -4,9 +4,9 @@
 of_json_name = "1.12.2_HD_U_E3"
 of_file_md5 = "7EC95C57AC1A224D6EB93BD370E4AC37"
 minecrift_version_num = "1.12.2"
-minecrift_build = "jrbudda-7-r11"
+minecrift_build = "jrbudda-8-b3"
 of_file_extension = ".jar"
 mcp_version = "mcp940"
 mcp_uses_generics = True
 mcp_download_url = "http://www.modcoderpack.com/files/mcp940.zip"
-forge_version = "14.23.5.2796"
+forge_version = "14.23.5.2838"
diff --git a/patches/net/minecraft/client/LoadingScreenRenderer.java.patch b/patches/net/minecraft/client/LoadingScreenRenderer.java.patch
@@ -1,14 +1,6 @@
 --- a/net/minecraft/client/LoadingScreenRenderer.java
 +++ b/net/minecraft/client/LoadingScreenRenderer.java
-@@ -1,5 +1,7 @@
- package net.minecraft.client;
-
-+import com.mtbs3d.minecrift.gameplay.screenhandlers.GuiHandler;
-+
- import net.minecraft.client.gui.Gui;
- import net.minecraft.client.gui.ScaledResolution;
- import net.minecraft.client.renderer.BufferBuilder;
-@@ -226,7 +228,7 @@
+@@ -226,7 +226,7 @@
 
                  if (OpenGlHelper.isFramebufferEnabled())
                  {