Created
September 16, 2012 18:36
-
-
Save DjDCH/3733669 to your computer and use it in GitHub Desktop.
Diff result after modding the Minecraft client 1.3.2 for incorporating the saturation bar.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -ru src/minecraft/net/minecraft/src/GuiIngame.java src/minecraft/net/minecraft/src/GuiIngame.java | |
--- src/minecraft/net/minecraft/src/GuiIngame.java 2012-09-14 13:11:27.000000000 -0400 | |
+++ src/minecraft/net/minecraft/src/GuiIngame.java 2012-09-14 14:42:20.000000000 -0400 | |
@@ -109,6 +109,7 @@ | |
FoodStats var15 = this.mc.thePlayer.getFoodStats(); | |
var16 = var15.getFoodLevel(); | |
var17 = var15.getPrevFoodLevel(); | |
+ int var97 = (int)var15.getSaturationLevel(); | |
this.mc.mcProfiler.startSection("bossHealth"); | |
this.renderBossHealth(); | |
this.mc.mcProfiler.endSection(); | |
@@ -136,6 +137,7 @@ | |
var47 = var7 - 39; | |
var22 = var47 - 10; | |
+ int var98 = var22 - 10; | |
var23 = this.mc.thePlayer.getTotalArmorValue(); | |
int var24 = -1; | |
@@ -284,6 +286,28 @@ | |
} | |
} | |
+ this.mc.mcProfiler.endStartSection("saturation"); | |
+ | |
+ for (int var99 = 0; var99 < 10; ++var99) | |
+ { | |
+ var26 = var22; | |
+ var52 = 16; | |
+ byte var53 = 0; | |
+ | |
+ var29 = var19 - var99 * 8 - 9; | |
+ this.drawTexturedModalRect(var29, var26, 16 + var53 * 9, 27, 9, 9); | |
+ | |
+ if (var99 * 2 + 1 < var97) | |
+ { | |
+ this.drawTexturedModalRect(var29, var26, var52 + 36 + 18, 27, 9, 9); | |
+ } | |
+ | |
+ if (var99 * 2 + 1 == var97) | |
+ { | |
+ this.drawTexturedModalRect(var29, var26, var52 + 45 + 18, 27, 9, 9); | |
+ } | |
+ } | |
+ | |
this.mc.mcProfiler.endStartSection("air"); | |
if (this.mc.thePlayer.isInsideOfMaterial(Material.water)) | |
@@ -296,11 +320,11 @@ | |
{ | |
if (var28 < var26) | |
{ | |
- this.drawTexturedModalRect(var19 - var28 * 8 - 9, var22, 16, 18, 9, 9); | |
+ this.drawTexturedModalRect(var19 - var28 * 8 - 9, var98, 16, 18, 9, 9); | |
} | |
else | |
{ | |
- this.drawTexturedModalRect(var19 - var28 * 8 - 9, var22, 25, 18, 9, 9); | |
+ this.drawTexturedModalRect(var19 - var28 * 8 - 9, var98, 25, 18, 9, 9); | |
} | |
} | |
} | |
diff -ru src/minecraft/net/minecraft/src/GuiNewChat.java src/minecraft/net/minecraft/src/GuiNewChat.java | |
--- src/minecraft/net/minecraft/src/GuiNewChat.java 2012-09-14 13:11:27.000000000 -0400 | |
+++ src/minecraft/net/minecraft/src/GuiNewChat.java 2012-09-14 13:52:13.000000000 -0400 | |
@@ -85,7 +85,7 @@ | |
{ | |
byte var13 = 3; | |
int var14 = -var7 * 9; | |
- drawRect(var13, var14 - 1, var13 + 320 + 4, var14 + 8, var12 / 2 << 24); | |
+ drawRect(var13, var14 - 1 - 10, var13 + 320 + 4, var14 + 8 - 10, var12 / 2 << 24); | |
GL11.glEnable(GL11.GL_BLEND); | |
String var15 = var8.getChatLineString(); | |
@@ -94,7 +94,7 @@ | |
var15 = StringUtils.stripControlCodes(var15); | |
} | |
- this.mc.fontRenderer.drawStringWithShadow(var15, var13, var14, 16777215 + (var12 << 24)); | |
+ this.mc.fontRenderer.drawStringWithShadow(var15, var13, var14 - 10, 16777215 + (var12 << 24)); | |
} | |
} | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment