fixed enderman block lighting, fixed broken link highlighting to actually open the URL and do nothing if there is no URL in the message

This commit is contained in:
LAX1DUDE 2022-01-12 16:54:27 -08:00
parent 8046181f7e
commit ac2f04ff9f
13 changed files with 52079 additions and 52005 deletions

View File

@ -37,11 +37,11 @@ dependencies {
teavm { teavm {
compileScopes = null; compileScopes = null;
minifying = true; minifying = false;
maxTopLevelNames = 10000; maxTopLevelNames = 10000;
properties = null; properties = null;
debugInformationGenerated = false; debugInformationGenerated = false;
sourceMapsGenerated = true; sourceMapsGenerated = false;
sourceFilesCopied = false; sourceFilesCopied = false;
incremental = false; incremental = false;
transformers = null; transformers = null;

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@ -4,7 +4,7 @@ public class ConfigConstants {
public static boolean profanity = false; public static boolean profanity = false;
public static final String version = "22m01a"; public static final String version = "22m02a";
public static final String mainMenuString = "eaglercraft " + version; public static final String mainMenuString = "eaglercraft " + version;
public static final String forkMe = "https://github.com/LAX1DUDE/eaglercraft"; public static final String forkMe = "https://github.com/LAX1DUDE/eaglercraft";

View File

@ -493,10 +493,6 @@ public class EaglerAdapterGL30 extends EaglerAdapterImpl2 {
lightPos1vec.set(-0.2f, 1.0f, 0.7f, 0.0f); lightPos1vec.normalise(); lightPos1vec.set(-0.2f, 1.0f, 0.7f, 0.0f); lightPos1vec.normalise();
Matrix4f.transform(matModelV[matModelPointer], lightPos0vec, lightPos0vec).normalise(); Matrix4f.transform(matModelV[matModelPointer], lightPos0vec, lightPos0vec).normalise();
Matrix4f.transform(matModelV[matModelPointer], lightPos1vec, lightPos1vec).normalise(); Matrix4f.transform(matModelV[matModelPointer], lightPos1vec, lightPos1vec).normalise();
if(RenderItem.isRenderInProgress) {
System.out.println(""+lightPos0vec+" "+lightPos1vec);
Thread.dumpStack();
}
} }
public static final void flipLightMatrix() { public static final void flipLightMatrix() {
lightPos0vec.x = -lightPos0vec.x; lightPos0vec.x = -lightPos0vec.x;

View File

@ -29,8 +29,7 @@ public class ChatClickData {
/** /**
* computes the URI from the clicked chat data object * computes the URI from the clicked chat data object
*/ */
/* public String getURI() {
public URI getURI() {
String var1 = this.getClickedUrl(); String var1 = this.getClickedUrl();
if (var1 == null) { if (var1 == null) {
@ -39,24 +38,18 @@ public class ChatClickData {
Matcher var2 = pattern.matcher(var1); Matcher var2 = pattern.matcher(var1);
if (var2.matches()) { if (var2.matches()) {
try { String var3 = var2.group(0);
String var3 = var2.group(0);
if (var2.group(1) == null) { if (var2.group(1) == null) {
var3 = "http://" + var3; var3 = "http://" + var3;
}
return new URI(var3);
} catch (URISyntaxException var4) {
System.err.println("Couldn\'t create URI from chat");
var4.printStackTrace();
} }
return var3;
} }
return null; return null;
} }
} }
*/
private String findClickedUrl() { private String findClickedUrl() {
int var1 = this.field_78310_f.lastIndexOf(" ", this.field_78310_f.length()) + 1; int var1 = this.field_78310_f.lastIndexOf(" ", this.field_78310_f.length()) + 1;

View File

@ -139,14 +139,14 @@ public class GuiChat extends GuiScreen {
ChatClickData var4 = this.mc.ingameGUI.getChatGUI().func_73766_a(EaglerAdapter.mouseGetX(), EaglerAdapter.mouseGetY()); ChatClickData var4 = this.mc.ingameGUI.getChatGUI().func_73766_a(EaglerAdapter.mouseGetX(), EaglerAdapter.mouseGetY());
if (var4 != null) { if (var4 != null) {
String var5 = var4.getClickedUrl(); String var5 = var4.getURI();
if (var5 != null) { if (var5 != null) {
if (this.mc.gameSettings.chatLinksPrompt) { if (this.mc.gameSettings.chatLinksPrompt) {
this.clickedURI = var5; this.clickedURI = var5;
this.mc.displayGuiScreen(new GuiConfirmOpenLink(this, var4.getClickedUrl(), 0, false)); this.mc.displayGuiScreen(new GuiConfirmOpenLink(this, var5, 0, false));
} else { } else {
EaglerAdapter.openLink(var4.getClickedUrl()); EaglerAdapter.openLink(var5);
} }
return; return;

View File

@ -23,9 +23,9 @@ public class GuiConfirmOpenLink extends GuiYesNo {
* Adds the buttons (and other controls) to the screen in question. * Adds the buttons (and other controls) to the screen in question.
*/ */
public void initGui() { public void initGui() {
this.buttonList.add(new GuiButton(0, this.width / 3 - 83 + 0, this.height / 6 + 96, 100, 20, this.buttonText1)); this.buttonList.add(new GuiButton(0, (this.width - 105) / 2 - 105, this.height / 6 + 96, 100, 20, this.buttonText1));
this.buttonList.add(new GuiButton(2, this.width / 3 - 83 + 105, this.height / 6 + 96, 100, 20, this.copyLinkButtonText)); this.buttonList.add(new GuiButton(2, (this.width - 105) / 2, this.height / 6 + 96, 100, 20, this.copyLinkButtonText));
this.buttonList.add(new GuiButton(1, this.width / 3 - 83 + 210, this.height / 6 + 96, 100, 20, this.buttonText2)); this.buttonList.add(new GuiButton(1, (this.width - 105) / 2 + 105, this.height / 6 + 96, 100, 20, this.buttonText2));
} }
/** /**

View File

@ -56,7 +56,9 @@ public class RenderEnderman extends RenderLiving {
EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
terrain.bindTexture(); terrain.bindTexture();
EaglerAdapter.flipLightMatrix();
this.renderBlocks.renderBlockAsItem(Block.blocksList[par1EntityEnderman.getCarried()], par1EntityEnderman.getCarryingData(), 1.0F); this.renderBlocks.renderBlockAsItem(Block.blocksList[par1EntityEnderman.getCarried()], par1EntityEnderman.getCarryingData(), 1.0F);
EaglerAdapter.flipLightMatrix();
EaglerAdapter.glPopMatrix(); EaglerAdapter.glPopMatrix();
EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
} }

File diff suppressed because one or more lines are too long

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long