👷 improvements + fixes + funsies

- hover stuff
- scaling offset anchor shit is now actually working as it should.
- refactored the hitscan quite a bit.
- things are now able to fade, missed ProgressElement but im lazy i think.
- not sure how id get items to fade?
- Happenings are basically just things that can happen when you hover over the things. currently made it just for fun, wont exist later.
- added performance mods and qol dependencies

note: actual insane spaghetti code in the render method in AbstractElement. will hopefully clean it up but it works, so its okay for now

Author: axtrough

build.gradle

@@ -11,6 +11,11 @@ group = mod_group_id
 
 repositories {
     mavenLocal()
+
+    maven {
+        name = "Modrinth"
+        url = "https://api.modrinth.com/maven"
+    }
 }
 
 base {
@@ -92,6 +97,11 @@ sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 
 dependencies {
+    runtimeOnly("maven.modrinth:sodium:${sodium_version}")
+    runtimeOnly("maven.modrinth:immediatelyfast:${immfast_version}")
+    runtimeOnly("maven.modrinth:lithium:${lithium_version}")
+    runtimeOnly("maven.modrinth:better-modlist:${modlist_version}")
+    runtimeOnly("maven.modrinth:brick-furnace:mDs1svVc")
 
 }
 

gradle.properties

@@ -15,6 +15,12 @@ loader_version_range=[4,)
 mod_id=structura
 mod_name=Structura
 
+sodium_version=mc26.1.1-0.8.9-neoforge
+immfast_version=1.15.1+26.1.1-neoforge
+lithium_version=mc26.1.1-0.23.0-neoforge
+
+modlist_version=26.1.1
+
 mod_license=MIT
 mod_version=0.3.1
 mod_group_id=net.raccoon.will

src/main/java/net/raccoon/will/structura/api/feature/Hitscan.java

@@ -34,33 +34,41 @@ public static HitscanResult performHitscan(Player player, double maxDistance) {
         Vec3 eyePos = player.getEyePosition(1f);
         Vec3 lookVec = player.getLookAngle();
         Vec3 reachPos = eyePos.add(lookVec.scale(maxDistance));
-
-        //raytrace block first
         BlockHitResult blockHit = level.clip(new ClipContext(
                 eyePos,
                 reachPos,
                 ClipContext.Block.COLLIDER,
                 ClipContext.Fluid.NONE,
                 player
         ));
-        double blockDist = blockHit.getType() == HitResult.Type.MISS ? Double.MAX_VALUE
+
+        if (blockHit.getType() == HitResult.Type.MISS) {
+            blockHit = null;
+        }
+
+        double blockDist = blockHit == null ? Double.MAX_VALUE
                 : blockHit.getLocation().distanceTo(eyePos);
 
-        //check entities
         EntityHitResult entityHit = ProjectileUtil.getEntityHitResult(
                 level,
                 player,
                 eyePos,
                 reachPos,
-                player.getBoundingBox().expandTowards(lookVec.scale(maxDistance)).inflate(1.0),
+                player.getBoundingBox().expandTowards(lookVec.scale(maxDistance)).inflate(0.25),
                 e -> e instanceof LivingEntity && e != player,
-                1f
+                0.1f
         );
+
         double entityDist = entityHit == null ? Double.MAX_VALUE : entityHit.getLocation().distanceTo(eyePos);
 
-        //returns closest hit
-        if (entityDist < blockDist) return HitscanResult.entity(entityHit);
-        if (blockDist < Double.MAX_VALUE) return HitscanResult.block(blockHit);
+        if (blockDist <= entityDist && blockHit != null) {
+            return HitscanResult.block(blockHit);
+        }
+
+        if (entityHit != null) {
+            return HitscanResult.entity(entityHit);
+        }
+
         return HitscanResult.miss();
     }
 }

src/main/java/net/raccoon/will/structura/api/gui/animation/Happenings.java

@@ -0,0 +1,27 @@
+package net.raccoon.will.structura.api.gui.animation;
+
+import net.raccoon.will.structura.api.gui.element.AbstractElement;
+
+public class Happenings {
+
+    public static float easeInSine(float t) {
+        return (float) (1.0 - Math.cos((t * Math.PI) / 2.0));
+    }
+
+    public void scaling(float speed, AbstractElement element) {
+        float current = element.getScale();
+        float target = element.isHovered()
+                ? element.getInitialScale() * 2
+                : element.getInitialScale();
+
+        element.setScale(current + (target - current) * speed);
+    }
+
+    public void fading(float speed, AbstractElement element) {
+        float current = element.getAlpha();
+        float target = element.isHovered() ? 1.0f : 0.0f;
+
+        float eased = easeInSine(speed);
+        element.setAlpha(current + (target - current) * eased);
+    }
+}

src/main/java/net/raccoon/will/structura/api/gui/element/AbstractElement.java

@@ -26,15 +26,17 @@ public abstract class AbstractElement {
 
     protected final float initialScale;
     protected final int initialWidth, initialHeight, initialX, initialY;
+    protected float alpha = 1.0F;
 
-    public AbstractElement(String id, int width, int height, Anchor anchor, int posX, int posY) {
+    public AbstractElement(String id, int width, int height, Anchor anchor, int posX, int posY, float scale) {
         this.id = id;
 
         this.width = width;
         this.height = height;
         this.anchor = anchor;
         this.x = posX;
         this.y = posY;
+        this.scale = scale;
 
         this.initialWidth = width;
         this.initialHeight = height;
@@ -44,15 +46,45 @@ public AbstractElement(String id, int width, int height, Anchor anchor, int posX
     }
 
     protected abstract void draw(GuiGraphicsExtractor graphics);
-    public void render(GuiGraphicsExtractor graphics, int screenWidth, int screenHeight) {
+
+    public void render(GuiGraphicsExtractor graphics, int mouseX, int mouseY, int screenWidth, int screenHeight) {
+        if (alpha == 0.0F) visible = false;
         if (!visible) return;
+        boolean wasHovered = this.isHovered;
 
         int x = getRenderX(screenWidth);
         int y = getRenderY(screenHeight);
 
+        this.isHovered = isActive()
+                && mouseX >= x && mouseY >= y
+                && mouseX < x + (int)(width * initialScale)
+                && mouseY < y + (int)(height * initialScale);
+
+        if (isHovered && !wasHovered) onHoverStart();
+        else if (!isHovered && wasHovered) onHoverEnd();
+        if (isHovered) onHover();
+
         graphics.pose().pushMatrix();
+
+        //holy spaghetti code
+        float pivotX = switch (elementAnchor) {
+            case TOP_LEFT, CENTER_LEFT, BOTTOM_LEFT -> 0;
+            case TOP_CENTER, CENTER, BOTTOM_CENTER -> width / 2f;
+            case TOP_RIGHT, CENTER_RIGHT, BOTTOM_RIGHT -> (float) width;
+        };
+
+        float pivotY = switch (elementAnchor) {
+            case TOP_LEFT, TOP_CENTER, TOP_RIGHT -> 0;
+            case CENTER_LEFT, CENTER, CENTER_RIGHT -> height / 2f;
+            case BOTTOM_LEFT, BOTTOM_CENTER, BOTTOM_RIGHT -> (float) height;
+        };
+
         graphics.pose().translate(x, y);
-        graphics.pose().scale(scale, scale);
+        graphics.pose().translate(pivotX * initialScale, pivotY * initialScale);
+        graphics.pose().scale(scale / initialScale, scale / initialScale);
+        graphics.pose().translate(-pivotX * initialScale, -pivotY * initialScale);
+        graphics.pose().scale(initialScale, initialScale);
+
         draw(graphics);
 
         if (debug) {
@@ -67,20 +99,6 @@ public boolean isActive() {
         return this.visible && this.active;
     }
 
-
-
-    public int getRight() {
-        return this.getX() + this.width;
-    }
-
-    public int getBottom() {
-        return this.getY() + this.height;
-    }
-
-    private boolean areCoordinatesInRectangle(double x, double y) {
-        return x >= (double)this.getX() && y >= (double)this.getY() && x < (double)this.getRight() && y < (double)this.getBottom();
-    }
-
     public int getWidth() {
         return this.width;
     }
@@ -89,13 +107,9 @@ public int getHeight() {
         return this.height;
     }
 
-    public boolean isMouseOver(double mouseX, double mouseY) {
-        return this.isActive() && this.areCoordinatesInRectangle(mouseX, mouseY);
-    }
-
-    public boolean isHovered() {
-        return this.isHovered;
-    }
+    public void onHoverStart() {}
+    public void onHover() {}
+    public void onHoverEnd() {}
 
     //* Misc
     public void debug (boolean debug) {
@@ -106,6 +120,14 @@ public String getId() {
         return id;
     }
 
+    public float getAlpha() {
+        return alpha;
+    }
+
+    public void setAlpha(float alpha) {
+        this.alpha = Math.max(0f, Math.min(1f, alpha));
+    }
+
     public void setVisible(boolean visible) {
         this.visible = visible;
     }
@@ -122,6 +144,10 @@ public float getScale() {
         return scale;
     }
 
+    public float getInitialScale() {
+        return initialScale;
+    }
+
     public void setX(int posX) {
         this.x = posX;
     }
@@ -161,8 +187,6 @@ public ElementAnchor getElementAnchor() {
         return elementAnchor;
     }
 
-    //* Helpers
-
     public void offHandOffset() {
         this.setX(this.getInitialX() + 29);
     }
@@ -190,6 +214,9 @@ public void update() {
         updateSize();
     }
 
+    public boolean isHovered() {
+        return isHovered;
+    }
 
     public static abstract class Builder<T extends Builder<T>> {
         protected final String id;
@@ -244,8 +271,8 @@ protected int getRenderX(int screenWidth) {
 
         int adjustmentX = switch (elementAnchor) {
             case TOP_LEFT, CENTER_LEFT, BOTTOM_LEFT -> 0;
-            case TOP_CENTER, CENTER, BOTTOM_CENTER -> (int) (width * scale / 2f);
-            case TOP_RIGHT, CENTER_RIGHT, BOTTOM_RIGHT -> (int) (width * scale);
+            case TOP_CENTER, CENTER, BOTTOM_CENTER -> (int) (width * initialScale / 2f);
+            case TOP_RIGHT, CENTER_RIGHT, BOTTOM_RIGHT -> (int) (width * initialScale);
         };
 
         return anchorX - adjustmentX;
@@ -260,8 +287,8 @@ protected int getRenderY(int screenHeight) {
 
         int adjustmentY = switch (elementAnchor) {
             case TOP_LEFT, TOP_CENTER, TOP_RIGHT -> 0;
-            case CENTER_LEFT, CENTER, CENTER_RIGHT -> (int) (height * scale / 2f);
-            case BOTTOM_LEFT, BOTTOM_CENTER, BOTTOM_RIGHT -> (int) (height * scale);
+            case CENTER_LEFT, CENTER, CENTER_RIGHT -> (int) (height * initialScale / 2f);
+            case BOTTOM_LEFT, BOTTOM_CENTER, BOTTOM_RIGHT -> (int) (height * initialScale);
         };
 
         return anchorY - adjustmentY;

src/main/java/net/raccoon/will/structura/api/gui/element/BasicElement.java

@@ -3,6 +3,7 @@
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.resources.Identifier;
+import net.minecraft.util.ARGB;
 import net.raccoon.will.structura.api.gui.layout.Anchor;
 
 /**
@@ -15,22 +16,14 @@ public class BasicElement extends AbstractElement {
     protected final int texWidth, texHeight;
 
     public BasicElement(Builder builder) {
-        super(builder.id, builder.width, builder.height, builder.anchor, builder.x, builder.y);
+        super(builder.id, builder.width, builder.height, builder.anchor, builder.x, builder.y, builder.scale);
         this.texture = builder.texture;
         this.originalTexture = builder.texture;
         this.texWidth = builder.texWidth;
         this.texHeight = builder.texHeight;
         this.elementAnchor = builder.elementAnchor;
     }
 
-    //fallback if no texture is provided
-    public BasicElement(String id, int width, int height, int texWidth, int texHeight, Anchor anchor, int offsetX, int offsetY) {
-        super(id, width, height, anchor, offsetX, offsetY);
-        this.texture = null;
-        this.originalTexture = null;
-        this.texWidth = texWidth;
-        this.texHeight = texHeight;
-    }
 
     public void resetTexture() {
         this.texture = originalTexture;
@@ -45,7 +38,9 @@ public void setTexture(Identifier texture) {
     @Override
     protected void draw(GuiGraphicsExtractor graphics) {
         if (texture == null) return;
-        graphics.blit(RenderPipelines.GUI_TEXTURED, texture, 0, 0, 0, 0, width, height, texWidth, texHeight);
+        int color = ARGB.color(255,255,255);
+        int alphaColor = ARGB.multiplyAlpha(color, alpha);
+        graphics.blit(RenderPipelines.GUI_TEXTURED, texture, 0, 0, 0, 0, width, height, texWidth, texHeight, alphaColor);
     }
 
     public static Builder builder(String id) {
@@ -54,8 +49,8 @@ public static Builder builder(String id) {
 
     public static class Builder extends AbstractElement.Builder<Builder> {
         private Identifier texture;
-        private int texWidth = 128;
-        private int texHeight = 128;
+        private int texWidth = 64;
+        private int texHeight = 64;
 
         public Builder(String id) {
             super(id);

src/main/java/net/raccoon/will/structura/api/gui/element/ItemElement.java

@@ -15,7 +15,7 @@ public class ItemElement extends AbstractElement {
 
 
     public ItemElement(Builder builder) {
-        super(builder.id, builder.width, builder.height, builder.anchor, builder.x, builder.y);
+        super(builder.id, builder.width, builder.height, builder.anchor, builder.x, builder.y, builder.scale);
         this.item = builder.item;
         this.originalItem = builder.item;
         this.elementAnchor = builder.elementAnchor;

src/main/java/net/raccoon/will/structura/api/gui/element/ProgressElement.java

@@ -18,7 +18,7 @@ public class ProgressElement extends AbstractElement {
     private float progress;
 
     public ProgressElement(Builder builder) {
-        super(builder.id, builder.width, builder.height, builder.anchor, builder.x, builder.y);
+        super(builder.id, builder.width, builder.height, builder.anchor, builder.x, builder.y, builder.scale);
         this.texture = builder.texture;
         this.texWidth = builder.texWidth;
         this.texHeight = builder.texHeight;
@@ -29,34 +29,6 @@ public ProgressElement(Builder builder) {
         this.elementAnchor = builder.elementAnchor;
     }
 
-    /** <P>
-     * Creates a progress bar GUI element rendered from a single texture.
-     *</P>
-     *
-     * <p>
-     * Texture coordinates ({@code emptyX}, {@code emptyY}, {@code fullX}, {@code fullY})
-     * refer to the <b>top-left corner</b> of each bar region within the texture.
-     * </p>
-     *
-     * @param texture the texture containing both bars (empty and full)
-     * @param texWidth  the total width of the texture
-     * @param texHeight the total height of the texture
-     * @param barWidth  the width of the progress bar
-     * @param barHeight the height of the progress bar
-     */
-
-    public ProgressElement(String id, Identifier texture, int texWidth, int texHeight, int barWidth, int barHeight,
-                           int emptyX, int emptyY, int fullX, int fullY, Anchor anchor, int offsetX, int offsetY) {
-        super(id, barWidth, barHeight, anchor, offsetX, offsetY);
-        this.texture = texture;
-        this.texWidth = texWidth;
-        this.texHeight = texHeight;
-        this.emptyX = emptyX;
-        this.emptyY = emptyY;
-        this.fullX = fullX;
-        this.fullY = fullY;
-    }
-
     public void setProgress(float progress) {
         this.progress = Math.min(1.0F, Math.max(0.0F, progress));
     }