feat: always keep texture of colored fishing particles texture bright

fix: deployable rendering

Author: Fix3dll

src/main/java/com/fix3dll/skyblockaddons/listeners/RenderListener.java

@@ -2446,7 +2446,7 @@ private void drawCompactDeployableStatus(GuiGraphics graphics, float scale, Butt
         }
 
         if (entity instanceof ArmorStand armorStand) {
-            drawDeployableArmorStand(graphics, armorStand, x, y, DEPLOYABLE_GUI_SIZE, DEPLOYABLE_GUI_SIZE, scale);
+            drawDeployableArmorStand(graphics, armorStand, x, y, scale);
         } else {
             graphics.blit(RenderPipelines.GUI_TEXTURED, deployable.getResourceLocation(), (int) x, (int) y, 0, 0, DEPLOYABLE_GUI_SIZE, DEPLOYABLE_GUI_SIZE, DEPLOYABLE_GUI_SIZE, DEPLOYABLE_GUI_SIZE);
         }
@@ -2576,7 +2576,7 @@ private void drawDetailedDeployableStatus(GuiGraphics graphics, float scale, But
         }
 
         if (entity instanceof ArmorStand armorStand) {
-            drawDeployableArmorStand(graphics, armorStand, x, y, DEPLOYABLE_GUI_SIZE, height - DEPLOYABLE_GUI_SIZE, scale);
+            drawDeployableArmorStand(graphics, armorStand, x, y, scale);
         } else {
             graphics.blit(RenderPipelines.GUI_TEXTURED, deployable.getResourceLocation(), (int) x, (int) y, 0, 0, DEPLOYABLE_GUI_SIZE, DEPLOYABLE_GUI_SIZE, DEPLOYABLE_GUI_SIZE, DEPLOYABLE_GUI_SIZE);
         }
@@ -2655,7 +2655,7 @@ public void onRenderWorld(MultiBufferSource.BufferSource source, PoseStack poseS
         HealingCircleManager.renderHealingCircleOverlays(source, poseStack);
     }
 
-    private void drawDeployableArmorStand(GuiGraphics graphics, ArmorStand deployableArmorStand, float x, float y, float width, float height, float scale) {
+    private void drawDeployableArmorStand(GuiGraphics graphics, ArmorStand deployableArmorStand, float x, float y, float scale) {
         Vector3f translation = new Vector3f(0.0F, 1.5F + 0.0625F * deployableArmorStand.getScale(), 0.0F);
         Quaternionf rotation = Axis.ZP.rotationDegrees(180.0F);
         Quaternionf rotation4 = Axis.XP.rotationDegrees(-22.0F);
@@ -2672,9 +2672,8 @@ private void drawDeployableArmorStand(GuiGraphics graphics, ArmorStand deployabl
 
         x *= scale;
         y *= scale;
-        width *= scale;
-        height *= scale;
-        InventoryScreen.renderEntityInInventory(graphics, Math.round(x), Math.round(y), Math.round(x + width), Math.round(y + height), 25.0F / deployableArmorStand.getScale() * scale, translation, rotation, null, deployableArmorStand);
+        float scaledWH = DEPLOYABLE_GUI_SIZE * scale;
+        InventoryScreen.renderEntityInInventory(graphics, Math.round(x), Math.round(y), Math.round(x + scaledWH), Math.round(y + scaledWH), 25.0F / deployableArmorStand.getScale() * scale, translation, rotation, null, deployableArmorStand);
 
         // rollback after rendering
         deployableArmorStand.yBodyRot = prevRenderYawOffset;

src/main/java/com/fix3dll/skyblockaddons/mixin/extensions/WakeParticleExtension.java

@@ -4,4 +4,6 @@ public interface WakeParticleExtension {
 
     void sba$setBlankSprite(boolean shouldBlank);
 
+    boolean sba$isBlankSprite();
+
 }

src/main/java/com/fix3dll/skyblockaddons/mixin/transformers/ParticleMixin.java

@@ -0,0 +1,22 @@
+package com.fix3dll.skyblockaddons.mixin.transformers;
+
+import com.fix3dll.skyblockaddons.mixin.extensions.WakeParticleExtension;
+import net.minecraft.client.particle.Particle;
+import net.minecraft.client.renderer.LightTexture;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(Particle.class)
+public class ParticleMixin {
+
+    @Inject(method = "getLightColor", at = @At("HEAD"), cancellable = true)
+    public void sba$getLightColor(float partialTick, CallbackInfoReturnable<Integer> cir) {
+        Particle particle = (Particle)(Object)this;
+        if (particle instanceof WakeParticleExtension wpe && wpe.sba$isBlankSprite()) {
+            cir.setReturnValue(LightTexture.FULL_BRIGHT);
+        }
+    }
+
+}

src/main/java/com/fix3dll/skyblockaddons/mixin/transformers/WakeParticleMixin.java

@@ -20,6 +20,11 @@ public class WakeParticleMixin implements WakeParticleExtension {
         this.sba$blankSprite = shouldBlank;
     }
 
+    @Override
+    public boolean sba$isBlankSprite() {
+        return this.sba$blankSprite;
+    }
+
     @ModifyArg(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/particle/WakeParticle;setSprite(Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;)V"))
     public TextureAtlasSprite sba$tick_setSprite(TextureAtlasSprite original, @Local int i) {
         if (!sba$blankSprite) return original;

src/main/resources/skyblockaddons.mixins.json

@@ -36,6 +36,7 @@
     "MouseHandlerMixin",
     "MultiPlayerGameModeMixin",
     "ParticleEngineMixin",
+    "ParticleMixin",
     "RecipeBookComponentMixin",
     "RenderSystemMixin",
     "ScreenMixin",