R3944Realms/CarryOn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.12

Browse Source
This commit is contained in:
Tschipp 2018-07-06 16:38:23 +02:00
commit 9025c53a35
2 changed files with 62 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/tschipp/carryon/client/event/RenderEvents.java
View File

@ -272,7 +272,6 @@ public class RenderEvents
event.setCanceled(true); event.setCanceled(true);
} }
GlStateManager.scale(1, 1, 1); GlStateManager.scale(1, 1, 1);
GlStateManager.popMatrix(); GlStateManager.popMatrix();
@ -286,6 +285,11 @@ public class RenderEvents
RenderManager manager = mc.getRenderManager(); RenderManager manager = mc.getRenderManager();
RenderPlayer renderPlayer = manager.getSkinMap().get(aplayer.getSkinType()); RenderPlayer renderPlayer = manager.getSkinMap().get(aplayer.getSkinType());
ModelPlayer modelPlayer = renderPlayer.getMainModel(); ModelPlayer modelPlayer = renderPlayer.getMainModel();
if (modelPlayer != null)
{
if (modelPlayer.bipedLeftArm != null && modelPlayer.bipedRightArm != null)
{
modelPlayer.bipedLeftArm.isHidden = false; modelPlayer.bipedLeftArm.isHidden = false;
modelPlayer.bipedRightArm.isHidden = false; modelPlayer.bipedRightArm.isHidden = false;
modelPlayer.bipedLeftArmwear.isHidden = false; modelPlayer.bipedLeftArmwear.isHidden = false;
@ -293,7 +297,8 @@ public class RenderEvents
} }
} }
} }
}
}
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
private int getBrightnessForRender(EntityPlayer player) private int getBrightnessForRender(EntityPlayer player)

7
src/main/java/tschipp/carryon/common/config/Configs.java
View File

@ -139,8 +139,11 @@ public class Configs {
"skyresources:*", "skyresources:*",
"lootbags:*", "lootbags:*",
"exsartagine:*", "exsartagine:*",
"aquamunda:tank" "aquamunda:tank",
"opencomputers:*",
"malisisdoors:*",
"industrialforegoing:*",
"minecolonies:*",
}; };
@Config.RequiresMcRestart() @Config.RequiresMcRestart()