From 6c2f7a47e2a41ccdd6b2c760d9f18cda21f2d7da Mon Sep 17 00:00:00 2001 From: Oier Bravo Urtasun Date: Sun, 13 Apr 2025 05:44:30 +0200 Subject: [PATCH] Utils, icons --- README.md | 4 ++++ gradle.properties | 2 +- .../foundation/gui/widget/EnergyDisplay.java | 6 +++--- .../foundation/utility/Iterate.java | 6 +++++- .../foundation/utility/Lang.java | 6 +++++- .../foundation/utility/LangBuilder.java | 6 +++++- .../foundation/utility/LangNumberFormat.java | 6 +++++- .../foundation/utility/ShapeBuilder.java | 6 +++++- .../foundation/utility/VecHelper.java | 6 +++++- .../foundation/utility/VoxelShaper.java | 6 +++++- .../register/LibGuiTextures.java | 2 +- .../mechanical_lemon_ui/register/LibIcons.java | 4 ++++ .../mechanical_lemon_ui/textures/gui/icons.png | Bin 638 -> 809 bytes 13 files changed, 48 insertions(+), 12 deletions(-) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..4b6ad6d --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +# Mechanical Lemon UI +- This library mod is a stripped version of Create ui foundation which is licensed under the MIT license. See Create's license for more information. +- All the credits go to the Creators of Create team. +- https://github.com/Creators-of-Create/Create diff --git a/gradle.properties b/gradle.properties index 57d9232..41d850d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ mixin_version = 0.8.5 modid=mechanical_lemon_ui mod_name=Mechanical Lemon UI mod_license=MIT -mod_version=0.1.3 +mod_version=0.1.8 mod_group_id=com.oierbravo author=oierbravo mod_description=Library diff --git a/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/gui/widget/EnergyDisplay.java b/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/gui/widget/EnergyDisplay.java index ccdff30..497a0e6 100644 --- a/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/gui/widget/EnergyDisplay.java +++ b/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/gui/widget/EnergyDisplay.java @@ -37,7 +37,7 @@ public class EnergyDisplay extends AbstractSimiWidget { drawBg(pGuiGraphics, LibGuiTextures.RF_VERTIVAL_BAR); int stored = (int)(height * (energy.getEnergyStored() / (float)energy.getMaxEnergyStored())); - pGuiGraphics.fillGradient(xPos,yPos + (height - stored),xPos + width, yPos + height,0xffb51500, 0xff600b00); + pGuiGraphics.fillGradient(xPos +1,yPos + 1 + (height - stored),xPos +1 + width, yPos - 1 + height,0xffb51500, 0xff600b00); if(isHovered()) { Font font = Minecraft.getInstance().font; pGuiGraphics.renderTooltip(font, getTooltips(), @@ -46,8 +46,8 @@ public class EnergyDisplay extends AbstractSimiWidget { } } - protected void drawBg(GuiGraphics graphics, LibGuiTextures button) { - graphics.blit(button.location, getX(), getY(), button.startX, button.startY, button.width, button.height); + protected void drawBg(GuiGraphics graphics, LibGuiTextures background) { + graphics.blit(background.location, getX(), getY(), background.startX, background.startY, background.width, background.height); } public List getTooltips() { diff --git a/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/Iterate.java b/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/Iterate.java index ff1c806..0b52a65 100644 --- a/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/Iterate.java +++ b/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/Iterate.java @@ -1,5 +1,9 @@ package com.oierbravo.mechanical_lemon_ui.foundation.utility; - +/* + * Credits: Creators of create + * https://github.com/Creators-of-Create/Create + * License: MIT + */ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/Lang.java b/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/Lang.java index a6d4690..415477d 100644 --- a/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/Lang.java +++ b/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/Lang.java @@ -1,5 +1,9 @@ package com.oierbravo.mechanical_lemon_ui.foundation.utility; - +/* + * Credits: Creators of create + * https://github.com/Creators-of-Create/Create + * License: MIT + */ import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/LangBuilder.java b/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/LangBuilder.java index bf722b5..3583b0a 100644 --- a/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/LangBuilder.java +++ b/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/LangBuilder.java @@ -1,5 +1,9 @@ package com.oierbravo.mechanical_lemon_ui.foundation.utility; - +/* + * Credits: Creators of create + * https://github.com/Creators-of-Create/Create + * License: MIT + */ import joptsimple.internal.Strings; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/LangNumberFormat.java b/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/LangNumberFormat.java index c9fe30a..963e1c9 100644 --- a/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/LangNumberFormat.java +++ b/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/LangNumberFormat.java @@ -1,5 +1,9 @@ package com.oierbravo.mechanical_lemon_ui.foundation.utility; - +/* + * Credits: Creators of create + * https://github.com/Creators-of-Create/Create + * License: MIT + */ import net.minecraft.client.Minecraft; import net.minecraft.util.Mth; diff --git a/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/ShapeBuilder.java b/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/ShapeBuilder.java index c0d1c9c..c7ebe4c 100644 --- a/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/ShapeBuilder.java +++ b/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/ShapeBuilder.java @@ -1,5 +1,9 @@ package com.oierbravo.mechanical_lemon_ui.foundation.utility; - +/* + * Credits: Creators of create + * https://github.com/Creators-of-Create/Create + * License: MIT + */ import net.minecraft.core.Direction; import net.minecraft.world.level.block.Block; import net.minecraft.world.phys.shapes.BooleanOp; diff --git a/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/VecHelper.java b/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/VecHelper.java index 17453d3..03bcbed 100644 --- a/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/VecHelper.java +++ b/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/VecHelper.java @@ -1,5 +1,9 @@ package com.oierbravo.mechanical_lemon_ui.foundation.utility; - +/* + * Credits: Creators of create + * https://github.com/Creators-of-Create/Create + * License: MIT + */ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/VoxelShaper.java b/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/VoxelShaper.java index f85b85d..7044612 100644 --- a/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/VoxelShaper.java +++ b/src/main/java/com/oierbravo/mechanical_lemon_ui/foundation/utility/VoxelShaper.java @@ -1,5 +1,9 @@ package com.oierbravo.mechanical_lemon_ui.foundation.utility; - +/* + * Credits: Creators of create + * https://github.com/Creators-of-Create/Create + * License: MIT + */ import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; import net.minecraft.core.Direction.AxisDirection; diff --git a/src/main/java/com/oierbravo/mechanical_lemon_ui/register/LibGuiTextures.java b/src/main/java/com/oierbravo/mechanical_lemon_ui/register/LibGuiTextures.java index 9fbe428..b88998e 100644 --- a/src/main/java/com/oierbravo/mechanical_lemon_ui/register/LibGuiTextures.java +++ b/src/main/java/com/oierbravo/mechanical_lemon_ui/register/LibGuiTextures.java @@ -18,7 +18,7 @@ public enum LibGuiTextures implements ScreenElement { BUTTON_HOVER("widgets", 18, 0, 18, 18), BUTTON_DOWN("widgets", 36, 0, 18, 18), SLOT_EMPTY("widgets", 36, 0, 18, 18), - RF_VERTIVAL_BAR("widgets",0,18,10,30), + RF_VERTIVAL_BAR("widgets",0,18,11,32), PROGRESS_ARROW_EMPTY("widgets",0,48,32,8), PROGRESS_ARROW_FULL("widgets",0,56,32,8) ; diff --git a/src/main/java/com/oierbravo/mechanical_lemon_ui/register/LibIcons.java b/src/main/java/com/oierbravo/mechanical_lemon_ui/register/LibIcons.java index 6e0bb2c..5f0e8ee 100644 --- a/src/main/java/com/oierbravo/mechanical_lemon_ui/register/LibIcons.java +++ b/src/main/java/com/oierbravo/mechanical_lemon_ui/register/LibIcons.java @@ -29,6 +29,10 @@ public class LibIcons implements ScreenElement { public static final LibIcons REDSTONE_IGNORE = next(); public static final LibIcons SEARCH = next(); public static final LibIcons CHECK = next(); + public static final LibIcons LOCK_OPEN = next(); + public static final LibIcons LOCK_CLOSE = next(); + public static final LibIcons TRIANGLE_EXCLAMATION_ORANGE = next(); + public static final LibIcons TRIANGLE_EXCLAMATION_MONO = next(); public LibIcons(int x, int y) { this.iconX = x * 16; diff --git a/src/main/resources/assets/mechanical_lemon_ui/textures/gui/icons.png b/src/main/resources/assets/mechanical_lemon_ui/textures/gui/icons.png index 91af02624151e86025be49ec4cdf5ab37a4b02c8..fca9998fa0b365f77704c3b18217bc0de8ea6928 100644 GIT binary patch delta 550 zcmV+>0@?lk1gQp)F@NJpL_t(|obB3ea-$#^0ARAS$FnEt9;ZFYazFcL?OFsCFdrt* zGn1J%5k!3X)DVD|b-8x|xQ<~M#`*s-M)#V9hY5-_V7H_Jeed*ZdEL74m99l6KbtpLb{aSV+J3de=IO+;77$jQ41K(|0DVLjZtgQg=nVmt&Vh?~mYwPDy!<|p- zxANR-{Aov?ern2}rrDEzZN0x|FQ9gVl|J7yfcZ4l2ve`L)=wMI))FB-rnT{}9kbOD zwWeQaT>ICQhd$XEfQoOEHr$%s^jxDq+q8c%!oQFIH-7?4$IRp&J@&q@!MYzEz_lJ* zy^=Iwa}Bqq6DZ{YM_9}N1Y5spBG{?E%|8L;*wAUE3I`>o1nci3aV znnzuw{7Y~6?Jh%S`fJX5YU}5$kG)#o`kS2bn$PU;%H9g{SHHp6-e~QufA?+22^VhQ3pY-E#s{@YH2?qr07*qoM6N<$f@2#QKL7v# delta 368 zcmV-$0gwKv2L1$)F@HEoL_t(|obB3Ca)K}r08r?7y!5oq{p=SGU_ufJ(#m@?epHhP zc6Zr`!vFwW&v^C$OhO3vmhmyh#j&3~e`~F+v2dna>d7g9Uk%(`GL_c*iLq+^?-0`O zTRA^w=GUI@R}Ge=Ozy!I8S%25h<2 zm0Lge3%}}P*g5~muBY|$ai5=e=pJCDAisK0`=S+-F#_R}KmraI7=8hZYVvi4)Y%dM O0000