From 898582fdb16b54b951039a5f3a5422d840da1688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?= Date: Wed, 23 Nov 2022 16:31:19 +0100 Subject: [PATCH] Apply BASE attribute methods improvements --- data.mv.db | Bin 40960 -> 32768 bytes maps/8fbb151f-682a-4357-ba92-157e4097898f.dat | 12 ++++++------ .../demo/gui/ItemIconView.java | 11 +++++------ .../00bd0625-b3b8-4abf-97b7-91f42bce28ec.xml | 2 +- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/data.mv.db b/data.mv.db index e4aa5e04481fa91de3c1971f8f7c19f97b24caf2..a67a08d86e676fc3cc33b86dad80ffa75342eeea 100644 GIT binary patch delta 3476 zcmZoTz|_#dr0QX1q?44BpPX%F4xxiHt5U5D4Gau)k~2#4vaL)kjg2O%s*7408|kFw zq?ROSq!wA37$+H78k;6=OkBw?O^(LRi2}>`6D*AlA(mPh>Exv5SsCi&CKgzk7$ocD zCRSLPnHcEgrB;+!nduZHrl%HL8R-<|=a*O+8kr=U7=VDWfrY6~NoH=Um0?<&A`OSAmrn~z+g9xLCE_616TM32z_>vw1g~c zZeoF+8E;-E<%SF(a5ZS# zC^s%Ehyj#QybmyN+z*3f5JX0i!I@DW>V` zlt#(W*fNLYnaPeuvh|Rn07qPbvV{S9zA&;dPDM|*So29La*QS;<&$*?Co!f>emGeh z>I!&)WCG2jhyp1IYk_2BVPb*e6e9~$tWHTmc1j9{Q}{r|uu&>BcoHYq8!P8Q0>%PX zMkZl8$pRcaXt^561@K&r)k!F!lZu?HMNo4!0|Vpr#O0gsRbFLeO6b_kVQIrypTulp zkj!UjWCAI=Kt)R;f@@}xW?+QGO-eB_LEa=LDFk(oNSVcP;73V zW@5o-SP!$Vmc|B1;bDI*>Zv44kvz)hwv^*T7f&Bg{57n4B08KY5=5 zdz|Mfa2eslfUPpcT}GVrVa8QPq$0|QG$PB0RIpEs2ds=h)TKs@sh~1~F?q5=gG9Ya z5;e0OQb~ZNZIJ{C18{Q!+P280UgH95seszHKrR)~>w02qbVSlbPHc#TY?@}6l$K~{ z3aZf)K#fpHN`}-C@RW?&V6?y}43n|ON{WSvDN@O6Yy@jC#(AEAr11vQ()c+aHk34u z++c*KabrVJ8XxGkqZ1MFijF)_vF66AKCu_3+`jP(p#8YiVC JPhPJd2mnPkG|B(~ literal 40960 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 diff --git a/maps/8fbb151f-682a-4357-ba92-157e4097898f.dat b/maps/8fbb151f-682a-4357-ba92-157e4097898f.dat index 0d9d7f3..29511e1 100644 --- a/maps/8fbb151f-682a-4357-ba92-157e4097898f.dat +++ b/maps/8fbb151f-682a-4357-ba92-157e4097898f.dat @@ -5,12 +5,12 @@ $413e09cf-ba41-4fe8-ac47-9697b5ad0245 Paths> $04ac5ad8-4100-4016-97b3-a51a728ca49d!?(2> Water> -$fc294b9e-105a-4120-8caa-393d78fdf414!?(2G - Objects belowF -$413e09cf-ba41-4fe8-ac47-9697b5ad0245<=<=PPPPKSTST[PPPPPP9lm;|}IstSTQRjkstz{QR9STIZWXYiPPPPyst]I]YPPNN``I``<=`WXQRYIJQRjk`]z{ST`STEFQRSTQRQRUVopIWXlmGH|}KUVQRABWXY[STQRIWXQRST^NNNQRABGHSTSTQRstWXJiWXWXy:QRWXEFQRQRUVABstQRGHY9STQRWXPPNNNNNNAB:WXQRlmQR|}2> -Main">2D - Objects aboveD -$413e09cf-ba41-4fe8-ac47-9697b5ad02453434CDCD3434CDCD34cd34CD34stcdCDCD12cdAB3434cdcdCDCD78ststGH12abABqrcdcdstcdst78abGHcdqrabcdstqrstcd34st34CD56cd34CD12abcd56EF78stCDABqrstEFGHcd56cdstcdabcd34EFstqr12stcdCDcd78ab34ABststGHcdcdqrCDababqrabqr34qr341278cd78cdCDCDABcdGHstGH56st78cdst56cdEFGHstab56EFstqrEF12cdcdcdAB34st12st56cdst78CDABcdEFstGH78abstUV12cd12GHqrcdABstABst2@ +$fc294b9e-105a-4120-8caa-393d78fdf414!?(2G + Objects belowF +$413e09cf-ba41-4fe8-ac47-9697b5ad0245<=<=PPPPKSTST[PPPPPP9lm;|}IstSTQRjkstz{QR9STIZWXYiPPPPyst]I]YPPNN``I``<=`WXQRYIJQRjk`]z{ST`STEFQRSTQRQRUVopIWXlmGH|}KUVQRABWXY[STQRIWXQRST^NNNQRABGHSTSTQRstWXJiWXWXy:WXEFQRQRUVABstQRGHY9STQRWXPPNNNNNNAB:WXQRlmQR|}2> +Main">2D + Objects aboveD +$413e09cf-ba41-4fe8-ac47-9697b5ad02453434CDCD3434CDCD34cd34CD34stcdCDCD12cdAB3434cdcdCDCD78ststGH12abABqrcdcdstcdst78abGHcdqrabcdstqrstcd34st34CD56cd34CD12abcd56EF78stCDABqrstEFGHcd56cdstcdabcd34EFstqr12stcdCDcd78ab34ABststGHcdcdqrCDababqrabqr34qr341278cd78cdCDCDABcdGHstGHst78cdst56cdGHstab56EFstqrEF12cdcdcdAB34st12st56cdst78CDABcdEFstGH78abstUV12cd12GHqrcdABstABst2@ Border forrest@ $413e09cf-ba41-4fe8-ac47-9697b5ad0245cdstcdstcdstcdst2 Layer 8* diff --git a/src/main/java/com/bartlomiejpluta/demo/gui/ItemIconView.java b/src/main/java/com/bartlomiejpluta/demo/gui/ItemIconView.java index 61a6ed2..007cada 100644 --- a/src/main/java/com/bartlomiejpluta/demo/gui/ItemIconView.java +++ b/src/main/java/com/bartlomiejpluta/demo/gui/ItemIconView.java @@ -78,13 +78,12 @@ public class ItemIconView extends IconView { throw new UnsupportedOperationException(); } - @Attribute("placeholder") - public void setPlaceholderIcon(String icon) { + @Attribute(value = "placeholder", separator = ",") + public void setPlaceholderIcon(String icon, int row, int column) { this.placeholderIconPaint = gui.createPaint(); - var parts = icon.split(","); - this.placeholderIconSet = gui.getIconSet(A.iconsets.get(parts[0]).uid); - this.placeholderIconSetRow = Integer.parseInt(parts[1]); - this.placeholderIconSetColumn = Integer.parseInt(parts[2]); + this.placeholderIconSet = gui.getIconSet(A.iconsets.get(icon).uid); + this.placeholderIconSetRow = row; + this.placeholderIconSetColumn = column; } private void handleKeyEvent(KeyEvent event) { diff --git a/widgets/00bd0625-b3b8-4abf-97b7-91f42bce28ec.xml b/widgets/00bd0625-b3b8-4abf-97b7-91f42bce28ec.xml index 6f53b89..f7e5464 100644 --- a/widgets/00bd0625-b3b8-4abf-97b7-91f42bce28ec.xml +++ b/widgets/00bd0625-b3b8-4abf-97b7-91f42bce28ec.xml @@ -17,7 +17,7 @@ - +