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

Merge remote-tracking branch 'origin/1.12' into 1.12

Browse Source
This commit is contained in:
Tschipp 2019-06-26 16:02:49 +02:00
commit 2b864fd7fe
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,6 +62,8 @@ import tschipp.carryon.network.server.SyncKeybindPacket;
public class RenderEvents public class RenderEvents
{ {
private boolean obfuscatePresent = Loader.isModLoaded("obfuscate");
private static boolean initModels; private static boolean initModels;
/* /*
@ -632,16 +634,23 @@ public class RenderEvents
arm.isHidden = true; arm.isHidden = true;
} }
private boolean mobendsPresent = Loader.isModLoaded("mobends");
private boolean mobendsConfigLoaded = false;
private boolean mobendsPlayersAnimated = false;
public boolean handleMobends() 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")); 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(); mobendsPlayersAnimated = config.get("animated", "player", true).getBoolean();
return !renderPlayer; mobendsConfigLoaded = true;
} }
return true;
return !mobendsPlayersAnimated;
} }
public static boolean isChest(Block block) public static boolean isChest(Block block)