r2

minecriftversion.py

@@ -5,7 +5,7 @@
 of_file_md5 = "6f70931e11cd91337988813f270e1891"
 of_build_md5 = "9695cbf157a743d4e994a020bbb640b7"
 minecrift_version_num = "1.16.3"
-minecrift_build = "jrbudda-5-1"
+minecrift_build = "jrbudda-5-2"
 of_file_extension = ".jar"
 mcp_version = "mcp940"
 mcp_uses_generics = True

patches/net/minecraft/client/Minecraft.java.patch

@@ -203,7 +203,7 @@
 +	 * The minecriftVerString will be automatically updated by the build scripts, do
 +	 * not modify here. Modify minecriftversion.py in root minecrift dir.
 +	 */
-+    public final String minecriftVerString = "Vivecraft 1.16.3 jrbudda-5-1";
++    public final String minecriftVerString = "Vivecraft 1.16.3 jrbudda-5-2";
 +	/* end version */
 +	/** END MINECRIFT */
      private static final Logger LOGGER = LogManager.getLogger();

patches/net/minecraft/util/Util.java.patch

@@ -0,0 +1,11 @@
+--- a/net/minecraft/util/Util.java
++++ b/net/minecraft/util/Util.java
+@@ -102,7 +102,7 @@
+
+     private static ExecutorService createNamedService(String serviceName)
+     {
+-        int i = MathHelper.clamp(Runtime.getRuntime().availableProcessors() - 1, 1, 7);
++        int i = MathHelper.clamp(Runtime.getRuntime().availableProcessors() - 2, 1, 7); // VIVECRAFT: leave 2 cpu cores available
+         ExecutorService executorservice;
+
+         if (i <= 0)

resources/assets/vivecraft/lang/en_us.lang

@@ -571,6 +571,7 @@ vivecraft.messages.noserverplugin=Vivecraft server mod not detected. This server
 vivecraft.messages.calibrateheight=Please calibrate your height in the pause menu.
 vivecraft.messages.rendersetupfailed=Render setup failed: %s
 vivecraft.messages.intelgraphics=Intel Integrated Graphics are not supported. If this is a laptop, please force the high-performance GPU. Detected GPU: %s
+vivecraft.messages.nosteamvr=OpenVR runtime not detected. Did you install SteamVR?
 vivecraft.messages.menuworldexportcomplete.1=World export complete... area size: %d
 vivecraft.messages.menuworldexportcomplete.2=Saved to %s
 vivecraft.messages.menuworldexportclientwarning=WARNING: Saving menu world using a client world. Data may be incomplete. It is recommended to save menu worlds in singleplayer.

src/org/vivecraft/provider/MCOpenVR.java

@@ -377,7 +377,7 @@ public static boolean init()  throws Exception
 		unpackPlatformNatives();
 
 		if(jopenvr.JOpenVRLibrary.VR_IsHmdPresent() == 0){
-			initStatus =  "VR Headset not detected.";
+			initStatus =  "vivecraft.messages.nosteamvr";
 			return false;
 		}
 

src/org/vivecraft/provider/OpenVRStereoRenderer.java

@@ -504,7 +504,7 @@ public void setupRenderConfiguration() throws Exception
 			}
 
 			if (!isInitialized()) {
-				throw new RenderConfigException(RENDER_SETUP_FAILURE_MESSAGE + getName(), getinitError());
+				throw new RenderConfigException(RENDER_SETUP_FAILURE_MESSAGE + getName(), LangHelper.get(getinitError()));
 			}
 
 			Tuple<Integer, Integer> renderTextureInfo = getRenderTextureSizes();