Skip to content

Commit

Permalink
10 final
Browse files Browse the repository at this point in the history
  • Loading branch information
@jrbudda
jrbudda committed Jun 9, 2017
1 parent 772c9f7 commit a802452
Show file tree
Hide file tree
Showing 7 changed files with 89 additions and 64 deletions.
2 changes: 1 addition & 1 deletion minecriftversion.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
of_json_name = "1.10.2_HD_U_D8"
of_file_md5 = "d2a99a8d96d1067cb9e384bbdc560c70"
minecrift_version_num = "1.10.2"
minecrift_build = "jrbudda-10pre7"
minecrift_build = "jrbudda-10-final"
of_file_extension = ".jar"
mcp_version = "mcp931"
mcp_uses_generics = True
Expand Down
2 changes: 1 addition & 1 deletion patches/net/minecraft/client/Minecraft.java.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,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.10.2 jrbudda-10pre7";
+ public final String minecriftVerString = "Vivecraft 1.10.2 jrbudda-10-final";
+ /* end version */
+ /** END MINECRIFT */
+
Expand Down
19 changes: 9 additions & 10 deletions patches/net/minecraft/client/gui/GuiIngameMenu.java.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

public class GuiIngameMenu extends GuiScreen
{
@@ -17,25 +24,42 @@
@@ -17,24 +24,42 @@
* window resizes, the buttonList is cleared beforehand.
*/
public void initGui()
Expand All @@ -29,6 +29,11 @@
- int i = -16;
- int j = 98;
- this.buttonList.add(new GuiButton(1, this.width / 2 - 100, this.height / 4 + 120 + -16, I18n.format("menu.returnToMenu", new Object[0])));
-
- if (!this.mc.isIntegratedServerRunning())
- {
- ((GuiButton)this.buttonList.get(0)).displayString = I18n.format("menu.disconnect", new Object[0]);
- }
+ {
+ this.saveStep = 0;
+ KeyBinding.unPressAllKeys();
Expand Down Expand Up @@ -64,23 +69,17 @@
+ this.buttonList.add(new GuiButton(5, this.width / 2 - 100, this.height / 4 + 48 + var1, 98, 20, I18n.format("gui.achievements", new Object[0])));
+ this.buttonList.add(new GuiButton(6, this.width / 2 + 2, this.height / 4 + 48 + var1, 98, 20, I18n.format("gui.stats", new Object[0])));

- if (!this.mc.isIntegratedServerRunning())
- {
- ((GuiButton)this.buttonList.get(0)).displayString = I18n.format("menu.disconnect", new Object[0]);
- }
-
- this.buttonList.add(new GuiButton(4, this.width / 2 - 100, this.height / 4 + 24 + -16, I18n.format("menu.returnToGame", new Object[0])));
- this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 4 + 96 + -16, 98, 20, I18n.format("menu.options", new Object[0])));
- GuiButton guibutton = this.addButton(new GuiButton(7, this.width / 2 + 2, this.height / 4 + 96 + -16, 98, 20, I18n.format("menu.shareToLan", new Object[0])));
- guibutton.enabled = this.mc.isSingleplayer() && !this.mc.getIntegratedServer().getPublic();
- this.buttonList.add(new GuiButton(5, this.width / 2 - 100, this.height / 4 + 48 + -16, 98, 20, I18n.format("gui.achievements", new Object[0])));
- this.buttonList.add(new GuiButton(6, this.width / 2 + 2, this.height / 4 + 48 + -16, 98, 20, I18n.format("gui.stats", new Object[0])));
- }
+ var3.enabled = this.mc.isSingleplayer() && !this.mc.getIntegratedServer().getPublic();}
+ var3.enabled = this.mc.isSingleplayer() && !this.mc.getIntegratedServer().getPublic() && !Reflector.forgeExists();
}

/**
* Called by the controls from the buttonList when activated. (Mouse pressed for buttons)
@@ -71,27 +95,64 @@
@@ -71,27 +96,64 @@

case 2:
case 3:
Expand Down
44 changes: 25 additions & 19 deletions patches/net/minecraft/client/renderer/EntityRenderer.java.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,7 @@
- }
- }
-
+ boolean shadersMod = Config.isShaders();
+ boolean shadersMod = Config.isShaders() && this.okshader;
+
+ if(shadersMod){
+ //Shaders.readCenterDepth();
Expand Down Expand Up @@ -1175,10 +1175,11 @@
this.mc.getTextureManager().bindTexture(this.locationLightMap);
GlStateManager.glTexParameteri(3553, 10241, 9729);
GlStateManager.glTexParameteri(3553, 10240, 9729);
@@ -1221,707 +1313,814 @@
@@ -1220,708 +1312,819 @@
}
}

public float getNightVisionBrightness(EntityLivingBase entitylivingbaseIn, float partialTicks)
- public float getNightVisionBrightness(EntityLivingBase entitylivingbaseIn, float partialTicks)
- {
- int i = entitylivingbaseIn.getActivePotionEffect(MobEffects.NIGHT_VISION).getDuration();
- return i > 200 ? 1.0F : 0.7F + MathHelper.sin(((float)i - partialTicks) * (float)Math.PI * 0.2F) * 0.3F;
Expand Down Expand Up @@ -1652,6 +1653,7 @@
-
- renderglobal.renderBlockLayer(BlockRenderLayer.CUTOUT, (double)partialTicks, pass, entity);
- this.mc.getTextureManager().getTexture(TextureMap.LOCATION_BLOCKS_TEXTURE).restoreLastBlurMipmap();
+ public float getNightVisionBrightness(EntityLivingBase entitylivingbaseIn, float partialTicks)
+ {
+ int i = entitylivingbaseIn.getActivePotionEffect(MobEffects.NIGHT_VISION).getDuration();
+ return i > 200 ? 1.0F : 0.7F + MathHelper.sin(((float)i - partialTicks) * (float)Math.PI * 0.2F) * 0.3F;
Expand Down Expand Up @@ -2565,13 +2567,15 @@
+ if(!mc.bowTracker.isDrawing){
+ renderGuiLayer(partialTicks);
+ if(mc.currentScreen !=null && !mc.vrSettings.hudOcclusion){
+ okshader = false;
+ this.enableLightmap();
+ RenderHelper.enableStandardItemLighting();
+ itemRenderer.setLightmap();
+ GlStateManager.enableRescaleNormal();
+ this.renderHand(partialTicks, 0);
+ this.renderLeftHand(partialTicks);
+ this.disableLightmap();
+ okshader = true;
+ }
+ }
+
Expand All @@ -2584,6 +2588,8 @@
+
+ }
+
+ private boolean okshader = true;
+
+ private void renderCloudsCheck(RenderGlobal renderGlobalIn, float partialTicks, int pass, double p_180437_4_, double p_180437_6_, double p_180437_8_)
{
if (this.mc.gameSettings.renderDistanceChunks >= 4 && !Config.isCloudsOff() && Shaders.shouldRenderClouds(this.mc.gameSettings))
Expand Down Expand Up @@ -2632,7 +2638,7 @@
private void addRainParticles()
{
float f = this.mc.world.getRainStrength(1.0F);
@@ -2013,7 +2212,7 @@
@@ -2013,7 +2216,7 @@
if (Reflector.ForgeWorldProvider_getWeatherRenderer.exists())
{
WorldProvider worldprovider = this.mc.world.provider;
Expand All @@ -2641,7 +2647,7 @@

if (object != null)
{
@@ -2216,7 +2415,7 @@
@@ -2216,7 +2419,7 @@
double d0 = MathHelper.sin(world.getCelestialAngleRadians(partialTicks)) > 0.0F ? -1.0D : 1.0D;
Vec3d vec3d2 = new Vec3d(d0, 0.0D, 0.0D);
float f5 = (float)entity.getLook(partialTicks).dotProduct(vec3d2);
Expand All @@ -2650,7 +2656,7 @@
if (f5 < 0.0F)
{
f5 = 0.0F;
@@ -2260,8 +2459,9 @@
@@ -2260,8 +2463,9 @@
this.fogColorBlue *= f11;
}

Expand All @@ -2662,7 +2668,7 @@
if (this.cloudFog)
{
Vec3d vec3d3 = world.getCloudColour(partialTicks);
@@ -2269,7 +2469,7 @@
@@ -2269,7 +2473,7 @@
this.fogColorGreen = (float)vec3d3.yCoord;
this.fogColorBlue = (float)vec3d3.zCoord;
}
Expand All @@ -2671,7 +2677,7 @@
{
float f12 = 0.0F;

@@ -2295,7 +2495,7 @@
@@ -2295,7 +2499,7 @@
this.fogColorBlue = (float)vec3d4.zCoord;
}
}
Expand All @@ -2680,7 +2686,7 @@
{
this.fogColorRed = 0.6F;
this.fogColorGreen = 0.1F;
@@ -2373,16 +2573,15 @@
@@ -2373,16 +2577,15 @@
this.fogColorBlue = f7;
}

Expand All @@ -2705,7 +2711,7 @@
}

/**
@@ -2396,7 +2595,13 @@
@@ -2396,7 +2599,13 @@
GlStateManager.glFog(2918, this.setFogColorBuffer(this.fogColorRed, this.fogColorGreen, this.fogColorBlue, 1.0F));
GlStateManager.glNormal3f(0.0F, -1.0F, 0.0F);
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
Expand All @@ -2720,7 +2726,7 @@
float f = -1.0F;

if (Reflector.ForgeHooksClient_getFogDensity.exists())
@@ -2456,7 +2661,7 @@
@@ -2456,7 +2665,7 @@

GlStateManager.setFogDensity(0.1F);
}
Expand All @@ -2729,7 +2735,7 @@
{
if (Config.isShaders())
{
@@ -2488,7 +2693,7 @@
@@ -2488,7 +2697,7 @@
GlStateManager.setFogDensity(0.02F);
}
}
Expand All @@ -2738,7 +2744,7 @@
{
if (Config.isShaders())
{
@@ -2550,12 +2755,24 @@
@@ -2550,12 +2759,24 @@
Reflector.callVoid(Reflector.ForgeHooksClient_onFogRender, new Object[] {this, entity, iblockstate, Float.valueOf(partialTicks), Integer.valueOf(startCoords), Float.valueOf(f1)});
}
}
Expand All @@ -2764,7 +2770,7 @@
/**
* Update and return fogColorBuffer with the RGBA values passed as arguments
*/
@@ -2572,6 +2789,12 @@
@@ -2572,6 +2793,12 @@
return this.fogColorBuffer;
}

Expand All @@ -2777,7 +2783,7 @@
public MapItemRenderer getMapItemRenderer()
{
return this.theMapItemRenderer;
@@ -2716,10 +2939,12 @@
@@ -2716,10 +2943,12 @@
this.updatedWorld = world;
}

Expand All @@ -2794,7 +2800,7 @@
}

private void frameFinish()
@@ -2743,39 +2968,6 @@
@@ -2743,39 +2972,6 @@
}
}

Expand Down Expand Up @@ -2834,7 +2840,7 @@
public boolean setFxaaShader(int p_setFxaaShader_1_)
{
if (!OpenGlHelper.isFramebufferEnabled())
@@ -2815,75 +3007,6 @@
@@ -2815,75 +3011,6 @@
}
}

Expand Down Expand Up @@ -2910,7 +2916,7 @@
public static void drawNameplate(FontRenderer fontRendererIn, String str, float x, float y, float z, int verticalShift, float viewerYaw, float viewerPitch, boolean isThirdPersonFrontal, boolean isSneaking)
{
GlStateManager.pushMatrix();
@@ -2927,4 +3050,2340 @@
@@ -2927,4 +3054,2340 @@
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
GlStateManager.popMatrix();
}
Expand Down Expand Up @@ -3883,7 +3889,7 @@
+ // VIVE START - render functions
+ public void renderLeftHand(float nano)
+ {
+ boolean shadersMod = Config.isShaders();
+ boolean shadersMod = Config.isShaders() && this.okshader;
+ boolean shadersModShadowPass = false;
+
+ //from player face to HMD
Expand Down
11 changes: 11 additions & 0 deletions patches/shadersmod/client/GuiShaders.java.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,14 @@
this.buttonList.add(new GuiButtonEnumShaderOption(EnumShaderOption.NORMAL_MAP, k, 1 * i1 + l, i, j));
this.buttonList.add(new GuiButtonEnumShaderOption(EnumShaderOption.SPECULAR_MAP, k, 2 * i1 + l, i, j));
this.buttonList.add(new GuiButtonEnumShaderOption(EnumShaderOption.RENDER_RES_MUL, k, 3 * i1 + l, i, j));
@@ -80,6 +80,10 @@
{
guibutton.enabled = flag;
}
+ if (guibutton.id == EnumShaderOption.RENDER_RES_MUL.ordinal())
+ {
+ guibutton.enabled = false;
+ }
}
}

Loading

0 comments on commit a802452

Please sign in to comment.