diff --git a/installer/Installer.java b/installer/Installer.java index 830332e2..855cb306 100644 --- a/installer/Installer.java +++ b/installer/Installer.java @@ -899,8 +899,7 @@ public Void doInBackground() } if (checkedRedists && !redistSuccess) { - monitor.close(); - return null; + JOptionPane.showMessageDialog(null, "Could not download VC++ Redist. Game might not work.", "Warning", JOptionPane.INFORMATION_MESSAGE); } finalMessage = "Failed: Couldn't download Optifine. "; @@ -1234,7 +1233,7 @@ public Installer(File targetDir) logoLabel.setAlignmentX(CENTER_ALIGNMENT); logoLabel.setAlignmentY(CENTER_ALIGNMENT); logoLabel.setSize(image.getWidth(), image.getHeight()); - if (!QUIET_DEV && false) // VIVE - hide oculus logo + if (!QUIET_DEV) // VIVE - hide oculus logo logoSplash.add(logoLabel); } catch (IOException e) { } catch( IllegalArgumentException e) { @@ -1418,7 +1417,7 @@ public Installer(File targetDir) this.add(Box.createVerticalGlue()); JLabel github = linkify("Vivecraft is open source. find it on Github","https://github.com/jrbudda/minecrift/releases","Vivecraft Github"); - JLabel wiki = linkify("Vivecraft wiki page","https://www.reddit.com/r/Vive/wiki/minecrift_for_vive","Reddit Vivecraft Wiki"); + JLabel wiki = linkify("Vivecraft home page","http://www.vivecraft.org","Vivecraft Home"); JLabel donate = linkify("If you think Vivecraft is awesome, please consider donating.","https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=JVBJLN5HJJS52&lc=US&item_name=jrbudda¤cy_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted)","jrbudda's Paypal"); JLabel optifine = linkify("Vivecraft includes OptiFine for performance. Consider donating to them as well.","http://optifine.net/donate.php","http://optifine.net/donate.php"); diff --git a/installer/installer.jar b/installer/installer.jar index bdb2f566..c713e089 100644 Binary files a/installer/installer.jar and b/installer/installer.jar differ diff --git a/installer/logo.png b/installer/logo.png index cd655e1b..1e847fa6 100644 Binary files a/installer/logo.png and b/installer/logo.png differ diff --git a/patches/net/minecraft/client/renderer/EntityRenderer.java.patch b/patches/net/minecraft/client/renderer/EntityRenderer.java.patch index 40294070..5452ca6c 100644 --- a/patches/net/minecraft/client/renderer/EntityRenderer.java.patch +++ b/patches/net/minecraft/client/renderer/EntityRenderer.java.patch @@ -85,7 +85,7 @@ import net.minecraft.potion.Potion; import net.minecraft.server.integrated.IntegratedServer; import net.minecraft.src.Config; -@@ -61,2593 +98,4843 @@ +@@ -61,2593 +98,4842 @@ import net.minecraft.world.World; import net.minecraft.world.WorldProvider; import net.minecraft.world.biome.BiomeGenBase; @@ -2468,6 +2468,24 @@ + Reflector.callVoid(Reflector.ForgeHooksClient_setRenderPass, new Object[] {Integer.valueOf(-1)}); + } + ++ this.mc.mcProfiler.endStartSection("hands"); //our hands are really entity-ish after all ++ if (this.mc.gameSettings.thirdPersonView == 0) //Vivecraft ignore this setting -> && this.mc.vrSettings.renderFullFirstPersonModelMode == VRSettings.RENDER_FIRST_PERSON_HAND) ++ { ++ ++ if (false){//Vivecraft nope leave my hands alone. shadersMod) , you're handled in the individual methods. ++ //ShadersRender.renderHand1(this, par1, var13); ++ //Shaders.renderCompositeFinal(); ++ //GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT); // Minecrift - Don't clear depth buffer ++ //ShadersRender.renderFPOverlay(this, par1, var13); ++ Reflector.callVoid(Reflector.ShadersMod_Shaders_renderHand0, new Object[] {this, par1, 0}); ++ Reflector.callVoid(Reflector.ShadersMod_Shaders_renderHand1, new Object[] {this, par1, 0}); ++ } ++ else { ++ this.renderHand(par1, 0); ++ this.renderLeftHand(par1); ++ } ++ } ++ + RenderHelper.disableStandardItemLighting(); + this.disableLightmap((double)par1); + GL11.glPopMatrix(); @@ -2504,25 +2522,6 @@ + rg.drawBlockDamageTexture(Tessellator.instance, player, par1); + GL11.glDisable(GL11.GL_BLEND); + -+ this.mc.mcProfiler.endStartSection("hands"); -+ if (this.mc.gameSettings.thirdPersonView == 0) //Vivecraft ignore this setting -> && this.mc.vrSettings.renderFullFirstPersonModelMode == VRSettings.RENDER_FIRST_PERSON_HAND) -+ { -+ -+ if (false){//Vivecraft nope leave my hands alone. shadersMod) , you're handled in the individual methods. -+ //ShadersRender.renderHand1(this, par1, var13); -+ //Shaders.renderCompositeFinal(); -+ //GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT); // Minecrift - Don't clear depth buffer -+ //ShadersRender.renderFPOverlay(this, par1, var13); -+ Reflector.callVoid(Reflector.ShadersMod_Shaders_renderHand0, new Object[] {this, par1, 0}); -+ Reflector.callVoid(Reflector.ShadersMod_Shaders_renderHand1, new Object[] {this, par1, 0}); -+ } -+ else { -+ this.renderHand(par1, 0); -+ this.renderLeftHand(par1); -+ } -+ } -+ -+ + this.mc.mcProfiler.endStartSection("litParticles"); + this.enableLightmap((double)par1); +