From 3620cf91bb0f2db7062bf1f0f599f6bdd3908668 Mon Sep 17 00:00:00 2001 From: ReignOfFROZE Date: Mon, 3 Mar 2025 10:20:25 -0500 Subject: [PATCH] Added new icons and adjusted GUI scale --- dependencies.gradle | 2 +- .../client/gui/loki/GuiLokiSchematics.java | 27 +++++++++--------- .../assets/botania/textures/gui/check.png | Bin 339 -> 286 bytes .../assets/botania/textures/gui/delete.png | Bin 350 -> 296 bytes .../assets/botania/textures/gui/rename.png | Bin 663 -> 341 bytes 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 452c6095d..b323c0a98 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -16,6 +16,6 @@ dependencies { compileOnly('curse.maven:cofh-lib-220333:2388748') compileOnly('curse.maven:minefactory-reloaded-66672:2366150') devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.18-GTNH:dev') -// runtimeOnlyNonPublishable('com.github.GTNewHorizons:ModularUI2:2.2.4-1.7.10:dev') + runtimeOnlyNonPublishable('com.github.GTNewHorizons:ModularUI2:2.2.4-1.7.10:dev') } diff --git a/src/main/java/vazkii/botania/client/gui/loki/GuiLokiSchematics.java b/src/main/java/vazkii/botania/client/gui/loki/GuiLokiSchematics.java index 03fe93151..203378912 100644 --- a/src/main/java/vazkii/botania/client/gui/loki/GuiLokiSchematics.java +++ b/src/main/java/vazkii/botania/client/gui/loki/GuiLokiSchematics.java @@ -64,20 +64,20 @@ public class GuiLokiSchematics extends CustomModularScreen { .imageSize(330, 252) .adaptable(12) .build(); - final UITexture checkIcon = AdaptableUITexture + final UITexture checkIcon = UITexture .builder() .location("botania:textures/gui/check") - .imageSize(16, 16) + .imageSize(20, 20) .build(); - final UITexture deleteIcon = AdaptableUITexture + final UITexture deleteIcon = UITexture .builder() .location("botania:textures/gui/delete") - .imageSize(16, 16) + .imageSize(20, 20) .build(); - final UITexture renameIcon = AdaptableUITexture + final UITexture renameIcon = UITexture .builder() .location("botania:textures/gui/rename") - .imageSize(16, 16) + .imageSize(20, 20) .build(); selectedSchematic = itemStack.getTagCompound().getString(ItemLokiRing.TAG_CURRENT_SCHEMATIC); @@ -88,20 +88,19 @@ public class GuiLokiSchematics extends CustomModularScreen { Set deleted = new HashSet<>(); final ScrollWidget scrollWidget = new ScrollWidget<>(new VerticalScrollData()); - scrollWidget.getScrollArea().getScrollY().setScrollSize(ring.schematicNames.size() * (SCROLL_AREA_HEIGHT / 10 + 1)); + scrollWidget.getScrollArea().getScrollY().setScrollSize(ring.schematicNames.size() * (SCROLL_AREA_HEIGHT / 5 + 1)); int idx = 0; for(Object key : itemStack.getTagCompound().getCompoundTag(ItemLokiRing.TAG_SAVED_SCHEMATICS).tagMap.keySet()) { scrollWidget.child( new Row() - .sizeRel(1f, 0.1f) - .pos(0, ring.schematicNames.indexOf(key) * (SCROLL_AREA_HEIGHT / 10 + 1)) + .sizeRel(1f, 0.2f) + .pos(0, ring.schematicNames.indexOf(key) * (SCROLL_AREA_HEIGHT / 5 + 1)) .padding(5, 0, 5, 5) .setEnabledIf((w) -> !deleted.contains(key)) .background(new Rectangle() .setColor(idx % 2 == 0 ? Color.ORANGE.brighter(3) : Color.ORANGE.brighter(2))) .child( new TextWidget(key.toString()) - .scale(0.5f) .widthRel(0.72f)) .child( new ParentWidget<>() @@ -118,7 +117,7 @@ public class GuiLokiSchematics extends CustomModularScreen { }) .background(checkIcon) .hoverBackground(checkIcon) - .size(8, 8) + .size(20,20) .center())) .child( new ParentWidget<>() @@ -134,7 +133,7 @@ public class GuiLokiSchematics extends CustomModularScreen { }) .background(renameIcon) .hoverBackground(renameIcon) - .size(8, 8) + .size(20, 20) .center())) .child( new ParentWidget<>() @@ -150,7 +149,7 @@ public class GuiLokiSchematics extends CustomModularScreen { }) .background(deleteIcon) .hoverBackground(deleteIcon) - .size(8, 8) + .size(20, 20) .center()))); idx++; } @@ -161,7 +160,7 @@ public class GuiLokiSchematics extends CustomModularScreen { .style(EnumChatFormatting.BLACK) .align(Alignment.TopCenter) .marginTop(8) - .scale(0.5F)) + .scale(0.75f)) .child( scrollWidget .pos(10, 20) diff --git a/src/main/resources/assets/botania/textures/gui/check.png b/src/main/resources/assets/botania/textures/gui/check.png index 179276db5e9d2e4ea14654b6ea4f11627d61aaef..5e1216cf8abbca489bfb2951f6d69a041df5033e 100644 GIT binary patch delta 264 zcmcc2G>=KKGr-TCmrII^fq{Y7)59eQNQ;0l2Q!e|75>(KqM|~*P=HT}E0d)qr>mK0 zudUHZM@DfKpmbxQb^?%MD+%%o{tp5SoA)o-4;0}n@Q5sCVBk9p!i>lBSEK+1n>}3| zLo|Y8Cms|!qQK*%c=Z4Or@AU@%WNwuJ~#OsiQ=B0yg|%k)2m&pB9@%AH$FPuQAu!z z?cNV3CdXa)aH2co22Yyqw1;)(NjGhFMU)tQ*wo=!_ROGrE|bXTlp`|>R7-c?nYkg8 z{Y4*h`lhcT@;6FcGQyspYhJMT3A^LXKc8h~*GT_iFppg7N(3UIsz1wAy;w(Za@R&tSC| z7`%X>S6J`@vS6LU&I>Fy78YXb4J>SgfhB)tw=qpvcM^P6^2p~$LLU6HsFL4vRn=2)&Tntcq?|LPA z9UCF|SzJ$H;vkj0IV}b7^~Cq-)%Xe=1Lwfwb{y}fFzG1&{=xzoGr-TCmrII^fq{Y7)59eQNQ;0l2Q!e|75>(KqN0MXP=HT}t0%Wfk)-)@ z3$Lq@k@_t9K3aDPH>j z|LI$`w7ky?zr|=?SW(5{H?f7n6f$4rX!dGkwEtuzDa#F+Mpl;y0 z4|(ew<9B*C81G6{EDN`|djPX5x%T1a+8Yr9WVtk14-=ro6{!H%hlz}_EVLu;p zKE}Czvh^jdaFOMh-=Oe>Ph8_Z?q9GC2j7VqZ%}~YW7fb|tcTWZN;K+lhdsXHmy;$Y zVF4by9gEiyPC7kjXgx2%Ni~y@{f%mHQpqGA<01^P``f%Hzgiw(s7(KqM|~*Zh%jStGGn|@);@HPjp1E?yS2=MJH1)^uk|f1J$f*OLhI-F{MfqK^qbhd z;(|xI&wZ}xg!{cUdYY7ShDGdsi?ijWIjwJ2{5CRHT=I33p_0%tm0#ZZDK1Aum=>Q| zeu1m9kHbfFW7zVa5oz1jsm@RFo^8KBIkZ;n0k8HK*1x|l?|%$*BZH@_pUXO@geCyH C*@b`r delta 644 zcmV-~0(VoE%A#f2(9UTq(<8K>nLc%h%G5s4FdPZLF@|UR73RNyOv! zPQTv;Os%ItREmQxhy9!o`T69S%^WT)w1!pna?jYalS%qzI2s<+e4m~ zz&}0Bj)DTKHx#smUD{&Ev=Tc7(j9l`5Pi?gky*H;TsJxT5GbP4v*8^-laV4 zjoBfX7PIu38ou`ZBrqPLq}WDGPx7Sgo#O26vBS)&7{FivU0=E!KeCt1jEu>Sx!6g* ed)z6z|D8YZLI7mY_>l4d0000