Mostly fixed lighting
This commit is contained in:
parent
412d394030
commit
df5b7fd080
528
js/app.js
528
js/app.js
|
@ -7605,8 +7605,6 @@ function nmc_Minecraft() {
|
|||
a.$field_9243_r = null;
|
||||
a.$ticksRan = 0;
|
||||
a.$field_6282_S = 0;
|
||||
a.$field_9236_T = 0;
|
||||
a.$field_9235_U = 0;
|
||||
a.$field_6310_s = null;
|
||||
a.$field_6309_t = 0;
|
||||
a.$ingameGUI = null;
|
||||
|
@ -7686,8 +7684,6 @@ function nmc_Minecraft__init_0($this) {
|
|||
$this.$field_6288_M = 0;
|
||||
$this.$field_6287_N = jl_System_currentTimeMillis();
|
||||
$this.$field_6300_ab = 0;
|
||||
$this.$field_9236_T = nlea_EaglerAdapterImpl2_getCanvasWidth();
|
||||
$this.$field_9235_U = nlea_EaglerAdapterImpl2_getCanvasHeight();
|
||||
var$1 = new nms_ThreadSleepForever;
|
||||
jl_Thread__init_0(var$1, $rt_s(175));
|
||||
var$1.$mc1 = $this;
|
||||
|
@ -11401,6 +11397,16 @@ function nmc_Minecraft_respawn($this) {
|
|||
}}
|
||||
$rt_nativeThread().push($this, var$1, $var1, var$3, $ptr);
|
||||
}
|
||||
function nmc_Minecraft_setLighting($this, $var1) {
|
||||
if (!$var1) {
|
||||
olo_EaglerAdapterGL30_glDisable(2896);
|
||||
olo_EaglerAdapterGL30_glDisable(16384);
|
||||
} else {
|
||||
olo_EaglerAdapterGL30_glEnable(2896);
|
||||
olo_EaglerAdapterGL30_glEnable(16384);
|
||||
olo_EaglerAdapterGL30_glEnable(2903);
|
||||
}
|
||||
}
|
||||
function nmc_Minecraft__clinit_() {
|
||||
nmc_Minecraft_field_9240_E = $rt_createLongArray(512);
|
||||
nmc_Minecraft_field_9239_F = $rt_createLongArray(512);
|
||||
|
@ -14177,6 +14183,242 @@ function nms_TextureLavaFX_func_783_a($this) {
|
|||
$var2_0 = $var2_0 + 1 | 0;
|
||||
}
|
||||
}
|
||||
function jl_Thread() {
|
||||
var a = this; jl_Object.call(a);
|
||||
a.$id = Long_ZERO;
|
||||
a.$daemon = 0;
|
||||
a.$timeSliceStart = Long_ZERO;
|
||||
a.$yieldCount = 0;
|
||||
a.$finishedLock = null;
|
||||
a.$interruptHandler = null;
|
||||
a.$name2 = null;
|
||||
a.$alive = 0;
|
||||
a.$target = null;
|
||||
}
|
||||
var jl_Thread_mainThread = null;
|
||||
var jl_Thread_currentThread0 = null;
|
||||
var jl_Thread_nextId = Long_ZERO;
|
||||
var jl_Thread_activeCount = 0;
|
||||
function jl_Thread__init_1() {
|
||||
var var_0 = new jl_Thread();
|
||||
jl_Thread__init_(var_0);
|
||||
return var_0;
|
||||
}
|
||||
function jl_Thread__init_2(var_0) {
|
||||
var var_1 = new jl_Thread();
|
||||
jl_Thread__init_0(var_1, var_0);
|
||||
return var_1;
|
||||
}
|
||||
function jl_Thread__init_3(var_0, var_1) {
|
||||
var var_2 = new jl_Thread();
|
||||
jl_Thread__init_4(var_2, var_0, var_1);
|
||||
return var_2;
|
||||
}
|
||||
function jl_Thread__init_($this) {
|
||||
jl_Thread__init_4($this, null, null);
|
||||
}
|
||||
function jl_Thread__init_0($this, $name) {
|
||||
jl_Thread__init_4($this, null, $name);
|
||||
}
|
||||
function jl_Thread__init_4($this, $target, $name) {
|
||||
var var$3;
|
||||
$this.$finishedLock = new jl_Object;
|
||||
$this.$alive = 1;
|
||||
$this.$name2 = $name;
|
||||
$this.$target = $target;
|
||||
var$3 = jl_Thread_nextId;
|
||||
jl_Thread_nextId = Long_add(var$3, Long_fromInt(1));
|
||||
$this.$id = var$3;
|
||||
}
|
||||
function jl_Thread_start($this) {
|
||||
var var$1;
|
||||
var$1 = new jl_Thread$start$lambda$_4_0;
|
||||
var$1.$_01 = $this;
|
||||
otp_Platform_startThread(var$1);
|
||||
}
|
||||
function jl_Thread_setCurrentThread($thread_0) {
|
||||
if (jl_Thread_currentThread0 !== $thread_0)
|
||||
jl_Thread_currentThread0 = $thread_0;
|
||||
jl_Thread_currentThread0.$timeSliceStart = jl_System_currentTimeMillis();
|
||||
}
|
||||
function jl_Thread_currentThread() {
|
||||
return jl_Thread_currentThread0;
|
||||
}
|
||||
function jl_Thread_setDaemon($this, $daemon) {
|
||||
$this.$daemon = $daemon;
|
||||
}
|
||||
function jl_Thread_yield() {
|
||||
var $currentThread, var$2, $ptr, $tmp;
|
||||
$ptr = 0;
|
||||
if ($rt_resuming()) {
|
||||
var $thread = $rt_nativeThread();
|
||||
$ptr = $thread.pop();var$2 = $thread.pop();$currentThread = $thread.pop();
|
||||
}
|
||||
main: while (true) { switch ($ptr) {
|
||||
case 0:
|
||||
$currentThread = jl_Thread_currentThread0;
|
||||
var$2 = $currentThread.$yieldCount + 1 | 0;
|
||||
$currentThread.$yieldCount = var$2;
|
||||
if (var$2 < 30)
|
||||
return;
|
||||
jl_Thread_currentThread0.$yieldCount = 0;
|
||||
if (Long_ge(Long_add($currentThread.$timeSliceStart, Long_fromInt(100)), jl_System_currentTimeMillis()))
|
||||
return;
|
||||
$ptr = 1;
|
||||
case 1:
|
||||
jl_Thread_switchContext($currentThread);
|
||||
if ($rt_suspending()) {
|
||||
break main;
|
||||
}
|
||||
return;
|
||||
default: $rt_invalidPointer();
|
||||
}}
|
||||
$rt_nativeThread().push($currentThread, var$2, $ptr);
|
||||
}
|
||||
function jl_Thread_switchContext(var$1) {
|
||||
var thread = $rt_nativeThread();
|
||||
var javaThread = $rt_getThread();
|
||||
if (thread.isResuming()) {
|
||||
thread.status = 0;
|
||||
var result = thread.attribute;
|
||||
if (result instanceof Error) {
|
||||
throw result;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
var callback = function() {};
|
||||
callback.$complete = function(val) {
|
||||
thread.attribute = val;
|
||||
$rt_setThread(javaThread);
|
||||
thread.resume();
|
||||
};
|
||||
callback.$error = function(e) {
|
||||
thread.attribute = $rt_exception(e);
|
||||
$rt_setThread(javaThread);
|
||||
thread.resume();
|
||||
};
|
||||
callback = otpp_AsyncCallbackWrapper_create(callback);
|
||||
return thread.suspend(function() {
|
||||
try {
|
||||
jl_Thread_switchContext0(var$1, callback);
|
||||
} catch($e) {
|
||||
callback.$error($rt_exception($e));
|
||||
}
|
||||
});
|
||||
}
|
||||
function jl_Thread_switchContext0($thread_0, $callback) {
|
||||
var var$3;
|
||||
var$3 = new jl_Thread$switchContext$lambda$_18_0;
|
||||
var$3.$_02 = $thread_0;
|
||||
var$3.$_10 = $callback;
|
||||
otp_Platform_postpone(var$3);
|
||||
}
|
||||
function jl_Thread_sleep(var$1) {
|
||||
var thread = $rt_nativeThread();
|
||||
var javaThread = $rt_getThread();
|
||||
if (thread.isResuming()) {
|
||||
thread.status = 0;
|
||||
var result = thread.attribute;
|
||||
if (result instanceof Error) {
|
||||
throw result;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
var callback = function() {};
|
||||
callback.$complete = function(val) {
|
||||
thread.attribute = val;
|
||||
$rt_setThread(javaThread);
|
||||
thread.resume();
|
||||
};
|
||||
callback.$error = function(e) {
|
||||
thread.attribute = $rt_exception(e);
|
||||
$rt_setThread(javaThread);
|
||||
thread.resume();
|
||||
};
|
||||
callback = otpp_AsyncCallbackWrapper_create(callback);
|
||||
return thread.suspend(function() {
|
||||
try {
|
||||
jl_Thread_sleep0(var$1, callback);
|
||||
} catch($e) {
|
||||
callback.$error($rt_exception($e));
|
||||
}
|
||||
});
|
||||
}
|
||||
function jl_Thread_sleep0($millis, $callback) {
|
||||
var $current, $handler;
|
||||
$current = jl_Thread_currentThread0;
|
||||
$handler = new jl_Thread$SleepHandler;
|
||||
$handler.$thread = $current;
|
||||
$handler.$callback = $callback;
|
||||
$handler.$scheduleId = otp_Platform_schedule($handler, Long_ge($millis, Long_fromInt(2147483647)) ? 2147483647 : $millis.lo);
|
||||
$current.$interruptHandler = $handler;
|
||||
}
|
||||
function jl_Thread__clinit_() {
|
||||
jl_Thread_mainThread = jl_Thread__init_2($rt_s(221));
|
||||
jl_Thread_currentThread0 = jl_Thread_mainThread;
|
||||
jl_Thread_nextId = Long_fromInt(1);
|
||||
jl_Thread_activeCount = 1;
|
||||
}
|
||||
function nms_ThreadSleepForever() {
|
||||
jl_Thread.call(this);
|
||||
this.$mc1 = null;
|
||||
}
|
||||
function nms_ThreadSleepForever_run($this) {
|
||||
var var$1, $$je, $ptr, $tmp;
|
||||
$ptr = 0;
|
||||
if ($rt_resuming()) {
|
||||
var $thread = $rt_nativeThread();
|
||||
$ptr = $thread.pop();var$1 = $thread.pop();$this = $thread.pop();
|
||||
}
|
||||
main: while (true) { switch ($ptr) {
|
||||
case 0:
|
||||
while ($this.$mc1.$running) {
|
||||
try {
|
||||
var$1 = Long_fromInt(2147483647);
|
||||
$ptr = 1;
|
||||
continue main;
|
||||
} catch ($$e) {
|
||||
$$je = $rt_wrapException($$e);
|
||||
if ($$je instanceof jl_InterruptedException) {
|
||||
} else {
|
||||
throw $$e;
|
||||
}
|
||||
}
|
||||
}
|
||||
return;
|
||||
case 1:
|
||||
a: {
|
||||
try {
|
||||
jl_Thread_sleep(var$1);
|
||||
if ($rt_suspending()) {
|
||||
break main;
|
||||
}
|
||||
break a;
|
||||
} catch ($$e) {
|
||||
$$je = $rt_wrapException($$e);
|
||||
if ($$je instanceof jl_InterruptedException) {
|
||||
} else {
|
||||
throw $$e;
|
||||
}
|
||||
}
|
||||
}
|
||||
while ($this.$mc1.$running) {
|
||||
try {
|
||||
var$1 = Long_fromInt(2147483647);
|
||||
continue main;
|
||||
} catch ($$e) {
|
||||
$$je = $rt_wrapException($$e);
|
||||
if ($$je instanceof jl_InterruptedException) {
|
||||
} else {
|
||||
throw $$e;
|
||||
}
|
||||
}
|
||||
}
|
||||
return;
|
||||
default: $rt_invalidPointer();
|
||||
}}
|
||||
$rt_nativeThread().push($this, var$1, $ptr);
|
||||
}
|
||||
function olo_EaglerAdapterGL30() {
|
||||
nlea_EaglerAdapterImpl2.call(this);
|
||||
}
|
||||
|
@ -14396,7 +14638,7 @@ function olo_EaglerAdapterGL30_glTranslatef($p1, $p2, $p3) {
|
|||
if (!olo_EaglerAdapterGL30_isCompilingDisplayList)
|
||||
return;
|
||||
var$4 = new jl_IllegalArgumentException;
|
||||
jl_Throwable__init_(var$4, $rt_s(221));
|
||||
jl_Throwable__init_(var$4, $rt_s(222));
|
||||
$rt_throw(var$4);
|
||||
}
|
||||
function olo_EaglerAdapterGL30_glClearColor($p1, $p2, $p3, $p4) {
|
||||
|
@ -14478,7 +14720,7 @@ function olo_EaglerAdapterGL30_glPushMatrix() {
|
|||
break;
|
||||
case 5889:
|
||||
if (olo_EaglerAdapterGL30_matProjPointer >= (olo_EaglerAdapterGL30_matProjV.data.length - 1 | 0)) {
|
||||
ji_PrintStream_println(jl_System_err(), $rt_s(222));
|
||||
ji_PrintStream_println(jl_System_err(), $rt_s(223));
|
||||
break a;
|
||||
}
|
||||
olo_EaglerAdapterGL30_matProjPointer = olo_EaglerAdapterGL30_matProjPointer + 1 | 0;
|
||||
|
@ -14486,7 +14728,7 @@ function olo_EaglerAdapterGL30_glPushMatrix() {
|
|||
break a;
|
||||
case 5890:
|
||||
if (olo_EaglerAdapterGL30_matTexPointer >= (olo_EaglerAdapterGL30_matTexV.data.length - 1 | 0)) {
|
||||
ji_PrintStream_println(jl_System_err(), $rt_s(223));
|
||||
ji_PrintStream_println(jl_System_err(), $rt_s(224));
|
||||
break a;
|
||||
}
|
||||
olo_EaglerAdapterGL30_matTexPointer = olo_EaglerAdapterGL30_matTexPointer + 1 | 0;
|
||||
|
@ -14495,7 +14737,7 @@ function olo_EaglerAdapterGL30_glPushMatrix() {
|
|||
default:
|
||||
}
|
||||
if (olo_EaglerAdapterGL30_matModelPointer >= (olo_EaglerAdapterGL30_matModelV.data.length - 1 | 0))
|
||||
ji_PrintStream_println(jl_System_err(), $rt_s(224));
|
||||
ji_PrintStream_println(jl_System_err(), $rt_s(225));
|
||||
else {
|
||||
olo_EaglerAdapterGL30_matModelPointer = olo_EaglerAdapterGL30_matModelPointer + 1 | 0;
|
||||
nPgv_Matrix4f_load(olo_EaglerAdapterGL30_matModelV.data[olo_EaglerAdapterGL30_matModelPointer], olo_EaglerAdapterGL30_matModelV.data[olo_EaglerAdapterGL30_matModelPointer - 1 | 0]);
|
||||
|
@ -14511,7 +14753,7 @@ function olo_EaglerAdapterGL30_glRotatef($p1, $p2, $p3, $p4) {
|
|||
if (!olo_EaglerAdapterGL30_isCompilingDisplayList)
|
||||
return;
|
||||
var$5 = new jl_IllegalArgumentException;
|
||||
jl_Throwable__init_(var$5, $rt_s(221));
|
||||
jl_Throwable__init_(var$5, $rt_s(222));
|
||||
$rt_throw(var$5);
|
||||
}
|
||||
function olo_EaglerAdapterGL30_glPopMatrix() {
|
||||
|
@ -14522,14 +14764,14 @@ function olo_EaglerAdapterGL30_glPopMatrix() {
|
|||
break;
|
||||
case 5889:
|
||||
if (olo_EaglerAdapterGL30_matProjPointer <= 0) {
|
||||
ji_PrintStream_println(jl_System_err(), $rt_s(225));
|
||||
ji_PrintStream_println(jl_System_err(), $rt_s(226));
|
||||
break a;
|
||||
}
|
||||
olo_EaglerAdapterGL30_matProjPointer = olo_EaglerAdapterGL30_matProjPointer - 1 | 0;
|
||||
break a;
|
||||
case 5890:
|
||||
if (olo_EaglerAdapterGL30_matTexPointer <= 0) {
|
||||
ji_PrintStream_println(jl_System_err(), $rt_s(226));
|
||||
ji_PrintStream_println(jl_System_err(), $rt_s(227));
|
||||
break a;
|
||||
}
|
||||
olo_EaglerAdapterGL30_matTexPointer = olo_EaglerAdapterGL30_matTexPointer - 1 | 0;
|
||||
|
@ -14537,7 +14779,7 @@ function olo_EaglerAdapterGL30_glPopMatrix() {
|
|||
default:
|
||||
}
|
||||
if (olo_EaglerAdapterGL30_matModelPointer <= 0)
|
||||
ji_PrintStream_println(jl_System_err(), $rt_s(227));
|
||||
ji_PrintStream_println(jl_System_err(), $rt_s(228));
|
||||
else
|
||||
olo_EaglerAdapterGL30_matModelPointer = olo_EaglerAdapterGL30_matModelPointer - 1 | 0;
|
||||
}
|
||||
|
@ -14564,7 +14806,7 @@ function olo_EaglerAdapterGL30_glScalef($p1, $p2, $p3) {
|
|||
if (!olo_EaglerAdapterGL30_isCompilingDisplayList)
|
||||
return;
|
||||
var$4 = new jl_IllegalArgumentException;
|
||||
jl_Throwable__init_(var$4, $rt_s(221));
|
||||
jl_Throwable__init_(var$4, $rt_s(222));
|
||||
$rt_throw(var$4);
|
||||
}
|
||||
function olo_EaglerAdapterGL30_glBlendFunc($p1, $p2) {
|
||||
|
@ -14650,7 +14892,7 @@ function olo_EaglerAdapterGL30_glEndList() {
|
|||
$l = nlea_EaglerAdapterImpl2__wArrayByteLength(var$3);
|
||||
if ($l > 0) {
|
||||
if (olo_EaglerAdapterGL30_compilingDisplayList.$glbuffer === null) {
|
||||
ju_HashMap_putImpl(olo_EaglerAdapterGL30_displayListsInitialized, jl_Integer_valueOf(olo_EaglerAdapterGL30_compilingDisplayList.$id), olo_EaglerAdapterGL30_compilingDisplayList);
|
||||
ju_HashMap_putImpl(olo_EaglerAdapterGL30_displayListsInitialized, jl_Integer_valueOf(olo_EaglerAdapterGL30_compilingDisplayList.$id0), olo_EaglerAdapterGL30_compilingDisplayList);
|
||||
olo_EaglerAdapterGL30_compilingDisplayList.$glarray = nlea_EaglerAdapterImpl2__wglCreateVertexArray();
|
||||
olo_EaglerAdapterGL30_compilingDisplayList.$glbuffer = nlea_EaglerAdapterImpl2__wglCreateBuffer();
|
||||
$f = nPg_FixedFunctionShader_instance(olo_EaglerAdapterGL30_compilingDisplayList.$shaderMode);
|
||||
|
@ -14749,12 +14991,12 @@ function olo_EaglerAdapterGL30_glDrawArrays($p1, $p2, $p3, $buffer) {
|
|||
olo_EaglerAdapterGL30_$callClinit();
|
||||
if (olo_EaglerAdapterGL30_isCompilingDisplayList) {
|
||||
if ($p1 != 7)
|
||||
ji_PrintStream_println(jl_System_err(), $rt_s(228));
|
||||
ji_PrintStream_println(jl_System_err(), $rt_s(229));
|
||||
else {
|
||||
if (olo_EaglerAdapterGL30_compilingDisplayList.$shaderMode == (-1))
|
||||
olo_EaglerAdapterGL30_compilingDisplayList.$shaderMode = olo_EaglerAdapterGL30_getShaderModeFlag0();
|
||||
else if (olo_EaglerAdapterGL30_compilingDisplayList.$shaderMode != olo_EaglerAdapterGL30_getShaderModeFlag0())
|
||||
ji_PrintStream_println(jl_System_err(), $rt_s(229));
|
||||
ji_PrintStream_println(jl_System_err(), $rt_s(230));
|
||||
var$5 = olo_EaglerAdapterGL30_compilingDisplayList;
|
||||
var$5.$listLength = var$5.$listLength + $p3 | 0;
|
||||
nlea_EaglerAdapterImpl2_$callClinit();
|
||||
|
@ -15040,242 +15282,6 @@ function olo_GL11__init_0() {
|
|||
function olo_GL11__init_($this) {
|
||||
olo_EaglerAdapterGL30__init_($this);
|
||||
}
|
||||
function jl_Thread() {
|
||||
var a = this; jl_Object.call(a);
|
||||
a.$id0 = Long_ZERO;
|
||||
a.$daemon = 0;
|
||||
a.$timeSliceStart = Long_ZERO;
|
||||
a.$yieldCount = 0;
|
||||
a.$finishedLock = null;
|
||||
a.$interruptHandler = null;
|
||||
a.$name2 = null;
|
||||
a.$alive = 0;
|
||||
a.$target = null;
|
||||
}
|
||||
var jl_Thread_mainThread = null;
|
||||
var jl_Thread_currentThread0 = null;
|
||||
var jl_Thread_nextId = Long_ZERO;
|
||||
var jl_Thread_activeCount = 0;
|
||||
function jl_Thread__init_1() {
|
||||
var var_0 = new jl_Thread();
|
||||
jl_Thread__init_(var_0);
|
||||
return var_0;
|
||||
}
|
||||
function jl_Thread__init_2(var_0) {
|
||||
var var_1 = new jl_Thread();
|
||||
jl_Thread__init_0(var_1, var_0);
|
||||
return var_1;
|
||||
}
|
||||
function jl_Thread__init_3(var_0, var_1) {
|
||||
var var_2 = new jl_Thread();
|
||||
jl_Thread__init_4(var_2, var_0, var_1);
|
||||
return var_2;
|
||||
}
|
||||
function jl_Thread__init_($this) {
|
||||
jl_Thread__init_4($this, null, null);
|
||||
}
|
||||
function jl_Thread__init_0($this, $name) {
|
||||
jl_Thread__init_4($this, null, $name);
|
||||
}
|
||||
function jl_Thread__init_4($this, $target, $name) {
|
||||
var var$3;
|
||||
$this.$finishedLock = new jl_Object;
|
||||
$this.$alive = 1;
|
||||
$this.$name2 = $name;
|
||||
$this.$target = $target;
|
||||
var$3 = jl_Thread_nextId;
|
||||
jl_Thread_nextId = Long_add(var$3, Long_fromInt(1));
|
||||
$this.$id0 = var$3;
|
||||
}
|
||||
function jl_Thread_start($this) {
|
||||
var var$1;
|
||||
var$1 = new jl_Thread$start$lambda$_4_0;
|
||||
var$1.$_01 = $this;
|
||||
otp_Platform_startThread(var$1);
|
||||
}
|
||||
function jl_Thread_setCurrentThread($thread_0) {
|
||||
if (jl_Thread_currentThread0 !== $thread_0)
|
||||
jl_Thread_currentThread0 = $thread_0;
|
||||
jl_Thread_currentThread0.$timeSliceStart = jl_System_currentTimeMillis();
|
||||
}
|
||||
function jl_Thread_currentThread() {
|
||||
return jl_Thread_currentThread0;
|
||||
}
|
||||
function jl_Thread_setDaemon($this, $daemon) {
|
||||
$this.$daemon = $daemon;
|
||||
}
|
||||
function jl_Thread_yield() {
|
||||
var $currentThread, var$2, $ptr, $tmp;
|
||||
$ptr = 0;
|
||||
if ($rt_resuming()) {
|
||||
var $thread = $rt_nativeThread();
|
||||
$ptr = $thread.pop();var$2 = $thread.pop();$currentThread = $thread.pop();
|
||||
}
|
||||
main: while (true) { switch ($ptr) {
|
||||
case 0:
|
||||
$currentThread = jl_Thread_currentThread0;
|
||||
var$2 = $currentThread.$yieldCount + 1 | 0;
|
||||
$currentThread.$yieldCount = var$2;
|
||||
if (var$2 < 30)
|
||||
return;
|
||||
jl_Thread_currentThread0.$yieldCount = 0;
|
||||
if (Long_ge(Long_add($currentThread.$timeSliceStart, Long_fromInt(100)), jl_System_currentTimeMillis()))
|
||||
return;
|
||||
$ptr = 1;
|
||||
case 1:
|
||||
jl_Thread_switchContext($currentThread);
|
||||
if ($rt_suspending()) {
|
||||
break main;
|
||||
}
|
||||
return;
|
||||
default: $rt_invalidPointer();
|
||||
}}
|
||||
$rt_nativeThread().push($currentThread, var$2, $ptr);
|
||||
}
|
||||
function jl_Thread_switchContext(var$1) {
|
||||
var thread = $rt_nativeThread();
|
||||
var javaThread = $rt_getThread();
|
||||
if (thread.isResuming()) {
|
||||
thread.status = 0;
|
||||
var result = thread.attribute;
|
||||
if (result instanceof Error) {
|
||||
throw result;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
var callback = function() {};
|
||||
callback.$complete = function(val) {
|
||||
thread.attribute = val;
|
||||
$rt_setThread(javaThread);
|
||||
thread.resume();
|
||||
};
|
||||
callback.$error = function(e) {
|
||||
thread.attribute = $rt_exception(e);
|
||||
$rt_setThread(javaThread);
|
||||
thread.resume();
|
||||
};
|
||||
callback = otpp_AsyncCallbackWrapper_create(callback);
|
||||
return thread.suspend(function() {
|
||||
try {
|
||||
jl_Thread_switchContext0(var$1, callback);
|
||||
} catch($e) {
|
||||
callback.$error($rt_exception($e));
|
||||
}
|
||||
});
|
||||
}
|
||||
function jl_Thread_switchContext0($thread_0, $callback) {
|
||||
var var$3;
|
||||
var$3 = new jl_Thread$switchContext$lambda$_18_0;
|
||||
var$3.$_02 = $thread_0;
|
||||
var$3.$_10 = $callback;
|
||||
otp_Platform_postpone(var$3);
|
||||
}
|
||||
function jl_Thread_sleep(var$1) {
|
||||
var thread = $rt_nativeThread();
|
||||
var javaThread = $rt_getThread();
|
||||
if (thread.isResuming()) {
|
||||
thread.status = 0;
|
||||
var result = thread.attribute;
|
||||
if (result instanceof Error) {
|
||||
throw result;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
var callback = function() {};
|
||||
callback.$complete = function(val) {
|
||||
thread.attribute = val;
|
||||
$rt_setThread(javaThread);
|
||||
thread.resume();
|
||||
};
|
||||
callback.$error = function(e) {
|
||||
thread.attribute = $rt_exception(e);
|
||||
$rt_setThread(javaThread);
|
||||
thread.resume();
|
||||
};
|
||||
callback = otpp_AsyncCallbackWrapper_create(callback);
|
||||
return thread.suspend(function() {
|
||||
try {
|
||||
jl_Thread_sleep0(var$1, callback);
|
||||
} catch($e) {
|
||||
callback.$error($rt_exception($e));
|
||||
}
|
||||
});
|
||||
}
|
||||
function jl_Thread_sleep0($millis, $callback) {
|
||||
var $current, $handler;
|
||||
$current = jl_Thread_currentThread0;
|
||||
$handler = new jl_Thread$SleepHandler;
|
||||
$handler.$thread = $current;
|
||||
$handler.$callback = $callback;
|
||||
$handler.$scheduleId = otp_Platform_schedule($handler, Long_ge($millis, Long_fromInt(2147483647)) ? 2147483647 : $millis.lo);
|
||||
$current.$interruptHandler = $handler;
|
||||
}
|
||||
function jl_Thread__clinit_() {
|
||||
jl_Thread_mainThread = jl_Thread__init_2($rt_s(230));
|
||||
jl_Thread_currentThread0 = jl_Thread_mainThread;
|
||||
jl_Thread_nextId = Long_fromInt(1);
|
||||
jl_Thread_activeCount = 1;
|
||||
}
|
||||
function nms_ThreadSleepForever() {
|
||||
jl_Thread.call(this);
|
||||
this.$mc1 = null;
|
||||
}
|
||||
function nms_ThreadSleepForever_run($this) {
|
||||
var var$1, $$je, $ptr, $tmp;
|
||||
$ptr = 0;
|
||||
if ($rt_resuming()) {
|
||||
var $thread = $rt_nativeThread();
|
||||
$ptr = $thread.pop();var$1 = $thread.pop();$this = $thread.pop();
|
||||
}
|
||||
main: while (true) { switch ($ptr) {
|
||||
case 0:
|
||||
while ($this.$mc1.$running) {
|
||||
try {
|
||||
var$1 = Long_fromInt(2147483647);
|
||||
$ptr = 1;
|
||||
continue main;
|
||||
} catch ($$e) {
|
||||
$$je = $rt_wrapException($$e);
|
||||
if ($$je instanceof jl_InterruptedException) {
|
||||
} else {
|
||||
throw $$e;
|
||||
}
|
||||
}
|
||||
}
|
||||
return;
|
||||
case 1:
|
||||
a: {
|
||||
try {
|
||||
jl_Thread_sleep(var$1);
|
||||
if ($rt_suspending()) {
|
||||
break main;
|
||||
}
|
||||
break a;
|
||||
} catch ($$e) {
|
||||
$$je = $rt_wrapException($$e);
|
||||
if ($$je instanceof jl_InterruptedException) {
|
||||
} else {
|
||||
throw $$e;
|
||||
}
|
||||
}
|
||||
}
|
||||
while ($this.$mc1.$running) {
|
||||
try {
|
||||
var$1 = Long_fromInt(2147483647);
|
||||
continue main;
|
||||
} catch ($$e) {
|
||||
$$je = $rt_wrapException($$e);
|
||||
if ($$je instanceof jl_InterruptedException) {
|
||||
} else {
|
||||
throw $$e;
|
||||
}
|
||||
}
|
||||
}
|
||||
return;
|
||||
default: $rt_invalidPointer();
|
||||
}}
|
||||
$rt_nativeThread().push($this, var$1, $ptr);
|
||||
}
|
||||
function ji_InputStream() {
|
||||
jl_Object.call(this);
|
||||
}
|
||||
|
@ -17480,7 +17486,7 @@ function nms_GLAllocation_generateDisplayLists($i) {
|
|||
var$5 = olo_EaglerAdapterGL30_displayLists;
|
||||
var$6 = jl_Integer_valueOf(var$4);
|
||||
var$7 = new olo_EaglerAdapterGL30$DisplayList;
|
||||
var$7.$id = var$4;
|
||||
var$7.$id0 = var$4;
|
||||
var$7.$glarray = null;
|
||||
var$7.$glbuffer = null;
|
||||
var$7.$shaderMode = (-1);
|
||||
|
@ -56701,8 +56707,12 @@ function nms_RenderEngine_readTextureImage($this, $inputstream) {
|
|||
$rt_nativeThread().push($this, $inputstream, var$2, $ptr);
|
||||
}
|
||||
function nms_RenderEngine_bindTexture($this, $i) {
|
||||
if ($i < 0)
|
||||
nmc_Minecraft_setLighting(nmc_Minecraft_mc, 1);
|
||||
if ($i < 0) {
|
||||
nmc_Minecraft_setLighting(nmc_Minecraft_mc, 0);
|
||||
return;
|
||||
}
|
||||
nmc_Minecraft_setLighting(nmc_Minecraft_mc, 0);
|
||||
olo_EaglerAdapterGL30_glBindTexture(3553, $i);
|
||||
}
|
||||
function nms_RenderEngine_getTextureForDownloadableImage($this, $s, $s1) {
|
||||
|
@ -66295,7 +66305,7 @@ function nPg_FixedFunctionShader__clinit_() {
|
|||
}
|
||||
function olo_EaglerAdapterGL30$DisplayList() {
|
||||
var a = this; jl_Object.call(a);
|
||||
a.$id = 0;
|
||||
a.$id0 = 0;
|
||||
a.$glarray = null;
|
||||
a.$glbuffer = null;
|
||||
a.$shaderMode = 0;
|
||||
|
@ -114989,10 +114999,10 @@ nms_ModelBiped, 0, nms_ModelBase, [], 0, 3, 0, ["$render0", function(var_1, var_
|
|||
nms_TextureFX, 0, jl_Object, [], 0, 3, 0, 0,
|
||||
nms_TextureWaterFX, 0, nms_TextureFX, [], 0, 3, 0, ["$func_783_a", function() { nms_TextureWaterFX_func_783_a(this); }],
|
||||
nms_TextureLavaFX, 0, nms_TextureFX, [], 0, 3, 0, ["$func_783_a", function() { nms_TextureLavaFX_func_783_a(this); }],
|
||||
olo_EaglerAdapterGL30, 0, nlea_EaglerAdapterImpl2, [], 0, 3, olo_EaglerAdapterGL30_$callClinit, 0,
|
||||
olo_GL11, 0, olo_EaglerAdapterGL30, [], 0, 3, 0, 0,
|
||||
jl_Thread, 0, jl_Object, [jl_Runnable], 0, 3, 0, 0,
|
||||
nms_ThreadSleepForever, 0, jl_Thread, [], 0, 3, 0, 0,
|
||||
olo_EaglerAdapterGL30, 0, nlea_EaglerAdapterImpl2, [], 0, 3, olo_EaglerAdapterGL30_$callClinit, 0,
|
||||
olo_GL11, 0, olo_EaglerAdapterGL30, [], 0, 3, 0, 0,
|
||||
ji_InputStream, 0, jl_Object, [ji_Closeable], 1, 3, 0, 0,
|
||||
ji_FilterInputStream, 0, ji_InputStream, [], 0, 3, 0, 0,
|
||||
ji_DataInput, 0, jl_Object, [], 3, 3, 0, 0,
|
||||
|
@ -115981,8 +115991,8 @@ $rt_stringPool(["Can\'t enter monitor from another thread synchronously", "@", "
|
|||
"yyyy-MM-dd_HH.mm.ss", "NONE", "ESCAPE", "1", "2", "3", "4", "5", "6", "7", "8", "9", "MINUS", "EQUALS", "BACK", "TAB", "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "LBRACKET", "RBRACKET", "RETURN", "LCONTROL", "A", "S", "D", "F", "G", "H", "J", "K", "L", "SEMICOLON", "APOSTROPHE", "GRAVE", "LSHIFT", "BACKSLASH", "Z", "X", "C", "V", "B", "N", "M", "COMMA", "PERIOD", "SLASH", "RSHIFT", "MULTIPLY", "LMENU", "SPACE", "CAPITAL", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "NUMLOCK", "SCROLL",
|
||||
"NUMPAD7", "NUMPAD8", "NUMPAD9", "SUBTRACT", "NUMPAD4", "NUMPAD5", "NUMPAD6", "ADD", "NUMPAD1", "NUMPAD2", "NUMPAD3", "NUMPAD0", "DECIMAL", "F11", "F12", "F13", "F14", "F15", "F16", "F17", "F18", "KANA", "F19", "CONVERT", "NOCONVERT", "YEN", "NUMPADEQUALS", "CIRCUMFLEX", "AT", "COLON", "UNDERLINE", "KANJI", "STOP", "AX", "UNLABELED", "NUMPADENTER", "RCONTROL", "SECTION", "NUMPADCOMMA", "DIVIDE", "SYSRQ", "RMENU", "FUNCTION", "PAUSE", "HOME", "UP", "PRIOR", "LEFT", "RIGHT", "END", "DOWN", "NEXT", "INSERT", "DELETE",
|
||||
"CLEAR", "LMETA", "RMETA", "APPS", "POWER", "SLEEP", "\n", "Either src or dest is null", "Timer hack thread", "/font/default.png", "Pre startup", "Startup", "/gui/items.png", "Post startup", "/title/mojang.png", "GL_INVALID_ENUM", "GL_INVALID_VALUE", "GL_INVALID_OPERATION", "GL_OUT_OF_MEMORY", "Unknown Error", "CONTEXT_LOST_WEBGL", "########## GL ERROR ##########", "@ ", "Pre render", "Post render", " fps, ", " chunk updates", "/terrain.png", "saves", "Loading level", "Generating level", "Leaving the Nether",
|
||||
"Entering the Nether", "Player is ", "Player is now ", "Building terrain", "Simulating world for a bit", "P: ", ". T: ", "Respawning", "_net_lax1dude_eaglercraft_beta_IndexedDBFilesystem_1_3", "Initialization Failed", "Can\'t compare ", " to ", "OPENED", "LOCKED", "ERROR", "EAGPKG!!", "invalid epk file", "<file>", " end", "invalid file hash for ", "</file>", "/gui/background.png", "matrix is not supported while recording display list use tessellator class instead", "projection matrix stack overflow", "texture matrix stack overflow",
|
||||
"modelview matrix stack overflow", "projection matrix stack underflow", "texture matrix stack underflow", "modelview matrix stack underflow", "only GL_QUADS supported in a display list", "vertex format inconsistent in display list", "main", "End of stream reached", "Malformed UTF-8 sequence", "window.indexedDB was null or undefined", "yee", "charsetName is null", "Should never been thrown", "Stream closed", "footer is not found", "Unexpected end of ZLIB input stream", "<22>", "Replacement preconditions do not hold",
|
||||
"Entering the Nether", "Player is ", "Player is now ", "Building terrain", "Simulating world for a bit", "P: ", ". T: ", "Respawning", "_net_lax1dude_eaglercraft_beta_IndexedDBFilesystem_1_3", "Initialization Failed", "Can\'t compare ", " to ", "OPENED", "LOCKED", "ERROR", "EAGPKG!!", "invalid epk file", "<file>", " end", "invalid file hash for ", "</file>", "/gui/background.png", "main", "matrix is not supported while recording display list use tessellator class instead", "projection matrix stack overflow",
|
||||
"texture matrix stack overflow", "modelview matrix stack overflow", "projection matrix stack underflow", "texture matrix stack underflow", "modelview matrix stack underflow", "only GL_QUADS supported in a display list", "vertex format inconsistent in display list", "End of stream reached", "Malformed UTF-8 sequence", "window.indexedDB was null or undefined", "yee", "charsetName is null", "Should never been thrown", "Stream closed", "footer is not found", "Unexpected end of ZLIB input stream", "<22>", "Replacement preconditions do not hold",
|
||||
"/misc/water.png", "Slot ", " is already occupied by ", " when adding ", "stone", "wood", "gravel", "grass", "cloth", "sand", "Unable to allocate array size: ", "lineSeparator must not contain base64 characters: [", "]", "Impossible modulus ", "Strict decoding: Last encoded character (before the paddings if any) is a valid base 64 alphabet but not a possible encoding. Decoding requires at least two trailing 6-bit characters to create bytes.", "Strict decoding: Last encoded character (before the paddings if any) is a valid base 64 alphabet but not a possible encoding. Expected the discarded bits from the character to be zero.",
|
||||
"en", "CA", "fr", "zh", "CN", "FR", "de", "DE", "it", "IT", "ja", "JP", "ko", "KR", "TW", "GB", "US", "open error", "path", "New position ", " is outside of range [0;", "New limit ", "The last float in dst ", " is outside of array of size ", "Length ", " must be non-negative", "Offset ", "step.", "/misc/grasscolor.png", "liquid.water", "lava", "random.fizz", "largesmoke", "/misc/foliagecolor.png", "random.fuse", "smoke", "flame", "fire.fire", "Large chest", "reddust", "Duplicate id: ", "x", "y", "z", "id", " is missing a mapping! This is a bug!",
|
||||
"Furnace", "Chest", "Sign", "MobSpawner", "Text1", "Text2", "Text3", "Text4", "Text", "random.door_close", "random.door_open", "random.click", "everything", "mobs", "players", ", ", "portal.portal", "portal", "CONFLICT @ ", "13", "cat", "-", "Capacity is negative: ", "The last byte in dst ", "The last byte in src ", "ERA=", "YEAR=", "MONTH=", "WEEK_OF_YEAR=", "WEEK_OF_MONTH=", "DAY_OF_MONTH=", "DAY_OF_YEAR=", "DAY_OF_WEEK=", "DAY_OF_WEEK_IN_MONTH=", "AM_PM=", "HOUR=", "HOUR_OF_DAY", "MINUTE=", "SECOND=", "MILLISECOND=",
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -21,7 +21,6 @@ import net.minecraft.src.ItemRenderer;
|
|||
import net.minecraft.src.ItemStack;
|
||||
import net.minecraft.src.LoadingScreenRenderer;
|
||||
import net.minecraft.src.MathHelper;
|
||||
import net.minecraft.src.MinecraftError;
|
||||
import net.minecraft.src.MinecraftException;
|
||||
import net.minecraft.src.ModelBiped;
|
||||
import net.minecraft.src.MouseHelper;
|
||||
|
@ -37,20 +36,16 @@ import net.minecraft.src.Session;
|
|||
import net.minecraft.src.Teleporter;
|
||||
import net.minecraft.src.Tessellator;
|
||||
import net.minecraft.src.TextureCompassFX;
|
||||
import net.minecraft.src.TextureFlamesFX;
|
||||
import net.minecraft.src.TextureLavaFX;
|
||||
import net.minecraft.src.TextureLavaFlowFX;
|
||||
import net.minecraft.src.TexturePortalFX;
|
||||
import net.minecraft.src.TextureWaterFX;
|
||||
import net.minecraft.src.TexureWaterFlowFX;
|
||||
import net.minecraft.src.ThreadSleepForever;
|
||||
import net.minecraft.src.Timer;
|
||||
import net.minecraft.src.UnexpectedThrowable;
|
||||
import net.minecraft.src.Vec3D;
|
||||
import net.minecraft.src.World;
|
||||
import net.minecraft.src.WorldProvider;
|
||||
import net.minecraft.src.WorldProviderHell;
|
||||
import net.minecraft.src.WorldRenderer;
|
||||
|
||||
import org.lwjgl.input.Keyboard;
|
||||
import org.lwjgl.input.Mouse;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
@ -76,8 +71,6 @@ public class Minecraft implements Runnable {
|
|||
public EntityRenderer field_9243_r = new EntityRenderer(this);
|
||||
private int ticksRan = 0;
|
||||
private int field_6282_S = 0;
|
||||
private int field_9236_T;
|
||||
private int field_9235_U;
|
||||
public String field_6310_s = null;
|
||||
public int field_6309_t = 0;
|
||||
public GuiIngame ingameGUI;
|
||||
|
@ -89,8 +82,6 @@ public class Minecraft implements Runnable {
|
|||
public static long[] field_9240_E = new long[512];
|
||||
public static long[] field_9239_F = new long[512];
|
||||
public static int field_9238_G = 0;
|
||||
private String field_9234_V;
|
||||
private int field_9233_W;
|
||||
private TextureWaterFX field_9232_X = new TextureWaterFX();
|
||||
private TextureLavaFX field_9231_Y = new TextureLavaFX();
|
||||
public volatile boolean running = true;
|
||||
|
@ -105,19 +96,12 @@ public class Minecraft implements Runnable {
|
|||
private static Minecraft mc;
|
||||
|
||||
public Minecraft() {
|
||||
this.field_9236_T = GL11.getCanvasWidth();
|
||||
this.field_9235_U = GL11.getCanvasHeight();
|
||||
new ThreadSleepForever(this, "Timer hack thread");
|
||||
this.displayWidth = GL11.getCanvasWidth();
|
||||
this.displayHeight = GL11.getCanvasHeight();
|
||||
mc = this;
|
||||
}
|
||||
|
||||
public void func_6258_a(String var1, int var2) {
|
||||
this.field_9234_V = var1;
|
||||
this.field_9233_W = var2;
|
||||
}
|
||||
|
||||
public void startGame() {
|
||||
|
||||
RenderManager.instance.field_4236_f = new ItemRenderer(this);
|
||||
|
@ -889,7 +873,6 @@ public class Minecraft implements Runnable {
|
|||
}
|
||||
|
||||
this.loadingScreen.displayLoadingString("Simulating world for a bit");
|
||||
boolean var9 = true;
|
||||
this.theWorld.func_656_j();
|
||||
}
|
||||
|
||||
|
@ -935,4 +918,15 @@ public class Minecraft implements Runnable {
|
|||
public static Minecraft getMinecraft() {
|
||||
return mc;
|
||||
}
|
||||
|
||||
public final void setLighting(boolean var1) {
|
||||
if(!var1) {
|
||||
GL11.glDisable(2896);
|
||||
GL11.glDisable(16384);
|
||||
} else {
|
||||
GL11.glEnable(2896);
|
||||
GL11.glEnable(16384);
|
||||
GL11.glEnable(2903);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -9,6 +9,7 @@ import java.util.HashMap;
|
|||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import net.lax1dude.eaglercraft.EaglerImage;
|
||||
import net.minecraft.client.Minecraft;
|
||||
|
||||
public class RenderEngine {
|
||||
|
||||
|
@ -171,9 +172,12 @@ public class RenderEngine {
|
|||
}
|
||||
|
||||
public void bindTexture(int i) {
|
||||
Minecraft.getMinecraft().setLighting(true);
|
||||
if (i < 0) {
|
||||
Minecraft.getMinecraft().setLighting(false);
|
||||
return;
|
||||
} else {
|
||||
Minecraft.getMinecraft().setLighting(false);
|
||||
GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, i);
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -26,7 +26,7 @@ public class Vec3D {
|
|||
return ((Vec3D)vectorList.get(nextVector++)).setComponents(var0, var2, var4);
|
||||
}
|
||||
|
||||
private Vec3D(double var1, double var3, double var5) {
|
||||
public Vec3D(double var1, double var3, double var5) {
|
||||
if(var1 == -0.0D) {
|
||||
var1 = 0.0D;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user