emergency: hitboxes crashes on disabling. Fixed this.
This commit is contained in:
parent
d887b3ba78
commit
09a0a64025
3
.vscode/settings.json
vendored
Normal file
3
.vscode/settings.json
vendored
Normal file
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"java.dependency.packagePresentation": "hierarchical"
|
||||
}
|
0
MakeOfflineDownload.sh
Normal file → Executable file
0
MakeOfflineDownload.sh
Normal file → Executable file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -50,38 +50,14 @@ ${classes_js}
|
|||
|
||||
window.eaglercraftXOpts.assetsURI = ${assets_epk};
|
||||
|
||||
var launchInterval = -1;
|
||||
var launchCounter = 1;
|
||||
var launchCountdownNumberElement = null;
|
||||
var launchCountdownProgressElement = null;
|
||||
|
||||
function launchTick() {
|
||||
launchCountdownNumberElement.innerText = "" + Math.floor(6.0 - launchCounter * 0.06);
|
||||
launchCountdownProgressElement.style.width = "" + launchCounter + "%";
|
||||
if(++launchCounter > 100) {
|
||||
clearInterval(launchInterval);
|
||||
setTimeout(() => { document.getElementById("launch_countdown_screen").remove(); main(); }, 50);
|
||||
}
|
||||
}
|
||||
|
||||
window.addEventListener("load", () => {
|
||||
launchCountdownNumberElement = document.getElementById("launchCountdownNumber");
|
||||
launchCountdownProgressElement = document.getElementById("launchCountdownProgress");
|
||||
launchInterval = setInterval(launchTick, 50);
|
||||
});
|
||||
|
||||
</script>
|
||||
<link type="image/png" rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAR/SURBVEhLtZXZK3ZRFMYPcqXc+gv413DHxVuGIpIhkciQWaRccCNjSCkligwXSOZ5nmfv9zvn2e8+58V753sudmuvvdZ61l5r7XOc8H+GS/D19aUNkPz5+aktQH5/f//4+LBKZKuRkpUtQjCUYG5gD2T38vLy/PwsDfL9/f3Dw8PT05M0b29vnKLhCKCBT4L4gvBLBIei4//4+Hh1dUVEQutUuLu7E83FxQUGnKLBWKfQaA3S+AREVxaEOD8/Pzk50XpzcyMDcH19zdZG3N3d3dzc3Nvb01aX5pQUpQGGQJxcQpfNysoKhUIdHR1o1tbWbInYAgxIPDMzMy8vLzc3FxqOdMoRqwJK8G8ALUYIhHMiSEhIwI6CyIb0qQzC4eGhsXCc1tZWnZIEKzdQJQSXgKxfX18RCM3Z5eWlcfVAxKOjo+Pj49PTU88lTOk2NjbMsePc3t6SAfcgFdszOyMuAdeBg0CQi2lhYUHOeOLDCisN8FzcPFZXV3t7ezHY3t5GQ+6it+2xMASsKhEEWKsmRLRBBUpPvpJ/TpFKFBwKYAiITmicsbYhdHfJAltqhUCVsCQhwslmeXmZxiBQT9c0Ar9E2O3v72sYSE0N1yQArkKy0kBMXLqlZqIZHR3t6empqqqSDcBdhXEJSJ/bUc3q6uq+vj629GB9fR1WsLW1NTs7u7S0RN2locMjIyOEm5ubQ7+4uJienk4/+vv77Y1hwhLBEKhwWHitdVFfX9/Y2Gg2HuLi4owUAysrK8yCG97rh0+ApP5Q2ZycHFlPTExUVFRIBvn5+WhKSkp2dnaMKhptbW2426GgQ/rwuAQCZ1hwFayLiork9hMFBQV1dXVmE0BLS4vqw3QFB8kn4IAxoGPkYpxi4FeDmpqas7Mz4pClAgqGwD48rjY2NmacYqC0tJQ1KSlJWyE5OZkpUKkBAxZVIntAoZh04+Q48fHxPNGBgYHExMT29naj9cBodnZ2mo3jlJWVMeW2OGQck4B1amqqoaGhqamJjx2lGxwcpL0mUgR8fJhsWqJtSkoKU2SbHHUDpkhPBujd8xuQG6PJRM/Pz09PT7O1NNnZ2Tw3fgZkXVhYKCUlUhBATP+hCVyKZGky17RV0g04laayslJ6hlVeFHB4eFhKaogGd0LxtmTgE+hbhKDnPjMzgw8E3qGL2tpaBWpubjYqj2BoaEj6rq4uNATRZ0ZwCbiL6gXEzINk5vCBQJ9rMD4+rkA8QNK036uDg4Py8vLu7m680KjIBNR3zBDoWQM1g98snyB+VSoRW8C/UwR81/SvhgNj9JOTkwwVERUdRBEI0BAdLRVERkhLS8vIyEDQlrsTPTU1lVFhKxARvZgUlFLbegCf4BvIsbi4mIg4E5EogIHhiKCMtU0WUFiVy06j5fAJIDdSBDQw+PegDfBRcbOPwH4F9LuFWIIQdQNKwWqzIE0aoFUaBsw+SQuFw0uNtC9A+F4i3QNrbg3IDn+SAsHh+wYiEpeyBEMLv/cAO6KzAijxxB+Y4wisBhssJUhjEbPJf4Nw+B+JXqLW3bw+wQAAAABJRU5ErkJggg==" />
|
||||
</head>
|
||||
<body style="margin:0px;width:100vw;height:100vh;overflow:hidden;" id="game_frame">
|
||||
<div style="margin:0px;width:100%;height:100%;font-family:sans-serif;display:flex;align-items:center;user-select:none;" id="launch_countdown_screen">
|
||||
<div style="margin:auto;text-align:center;">
|
||||
<h1>This file is from <span style="color:#AA0000;">${date}</span></h1>
|
||||
<h2>Game will launch in <span id="launchCountdownNumber">5</span>...</h2>
|
||||
<div style="border:2px solid black;width:100%;height:15px;padding:1px;margin-bottom:20vh;"><div id="launchCountdownProgress" style="background-color:#555555;width:0%;height:100%;"></div></div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
<!-- lax1dude was here -->
|
||||
<!-- lax1dude was here ( and so was hooman ) -->
|
||||
|
|
56104
javascript/classes.js
56104
javascript/classes.js
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
@ -12,15 +12,6 @@ public class Hitboxes extends Mod{
|
|||
}
|
||||
|
||||
public static ModeSetting color = new ModeSetting("Color", "", "White", "Red", "Yellow", "Green", "Blue", "Pink", "Orange", "Black");
|
||||
public BooleanSetting old = new BooleanSetting("1.7 Hitboxes", "", true);
|
||||
public static BooleanSetting old = new BooleanSetting("1.7 Hitboxes", "", true);
|
||||
|
||||
public void onEnable(){
|
||||
if(!old.getValue())
|
||||
mc.getRenderManager().setDebugBoundingBox(true);
|
||||
}
|
||||
|
||||
public void onDisable(){
|
||||
if(!old.getValue())
|
||||
mc.getRenderManager().setDebugBoundingBox(false);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -197,7 +197,7 @@ public class Minecraft implements IThreadListener {
|
|||
private Timer timer = new Timer(20.0F);
|
||||
public WorldClient theWorld;
|
||||
public RenderGlobal renderGlobal;
|
||||
private RenderManager renderManager;
|
||||
public RenderManager renderManager;
|
||||
private RenderItem renderItem;
|
||||
private ItemRenderer itemRenderer;
|
||||
public EntityPlayerSP thePlayer;
|
||||
|
|
|
@ -378,7 +378,7 @@ public class RenderManager {
|
|||
CrashReport.makeCrashReport(throwable1, "Post-rendering entity in world"));
|
||||
}
|
||||
|
||||
if (this.debugBoundingBox && !entity.isInvisible() && !parFlag) {
|
||||
if (this.debugBoundingBox && !entity.isInvisible() && !parFlag || W.hitboxes().isEnabled() && !parFlag && !W.hitboxes().old.getValue()) {
|
||||
try {
|
||||
this.renderDebugBoundingBox(entity, x, y, z, entityYaw, partialTicks);
|
||||
} catch (Throwable throwable) {
|
||||
|
@ -401,23 +401,18 @@ public class RenderManager {
|
|||
entity.boundingBox.minX-0.05-entity.posX
|
||||
+ (entity.posX - renderPosX),
|
||||
entity.boundingBox.minY
|
||||
- 0.05
|
||||
- entity.posY
|
||||
+ (entity.posY - renderPosY),
|
||||
entity.boundingBox.minZ
|
||||
- 0.05
|
||||
- entity.posZ
|
||||
+ (entity.posZ - renderPosZ),
|
||||
entity.boundingBox.maxX
|
||||
+ 0.05
|
||||
- entity.posX
|
||||
+ (entity.posX - renderPosX),
|
||||
entity.boundingBox.maxY
|
||||
+ 0.1
|
||||
- entity.posY
|
||||
+ (entity.posY - renderPosY),
|
||||
entity.boundingBox.maxZ
|
||||
+ 0.05
|
||||
- entity.posZ
|
||||
+ (entity.posZ - renderPosZ)),
|
||||
RenderUtils.getColorWithoutRGB(Hitboxes.color).getRed(),
|
||||
|
|
Loading…
Reference in New Issue
Block a user