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

Merge pull request #177 from jellysquid3/1.12

Browse Source 
Do not parse Mobends configuration every time an entity is rendered
This commit is contained in:
Tschipp 2019-05-20 14:01:51 +02:00 committed by GitHub
commit 033747916b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,6 +58,8 @@ import tschipp.carryon.network.server.SyncKeybindPacket;
public class RenderEvents
{
private boolean obfuscatePresent = Loader.isModLoaded("obfuscate");
private static boolean initModels;
/*
@ -450,7 +452,7 @@ public class RenderEvents
if(!CarryOnConfig.settings.renderArms)
return;
if (handleMobends() && !Loader.isModLoaded("obfuscate"))
if (handleMobends() && !obfuscatePresent)
{
EntityPlayer player = event.getEntityPlayer();
EntityPlayerSP clientPlayer = Minecraft.getMinecraft().player;
@ -547,7 +549,7 @@ public class RenderEvents
if(!CarryOnConfig.settings.renderArms)
return;
if (handleMobends() && !Loader.isModLoaded("obfuscate"))
if (handleMobends() && !obfuscatePresent)
{
EntityPlayer player = event.getEntityPlayer();
ItemStack stack = player.getHeldItemMainhand();
@ -619,16 +621,23 @@ public class RenderEvents
arm.isHidden = true;
}
private boolean mobendsPresent = Loader.isModLoaded("mobends");
private boolean mobendsConfigLoaded = false;
private boolean mobendsPlayersAnimated = false;
public boolean handleMobends()
{
if (Loader.isModLoaded("mobends"))
if (mobendsPresent && !mobendsConfigLoaded)
{
Configuration config = new Configuration(new File(CarryOn.CONFIGURATION_FILE.getPath().substring(0, CarryOn.CONFIGURATION_FILE.getPath().length() - 16), "mobends.cfg"));
boolean renderPlayer = config.get("animated", "player", true).getBoolean();
return !renderPlayer;
mobendsPlayersAnimated = config.get("animated", "player", true).getBoolean();
mobendsConfigLoaded = true;
}
return true;
return !mobendsPlayersAnimated;
}
public static boolean isChest(Block block)