Merge pull request #4 from jumpcutfindo/1.21.6

feat: 1.21.6

Author: jumpcutfindo

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.10-SNAPSHOT'
+    id 'fabric-loom' version "${loom_version}"
     id 'maven-publish'
 }
 

gradle.properties

@@ -4,18 +4,19 @@ https.protocols=TLSv1.2,TLSv1.3
 org.gradle.parallel=true
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.5
-yarn_mappings=1.21.5+build.1
-loader_version=0.16.13
+minecraft_version=1.21.6
+yarn_mappings=1.21.6+build.1
+loader_version=0.17.3
+loom_version=1.11-SNAPSHOT
 # Mod Properties
-mod_version=1.0.1-1.21.5
+mod_version=1.0.1-1.21.6
 maven_group=com.jumpcutfindo
 archives_base_name=onmymark
 # Dependencies
 # Fabric API
-fabric_version=0.119.9+1.21.5
+fabric_version=0.128.2+1.21.6
 # modmenu
-modmenu_version=14.0.0-rc.2
+modmenu_version=15.0.0-beta.3
 # owo-lib
 # https://maven.wispforest.io/io/wispforest/owo-lib/
-owo_version=0.12.21+1.21.5
+owo_version=0.12.21+1.21.6

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/com/jumpcutfindo/onmymark/OnMyMarkConfigModel.java

@@ -8,7 +8,7 @@
 @Config(name = OnMyMarkMod.MOD_ID, wrapperName = "OnMyMarkConfig")
 public class OnMyMarkConfigModel {
 
-    @SectionHeader("markerDrawingSection")
+    @SectionHeader("markerPositionSection")
     @Sync(Option.SyncMode.NONE)
     public ClampType markerClampType = ClampType.DEFAULT_CLAMP_TYPE;
 
@@ -20,7 +20,7 @@ public class OnMyMarkConfigModel {
     @Sync(Option.SyncMode.NONE)
     public int circleClampDiameter = ClampType.DEFAULT_OVAL_CLAMP_PADDING;
 
-    @SectionHeader("markerPointerSection")
+    @SectionHeader("markerStyleSection")
 
     @RangeConstraint(min = 0.60F, max = 1.00F)
     @Sync(Option.SyncMode.NONE)
@@ -34,6 +34,18 @@ public class OnMyMarkConfigModel {
     @Sync(Option.SyncMode.NONE)
     public int markerPointerHeight = MarkerRenderer.DEFAULT_POINTER_HEIGHT;
 
+    @Sync(Option.SyncMode.NONE)
+    public boolean isIconTileVisible = true;
+
+    @Sync(Option.SyncMode.NONE)
+    public boolean isPlayerHeadEnabled = true;
+
+    @RangeConstraint(min = 0.60F, max = 1.50F)
+    @Sync(Option.SyncMode.NONE)
+    public float playerHeadScale = 1.0F;
+
+    @SectionHeader("markerLifetimeSection")
+
     @RangeConstraint(min = 1, max = 86400)
     @Sync(Option.SyncMode.OVERRIDE_CLIENT)
     public long blockMarkerLifetimeSecs = BlockMarkerRenderer.DEFAULT_LIFETIME_SECS;

src/main/java/com/jumpcutfindo/onmymark/client/OnMyMarkClient.java

@@ -1,16 +1,15 @@
 package com.jumpcutfindo.onmymark.client;
 
 import com.jumpcutfindo.onmymark.OnMyMarkMod;
+import com.jumpcutfindo.onmymark.client.graphics.OnMyMarkRenderer;
+import com.jumpcutfindo.onmymark.client.input.InputListener;
 import com.jumpcutfindo.onmymark.client.marker.ClientMarkerManager;
 import com.jumpcutfindo.onmymark.client.party.ClientPartyManager;
-import com.jumpcutfindo.onmymark.client.input.InputListener;
-import com.jumpcutfindo.onmymark.client.graphics.OnMyMarkRenderer;
 import com.jumpcutfindo.onmymark.client.sounds.CustomSoundEvents;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
-import net.fabricmc.fabric.api.client.rendering.v1.HudLayerRegistrationCallback;
-import net.fabricmc.fabric.api.client.rendering.v1.IdentifiedLayer;
+import net.fabricmc.fabric.api.client.rendering.v1.hud.HudElementRegistry;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.util.Identifier;
 
@@ -41,13 +40,7 @@ public void onInitializeClient() {
     }
 
     private void registerRenderer() {
-        HudLayerRegistrationCallback.EVENT.register(layeredDrawer ->
-                layeredDrawer.attachLayerAfter(
-                        IdentifiedLayer.MISC_OVERLAYS,
-                        Identifier.of(OnMyMarkMod.MOD_ID, "render_overlay"),
-                        renderer::render
-                )
-        );
+        HudElementRegistry.addLast(Identifier.of(OnMyMarkMod.MOD_ID, "render_overlay"), renderer::render);
     }
 
     private void registerInputListener() {

src/main/java/com/jumpcutfindo/onmymark/client/graphics/markers/BlockMarkerRenderer.java

@@ -30,8 +30,7 @@ public void drawLabel(DrawContext drawContext, float screenX, float screenY, boo
         if (blockItem.isEmpty()) {
             super.drawLabel(drawContext, screenX, screenY, isOutlined);
         } else {
-
-            DrawUtils.drawItemOutlined(drawContext, blockItem, (int) screenX, (int) screenY, this.getPointerColor());
+            DrawUtils.drawItemTiled(drawContext, blockItem, (int) screenX, (int) screenY, this.getPointerColor());
         }
 
     }

src/main/java/com/jumpcutfindo/onmymark/client/graphics/markers/EntityMarkerRenderer.java

@@ -73,10 +73,10 @@ public void drawLabel(DrawContext drawContext, float screenX, float screenY, boo
         Entity entity = this.entityMarker.entity();
 
         if (entity instanceof ItemEntity item) {
-            DrawUtils.drawItemOutlined(drawContext, item.getStack(), (int) screenX, (int) screenY, this.getPointerColor());
+            DrawUtils.drawItemTiled(drawContext, item.getStack(), (int) screenX, (int) screenY, this.getPointerColor());
             drawContext.drawStackOverlay(MinecraftClient.getInstance().textRenderer, item.getStack(), (int) screenX, (int) screenY);
         } else if (entity instanceof VehicleEntity vehicle) {
-            DrawUtils.drawItemOutlined(drawContext, ((VehicleEntityMixin) vehicle).asItem().getDefaultStack(), (int) screenX, (int) screenY, this.getPointerColor());
+            DrawUtils.drawItemTiled(drawContext, ((VehicleEntityMixin) vehicle).asItem().getDefaultStack(), (int) screenX, (int) screenY, this.getPointerColor());
         } else {
             super.drawLabel(drawContext, screenX, screenY, isOutlined);
         }

src/main/java/com/jumpcutfindo/onmymark/client/graphics/markers/MarkerRenderer.java

@@ -3,9 +3,13 @@
 import com.jumpcutfindo.onmymark.OnMyMarkMod;
 import com.jumpcutfindo.onmymark.client.graphics.utils.DrawUtils;
 import com.jumpcutfindo.onmymark.client.graphics.utils.RenderMath;
+import com.jumpcutfindo.onmymark.client.party.ClientPartyMember;
 import com.jumpcutfindo.onmymark.marker.Marker;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.PlayerSkinDrawer;
+import net.minecraft.client.util.SkinTextures;
+import net.minecraft.util.Colors;
 import net.minecraft.util.math.ColorHelper;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
@@ -30,6 +34,8 @@ public abstract class MarkerRenderer {
     private boolean isClamped;
     private float clampWidth, clampHeight;
 
+    private final SkinTextures playerSkinTextures;
+
     protected MarkerRenderer(MinecraftClient client, Marker marker, PointerShape pointerShape) {
         this.client = client;
         this.marker = marker;
@@ -40,6 +46,12 @@ protected MarkerRenderer(MinecraftClient client, Marker marker, PointerShape poi
         this.pointerShape = pointerShape;
 
         this.creationTime = Instant.now();
+
+        this.playerSkinTextures = MinecraftClient.getInstance()
+                .getSkinProvider()
+                .getSkinTextures(
+                        ((ClientPartyMember)marker.owner()).gameProfile()
+                );
     }
 
     public Vector4f screenPos() {
@@ -154,26 +166,37 @@ public void draw(DrawContext drawContext) {
         float pointerHeight = OnMyMarkMod.CONFIG.markerPointerHeight() * pointerSizeModifier;
         int pointerColor = ColorHelper.withAlpha((int) Math.min((float) existTimeMs / 20, 1.0F) * 255, this.getPointerColor());
 
-        if (this.isClamped) {
+        // Calculate label width
+        int labelWidth = this.getLabelWidth();
+        int labelHeight = this.getLabelHeight();
+
+        float playerHeadScale = OnMyMarkMod.CONFIG.playerHeadScale();
 
+        if (this.isClamped) {
             // Draw edge pointer if the marker has been clamped
             this.drawEdgePointer(drawContext, pointerWidth, pointerHeight, pointerColor);
 
-            Vector2f iconPos = this.getClampedLabelPos(this.getLabelWidth(), this.getLabelHeight(), 16F + distanceLabelHeight * screenPosNormal.y);
-            this.drawLabel(drawContext, iconPos.x(), iconPos.y(), true);
+            Vector2f labelPos = this.getClampedLabelPos(labelWidth, labelHeight, 16F + distanceLabelHeight * screenPosNormal.y);
+
+            this.drawLabel(drawContext, labelPos.x(), labelPos.y(), true);
+            this.drawDistanceLabel(drawContext, labelPos.x() + labelWidth / 2F - distanceLabelWidth / 2F, labelPos.y() + labelHeight + 4F, distanceLabelScale);
 
-            this.drawDistanceLabel(drawContext, iconPos.x() + getLabelWidth() / 2F - distanceLabelWidth / 2F, iconPos.y() + getLabelHeight() + 4F, distanceLabelScale);
+            if (OnMyMarkMod.CONFIG.isPlayerHeadEnabled()) {
+                this.drawPlayerHead(drawContext, labelPos.x() - 4F, labelPos.y() + labelHeight / 2F, playerHeadScale);
+            }
         } else {
             // Draw pointer that points directly toward object
-
             this.drawPointer(drawContext, pointerWidth, pointerHeight, pointerColor);
 
-            float screenX = screenPos.x() - this.getLabelWidth() / 2F;
-            float screenY = screenPos.y() - OnMyMarkMod.CONFIG.markerPointerHeight() - getLabelHeight() - 4F;
+            float screenX = screenPos.x() - labelWidth / 2F;
+            float screenY = screenPos.y() - OnMyMarkMod.CONFIG.markerPointerHeight() - labelHeight - 4F;
 
             this.drawLabel(drawContext, screenX, screenY, true);
-
             this.drawDistanceLabel(drawContext, screenPos.x() - distanceLabelWidth / 2F, screenPos.y() - OnMyMarkMod.CONFIG.markerPointerHeight() - distanceLabelHeight - 24F, distanceLabelScale);
+
+            if (OnMyMarkMod.CONFIG.isPlayerHeadEnabled()) {
+                this.drawPlayerHead(drawContext, screenX - 4F, screenY + labelHeight / 2F, playerHeadScale);
+            }
         }
 
     }
@@ -190,7 +213,7 @@ private void drawPointer(DrawContext drawContext, float width, float height, int
             float x3 = this.screenPos.x + width / 2F;
             float y3 = this.screenPos.y - height;
 
-            DrawUtils.drawTriangle(drawContext, x1, y1, x2, y2, x3, y3, color);
+            DrawUtils.drawTriangle(drawContext, (int) x1, (int) y1, (int) x2, (int) y2, (int) x3, (int) y3, color);
         } else {
             float x2 = this.screenPos.x - width / 2F;
             float y2 = this.screenPos.y - height / 2F;
@@ -201,7 +224,7 @@ private void drawPointer(DrawContext drawContext, float width, float height, int
             float x4 = this.screenPos.x + width / 2F;
             float y4 = this.screenPos.y - height / 2F;
 
-            DrawUtils.drawQuad(drawContext, x1, y1, x2, y2, x3, y3, x4, y4, color);
+            DrawUtils.drawQuad(drawContext, (int) x1, (int) y1, (int) x2, (int) y2, (int) x3, (int) y3, (int) x4, (int) y4, color);
         }
 
     }
@@ -219,10 +242,21 @@ private String getDistanceLabelString() {
     }
 
     private void drawDistanceLabel(DrawContext drawContext, float screenX, float screenY, float scale) {
-        drawContext.getMatrices().push();
-        drawContext.getMatrices().scale(scale, scale, scale);
-        drawContext.drawText(this.client.textRenderer, getDistanceLabelString(), (int) (screenX / scale), (int) (screenY / scale), 0xFFFFFFFF, true);
-        drawContext.getMatrices().pop();
+        drawContext.getMatrices().pushMatrix();
+        drawContext.getMatrices().scale(scale, scale);
+        drawContext.drawText(this.client.textRenderer, getDistanceLabelString(), (int) (screenX / scale), (int) (screenY / scale), Colors.WHITE, true);
+        drawContext.getMatrices().popMatrix();
+    }
+
+    private void drawPlayerHead(DrawContext drawContext, float screenX, float screenY, float scale) {
+        float headSize = 8 * scale;
+
+        int headScreenX = (int) (screenX - headSize);
+        int headScreenY = (int) (screenY - headSize / 2);
+
+        if (this.playerSkinTextures != null) {
+            PlayerSkinDrawer.draw(drawContext, this.playerSkinTextures.texture(), headScreenX, headScreenY, (int) headSize, false, false, -1);
+        }
     }
 
     /**
@@ -258,7 +292,7 @@ private void drawEdgePointer(DrawContext drawContext, float width, float height,
             float baseRightX = baseCenterX + baseOffsetX;
             float baseRightY = baseCenterY + baseOffsetY;
 
-            DrawUtils.drawTriangle(drawContext, tipX, tipY, baseLeftX, baseLeftY, baseRightX, baseRightY, color);
+            DrawUtils.drawTriangle(drawContext, (int) tipX, (int) tipY, (int) baseRightX, (int) baseRightY, (int) baseLeftX, (int) baseLeftY, color);
         } else {
             float centerX = tipX - normal.x * height / 2;
             float centerY = tipY - normal.y * height / 2;
@@ -274,10 +308,10 @@ private void drawEdgePointer(DrawContext drawContext, float width, float height,
             Vector2f right = new Vector2f(perpendicular).mul(hw).add(centerX, centerY);
 
             DrawUtils.drawQuad(drawContext,
-                    top.x, top.y,
-                    right.x, right.y,
-                    bottom.x, bottom.y,
-                    left.x, left.y,
+                    (int) top.x, (int) top.y,
+                    (int) right.x, (int) right.y,
+                    (int) bottom.x, (int) bottom.y,
+                    (int) left.x, (int) left.y,
                     color
             );
         }
@@ -310,7 +344,7 @@ protected Vector2f getClampedLabelPos(float labelWidth, float labelHeight, float
 
     public void drawLabel(DrawContext drawContext, float screenX, float screenY, boolean isOutlined) {
         // Draw the name of the object by default
-        drawContext.drawText(client.textRenderer, this.getName(), (int) screenX, (int) screenY, 0xFFFFFF, true);
+        drawContext.drawText(client.textRenderer, this.getName(), (int) screenX, (int) screenY, Colors.WHITE, true);
     }
 
     protected abstract LabelDisplayType getLabelDisplayType();

src/main/java/com/jumpcutfindo/onmymark/client/graphics/markers/PlayerMarkerRenderer.java

@@ -3,36 +3,25 @@
 import com.jumpcutfindo.onmymark.OnMyMarkMod;
 import com.jumpcutfindo.onmymark.marker.Marker;
 import com.jumpcutfindo.onmymark.marker.PlayerMarker;
-import com.mojang.authlib.GameProfile;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.PlayerSkinDrawer;
-import net.minecraft.client.util.SkinTextures;
 import net.minecraft.util.math.Vec3d;
 
 public class PlayerMarkerRenderer extends MarkerRenderer {
     public static final long DEFAULT_LIFETIME_SECS = 60L;
     private static final int PLAYER_HEAD_SIZE = 8;
 
     private final PlayerMarker playerMarker;
-    private final SkinTextures playerSkinTextures;
 
     public PlayerMarkerRenderer(MinecraftClient client, PlayerMarker marker) {
         super(client, marker, PointerShape.DIAMOND);
 
         this.playerMarker = marker;
-
-        this.playerSkinTextures = MinecraftClient.getInstance()
-                .getSkinProvider()
-                .getSkinTextures(
-                        new GameProfile(playerMarker.playerId(), playerMarker.playerName())
-                );
     }
 
     @Override
     public void drawLabel(DrawContext drawContext, float screenX, float screenY, boolean isOutlined) {
-        PlayerSkinDrawer.draw(drawContext, this.playerSkinTextures, (int) screenX, (int) screenY, PLAYER_HEAD_SIZE);
-        super.drawLabel(drawContext, screenX + PLAYER_HEAD_SIZE + 4, screenY, isOutlined);
+        super.drawLabel(drawContext, screenX, screenY, isOutlined);
     }
 
     @Override
@@ -42,7 +31,7 @@ protected LabelDisplayType getLabelDisplayType() {
 
     @Override
     public int getLabelWidth() {
-        return client.textRenderer.getWidth(this.getName()) + PLAYER_HEAD_SIZE + 4;
+        return client.textRenderer.getWidth(this.getName());
     }
 
     @Override

src/main/java/com/jumpcutfindo/onmymark/client/graphics/render/CustomRenderLayers.java

@@ -1,7 +1,6 @@
 package com.jumpcutfindo.onmymark.client.graphics.render;
 
 import com.jumpcutfindo.onmymark.OnMyMarkMod;
-import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.RenderPhase;
 import net.minecraft.util.Identifier;
@@ -28,13 +27,14 @@ public class CustomRenderLayers {
                                 float g = ((color >> 8) & 0xFF) / 255f;
                                 float b = (color & 0xFF) / 255f;
 
-                                RenderSystem.setShaderColor(r, g, b, a);
+                                // RenderSystem.setShaderColor(r, g, b, a);
                             }, () -> {
                                 // Resets the color
-                                RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
+                                // RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
                             }))
                             .build(true);
             return RenderLayer.of(Identifier.of(OnMyMarkMod.MOD_ID, "solid_entity_color").toString(), 1536, true, false, CustomRenderPipelines.SOLID_ENTITY_COLOR, multiPhaseParameters);
-        });;
+        });
+        ;
     }
 }