simplify interpolated function for now bc i dont want to figure it out

FrozenBlock · Nov 14, 2023 · f10e4ca · f10e4ca
1 parent aded854
commit f10e4ca
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/src/main/java/net/frozenblock/lib/gravity/api/functions/InterpolatedGravityFunction.java b/src/main/java/net/frozenblock/lib/gravity/api/functions/InterpolatedGravityFunction.java
@@ -28,31 +28,37 @@
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
-@ApiStatus.Experimental
-@ApiStatus.Internal
-public record InterpolatedGravityFunction(double gravity, double minLerpGravity, double maxLerpGravity, double minLerpY, double maxLerpY) implements SerializableGravityFunction<InterpolatedGravityFunction> {
+public record InterpolatedGravityFunction(
+	double gravity,
+	//double minLerpGravity,
+	//double maxLerpGravity,
+	//double minLerpY,
+	//double maxLerpY
+) implements SerializableGravityFunction<InterpolatedGravityFunction> {
 
 	public static final Codec<InterpolatedGravityFunction> CODEC = RecordCodecBuilder.create(instance ->
 		instance.group(
 			Codec.DOUBLE.fieldOf("gravity").forGetter(InterpolatedGravityFunction::gravity),
-			Codec.DOUBLE.fieldOf("minLerpGravity").forGetter(InterpolatedGravityFunction::minLerpGravity),
-			Codec.DOUBLE.fieldOf("maxLerpGravity").forGetter(InterpolatedGravityFunction::maxLerpY),
-			Codec.DOUBLE.fieldOf("minLerpY").forGetter(InterpolatedGravityFunction::minLerpY),
-			Codec.DOUBLE.fieldOf("maxLerpY").forGetter(InterpolatedGravityFunction::maxLerpY)
+			//Codec.DOUBLE.fieldOf("minLerpGravity").forGetter(InterpolatedGravityFunction::minLerpGravity),
+			//Codec.DOUBLE.fieldOf("maxLerpGravity").forGetter(InterpolatedGravityFunction::maxLerpY),
+			//Codec.DOUBLE.fieldOf("minLerpY").forGetter(InterpolatedGravityFunction::minLerpY),
+			//Codec.DOUBLE.fieldOf("maxLerpY").forGetter(InterpolatedGravityFunction::maxLerpY)
 		).apply(instance, InterpolatedGravityFunction::new)
 	);
 
 	public static final Codec<GravityBelt<InterpolatedGravityFunction>> BELT_CODEC = GravityBelt.codec(CODEC);
 
 	@Override
 	public double get(@Nullable Entity entity, double y, double minY, double maxY) {
-		if (!(entity instanceof Player)) return 1.0;
-		double normalizedY = (y - minLerpY) / (maxLerpY - minLerpY);
+		double normalizedY = (y - minY) / (maxY - minY);
+		//double normalizedY = (y - minLerpY) / (maxLerpY - minLerpY);
 
-		if (normalizedY < 0) return minLerpGravity;
-		if (normalizedY < 0.5) return Mth.lerp(normalizedY, minLerpGravity, gravity);
+		return gravity * normalizedY;
+		/*if (normalizedY < 0.5) {
+			return Mth.clamp(Mth.lerp(normalizedY, minLerpGravity, gravity), minLerpGravity, gravity);
+		}
 		if (normalizedY < 1.0) return Mth.lerp(normalizedY, gravity, maxLerpGravity);
-		return maxLerpGravity;
+		return maxLerpGravity;*/
 	}
 
 	@Override