Updated to 1.20.4

Signed-off-by: cph101 <[email protected]>

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.5-SNAPSHOT'
+	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
 }
 

gradle.properties

@@ -4,18 +4,18 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.1
-quilt_mappings=20
+minecraft_version=1.20.4
+quilt_mappings=3
 loader_version=0.15.6
 
 # Mod Properties
-mod_version=0.0.4+1.20.1
+mod_version=0.0.5+1.20.4
 maven_group=team.lodestar.lodestone
 archives_base_name=lodestone
 
 # Dependencies
-fabric_version=0.91.0+1.20.1
-satin_version = 1.13.0
-emi_version = 1.0.12+1.20.1
-midnightlib_version = 1.4.1
-sodium_version=mc1.20-0.4.10
+fabric_version=0.97.0+1.20.4
+satin_version = 1.16.0
+emi_version = 1.1.4+1.20.4
+midnightlib_version = 1.5.3
+sodium_version=mc1.20.4-0.5.8

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/team/lodestar/lodestone/helpers/DataHelper.java

@@ -199,4 +199,8 @@ public static float distSqr(float... a) {
 	public static float distance(float... a) {
 		return sqrt(distSqr(a));
 	}
+
+	public static float lerpAngleDegrees(float delta, float start, float end) {
+		return start + delta * MathHelper.wrapDegrees(end - start);
+	}
 }

src/main/java/team/lodestar/lodestone/mixin/InGameHudMixin.java

@@ -1,9 +1,9 @@
 package team.lodestar.lodestone.mixin;
 
+import net.minecraft.client.gui.hud.in_game.InGameHud;
 import team.lodestar.lodestone.handlers.screenparticle.ScreenParticleHandler;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.hud.InGameHud;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

src/main/java/team/lodestar/lodestone/mixin/ScreenMixin.java

@@ -10,7 +10,7 @@
 
 @Mixin(Screen.class)
 final class ScreenMixin {
-	@Inject(at = @At("HEAD"), method = "renderBackground(Lnet/minecraft/client/gui/GuiGraphics;)V")
+	@Inject(at = @At("HEAD"), method = "renderBackgroundTexture")
 	private void lodestone$beforeBackgroundParticle(GuiGraphics graphics, CallbackInfo ci) {
 		ScreenParticleHandler.renderEarliestParticles();
 	}

src/main/java/team/lodestar/lodestone/systems/rendering/particle/screen/GenericScreenParticle.java

@@ -1,7 +1,9 @@
 package team.lodestar.lodestone.systems.rendering.particle.screen;
 
 import com.mojang.blaze3d.vertex.BufferBuilder;
+import org.jetbrains.annotations.ApiStatus;
 import team.lodestar.lodestone.handlers.screenparticle.ScreenParticleHandler;
+import team.lodestar.lodestone.helpers.DataHelper;
 import team.lodestar.lodestone.systems.rendering.particle.SimpleParticleEffect;
 import team.lodestar.lodestone.systems.rendering.particle.data.ColorParticleData;
 import team.lodestar.lodestone.systems.rendering.particle.data.GenericParticleData;
@@ -82,7 +84,7 @@ public void pickSprite(int spriteIndex) {
 	}
 
 	public void pickColor(float colorCoeff) {
-		float h = MathHelper.lerpAngleDegrees(colorCoeff, 360f * hsv1[0], 360f * hsv2[0]) / 360f;
+		float h = DataHelper.lerpAngleDegrees(colorCoeff, 360f * hsv1[0], 360f * hsv2[0]) / 360f;
 		float s = MathHelper.lerp(colorCoeff, hsv1[1], hsv2[1]);
 		float v = MathHelper.lerp(colorCoeff, hsv1[2], hsv2[2]);
 		int packed = Color.HSBtoRGB(h, s, v);

src/main/java/team/lodestar/lodestone/systems/rendering/particle/world/GenericParticle.java

@@ -3,6 +3,7 @@
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import team.lodestar.lodestone.config.ClientConfig;
 import team.lodestar.lodestone.handlers.RenderHandler;
+import team.lodestar.lodestone.helpers.DataHelper;
 import team.lodestar.lodestone.systems.rendering.particle.LodestoneWorldParticleTextureSheet;
 import team.lodestar.lodestone.systems.rendering.particle.SimpleParticleEffect;
 import team.lodestar.lodestone.systems.rendering.particle.data.ColorParticleData;
@@ -81,7 +82,7 @@ public void setSprite(int spriteIndex) {
 		}
 	}
     public void pickColor(float colorCoeff) {
-        float h = MathHelper.lerpAngleDegrees(colorCoeff, 360f * hsv1[0], 360f * hsv2[0]) / 360f;
+        float h = DataHelper.lerpAngleDegrees(colorCoeff, 360f * hsv1[0], 360f * hsv2[0]) / 360f;
         float s = MathHelper.lerp(colorCoeff, hsv1[1], hsv2[1]);
         float v = MathHelper.lerp(colorCoeff, hsv1[2], hsv2[2]);
         int packed = Color.HSBtoRGB(h, s, v);

src/main/resources/fabric.mod.json

@@ -29,12 +29,10 @@
 	],
 	"depends": {
 		"fabricloader": ">=0.15.6",
-		"minecraft": "~1.20.1",
+		"minecraft": "~1.20.4",
 		"java": ">=17",
-		"fabric-api": "*"
-	},
-	"suggests": {
-		"another-mod": "*"
+		"fabric-api": "*",
+		"satin": "*"
 	},
 	"accessWidener": "lodestone.accesswidener"
 }