djib/Controlify
1
0
Fork 0
forked from Clones/Controlify
Code Pull Requests Activity

make explosion rumble distance change mid-way through

Browse Source
This commit is contained in:
isXander
2023-04-05 23:57:53 +01:00
parent 3b1566cdc1
commit 3577fcb458
3 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/dev/isxander/controlify/rumble/ContinuousRumbleEffect.java
View File

@ -1,5 +1,8 @@
package dev.isxander.controlify.rumble;
import net.minecraft.client.Minecraft;
import net.minecraft.util.Mth;
import net.minecraft.world.phys.Vec3;
import org.apache.commons.lang3.Validate;
import java.util.function.Function;
@ -60,6 +63,7 @@ public class ContinuousRumbleEffect implements RumbleEffect {
private int priority;
private int timeout = -1;
private int minTime;
private InWorldProperties inWorldProperties;
private Builder() {
}
@ -97,11 +101,30 @@ public class ContinuousRumbleEffect implements RumbleEffect {
return this;
}
public Builder inWorld(Vec3 sourceLocation, float minMagnitude, float maxMagnitude, float minDistance, float maxDistance, Function<Float, Float> fallofFunction) {
this.inWorldProperties = new InWorldProperties(sourceLocation, minMagnitude, maxMagnitude, minDistance, maxDistance, fallofFunction);
return this;
}
public ContinuousRumbleEffect build() {
Validate.notNull(stateFunction, "stateFunction cannot be null!");
Validate.isTrue(minTime <= timeout || timeout == -1, "the minimum time cannot be greater than the timeout!");
var stateFunction = this.stateFunction;
if (inWorldProperties != null)
stateFunction = inWorldProperties.modify(stateFunction);
return new ContinuousRumbleEffect(stateFunction, priority, timeout, minTime);
}
private record InWorldProperties(Vec3 sourceLocation, float minMagnitude, float maxMagnitude, float minDistance, float maxDistance, Function<Float, Float> fallofFunction) {
private Function<Integer, RumbleState> modify(Function<Integer, RumbleState> stateFunction) {
return tick -> {
float distanceSqr = (float) Mth.clamp(Minecraft.getInstance().player.distanceToSqr(sourceLocation), minDistance, maxDistance);
float magnitude = Mth.lerp(1f - fallofFunction.apply(distanceSqr / (maxDistance * maxDistance)), minMagnitude, maxMagnitude);
return stateFunction.apply(tick).mul(magnitude);
};
}
}
}
}

3
src/main/java/dev/isxander/controlify/rumble/RumbleState.java
View File

@ -1,4 +1,7 @@
package dev.isxander.controlify.rumble;
public record RumbleState(float strong, float weak) {
public RumbleState mul(float multiplier) {
return new RumbleState(strong * multiplier, weak * multiplier);
}
}