From d827fbaab506b11e8c8fe58eb6b82d28abdbe2ac Mon Sep 17 00:00:00 2001 From: LAX1DUDE Date: Fri, 8 Apr 2022 01:56:03 -0700 Subject: [PATCH] Version 1.0.4 - updated to the latest EaglercraftBungee (0.2.0) --- EaglerMOTD.jar | Bin 63637 -> 63722 bytes .../eaglercraft/eaglermotd/EaglerMOTD.java | 3 + .../eaglermotd/MOTDConnection.java | 196 +++++++++--------- src/plugin.yml | 2 +- 4 files changed, 103 insertions(+), 98 deletions(-) diff --git a/EaglerMOTD.jar b/EaglerMOTD.jar index 58d230b03c3efa0f9256afe043c495a3af504f38..72ec317cec73cb0461b87207375ebb3e27fe6df4 100644 GIT binary patch delta 13694 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 0) { diff --git a/src/net/lax1dude/eaglercraft/eaglermotd/MOTDConnection.java b/src/net/lax1dude/eaglercraft/eaglermotd/MOTDConnection.java index ff47bd8..9816944 100644 --- a/src/net/lax1dude/eaglercraft/eaglermotd/MOTDConnection.java +++ b/src/net/lax1dude/eaglercraft/eaglermotd/MOTDConnection.java @@ -235,106 +235,108 @@ public class MOTDConnection { } shouldPush = true; } - boolean shouldRenderIcon = false; - Object icon = frame.opt("icon"); - if(icon != null) { - String asString = (icon instanceof String) ? (String)icon : null; - shouldRenderIcon = true; - if(icon == JSONObject.NULL || asString == null || asString.equalsIgnoreCase("none") || asString.equalsIgnoreCase("default") - || asString.equalsIgnoreCase("null") || asString.equalsIgnoreCase("color")) { - bitmap = null; - }else { - bitmap = BitmapFile.getCachedIcon(asString); - } - spriteX = spriteY = rotate = 0; - flipX = flipY = false; - color = new float[] { 0.0f, 0.0f, 0.0f, 0.0f }; - tint = new float[] { 1.0f, 1.0f, 1.0f, 1.0f }; - } - int sprtX = frame.optInt("icon_spriteX", -1) * 64; - if(sprtX >= 0 && sprtX != spriteX) { - shouldRenderIcon = true; - spriteX = sprtX; - } - int sprtY = frame.optInt("icon_spriteY", -1) * 64; - if(sprtY >= 0 && sprtY != spriteY) { - shouldRenderIcon = true; - spriteY = sprtY; - } - sprtX = frame.optInt("icon_pixelX", -1); - if(sprtX >= 0 && sprtX != spriteX) { - shouldRenderIcon = true; - spriteX = sprtX; - } - sprtY = frame.optInt("icon_pixelY", -1); - if(sprtY >= 0 && sprtY != spriteY) { - shouldRenderIcon = true; - spriteY = sprtY; - } - Object flip = frame.opt("icon_flipX"); - if(flip != null) { - shouldRenderIcon = true; - if(flip instanceof Boolean) { - flipX = ((Boolean)flip).booleanValue(); - }else { - flipX = false; - } - } - flip = frame.opt("icon_flipY"); - if(flip != null) { - shouldRenderIcon = true; - if(flip instanceof Boolean) { - flipY = ((Boolean)flip).booleanValue(); - }else { - flipY = false; - } - } - int rot = frame.optInt("icon_rotate", -1); - if(rot >= 0) { - shouldRenderIcon = true; - rotate = rot % 4; - } - JSONArray colorF = frame.optJSONArray("icon_color"); - if(colorF != null && colorF.length() > 0) { - shouldRenderIcon = true; - color[0] = colorF.getFloat(0); - color[1] = colorF.length() > 1 ? colorF.getFloat(1) : color[1]; - color[2] = colorF.length() > 2 ? colorF.getFloat(2) : color[2]; - color[3] = colorF.length() > 3 ? colorF.getFloat(3) : 1.0f; - } - colorF = frame.optJSONArray("icon_tint"); - if(colorF != null && colorF.length() > 0) { - shouldRenderIcon = true; - tint[0] = colorF.getFloat(0); - tint[1] = colorF.length() > 1 ? colorF.getFloat(1) : tint[1]; - tint[2] = colorF.length() > 2 ? colorF.getFloat(2) : tint[2]; - tint[3] = colorF.length() > 3 ? colorF.getFloat(3) : 1.0f; - } - if(shouldRenderIcon) { - int[] newIcon = null; - if(bitmap != null) { - newIcon = bitmap.getSprite(spriteX, spriteY); - } - if(newIcon == null) { - newIcon = new int[64*64]; - } - newIcon = BitmapFile.applyTint(newIcon, tint[0], tint[1], tint[2], tint[3]); - if(color[3] > 0.0f) { - newIcon = BitmapFile.applyColor(newIcon, color[0], color[1], color[2], color[3]); - } - if(bitmap != null) { - if(flipX) { - newIcon = BitmapFile.flipX(newIcon); + if(!this.motd.getAccept().equalsIgnoreCase("motd.noicon")) { + boolean shouldRenderIcon = false; + Object icon = frame.opt("icon"); + if(icon != null) { + String asString = (icon instanceof String) ? (String)icon : null; + shouldRenderIcon = true; + if(icon == JSONObject.NULL || asString == null || asString.equalsIgnoreCase("none") || asString.equalsIgnoreCase("default") + || asString.equalsIgnoreCase("null") || asString.equalsIgnoreCase("color")) { + bitmap = null; + }else { + bitmap = BitmapFile.getCachedIcon(asString); } - if(flipY) { - newIcon = BitmapFile.flipY(newIcon); - } - if(rotate != 0) { - newIcon = BitmapFile.rotate(newIcon, rotate); + spriteX = spriteY = rotate = 0; + flipX = flipY = false; + color = new float[] { 0.0f, 0.0f, 0.0f, 0.0f }; + tint = new float[] { 1.0f, 1.0f, 1.0f, 1.0f }; + } + int sprtX = frame.optInt("icon_spriteX", -1) * 64; + if(sprtX >= 0 && sprtX != spriteX) { + shouldRenderIcon = true; + spriteX = sprtX; + } + int sprtY = frame.optInt("icon_spriteY", -1) * 64; + if(sprtY >= 0 && sprtY != spriteY) { + shouldRenderIcon = true; + spriteY = sprtY; + } + sprtX = frame.optInt("icon_pixelX", -1); + if(sprtX >= 0 && sprtX != spriteX) { + shouldRenderIcon = true; + spriteX = sprtX; + } + sprtY = frame.optInt("icon_pixelY", -1); + if(sprtY >= 0 && sprtY != spriteY) { + shouldRenderIcon = true; + spriteY = sprtY; + } + Object flip = frame.opt("icon_flipX"); + if(flip != null) { + shouldRenderIcon = true; + if(flip instanceof Boolean) { + flipX = ((Boolean)flip).booleanValue(); + }else { + flipX = false; } } - motd.setBitmap(newIcon); - shouldPush = true; + flip = frame.opt("icon_flipY"); + if(flip != null) { + shouldRenderIcon = true; + if(flip instanceof Boolean) { + flipY = ((Boolean)flip).booleanValue(); + }else { + flipY = false; + } + } + int rot = frame.optInt("icon_rotate", -1); + if(rot >= 0) { + shouldRenderIcon = true; + rotate = rot % 4; + } + JSONArray colorF = frame.optJSONArray("icon_color"); + if(colorF != null && colorF.length() > 0) { + shouldRenderIcon = true; + color[0] = colorF.getFloat(0); + color[1] = colorF.length() > 1 ? colorF.getFloat(1) : color[1]; + color[2] = colorF.length() > 2 ? colorF.getFloat(2) : color[2]; + color[3] = colorF.length() > 3 ? colorF.getFloat(3) : 1.0f; + } + colorF = frame.optJSONArray("icon_tint"); + if(colorF != null && colorF.length() > 0) { + shouldRenderIcon = true; + tint[0] = colorF.getFloat(0); + tint[1] = colorF.length() > 1 ? colorF.getFloat(1) : tint[1]; + tint[2] = colorF.length() > 2 ? colorF.getFloat(2) : tint[2]; + tint[3] = colorF.length() > 3 ? colorF.getFloat(3) : 1.0f; + } + if(shouldRenderIcon) { + int[] newIcon = null; + if(bitmap != null) { + newIcon = bitmap.getSprite(spriteX, spriteY); + } + if(newIcon == null) { + newIcon = new int[64*64]; + } + newIcon = BitmapFile.applyTint(newIcon, tint[0], tint[1], tint[2], tint[3]); + if(color[3] > 0.0f) { + newIcon = BitmapFile.applyColor(newIcon, color[0], color[1], color[2], color[3]); + } + if(bitmap != null) { + if(flipX) { + newIcon = BitmapFile.flipX(newIcon); + } + if(flipY) { + newIcon = BitmapFile.flipY(newIcon); + } + if(rotate != 0) { + newIcon = BitmapFile.rotate(newIcon, rotate); + } + } + motd.setBitmap(newIcon); + shouldPush = true; + } } if(shouldPush) { motd.sendToUser(); diff --git a/src/plugin.yml b/src/plugin.yml index 598d8e0..670b2d3 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,4 +1,4 @@ name: EaglerMOTD main: net.lax1dude.eaglercraft.eaglermotd.EaglerMOTD -version: 1.0.3 +version: 1.0.4 author: LAX1DUDE \ No newline at end of file