minecraft-mods/firefly_bush_backport
Private
Public Access
1
0
Fork 0
Code Issues Projects Releases 1 Wiki Activity

Cleaned up extra config options. Added new option for color.

Browse Source
This commit is contained in:
Micle
2025-06-06 21:07:07 +01:00
parent 2715e34231
commit 586b5a582b
2 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/dev/micle/firefly_bush_backport/config/Config.java
View File

@ -65,12 +65,9 @@ public final class Config {
public static ForgeConfigSpec.IntValue particleMaxLifetime; public static ForgeConfigSpec.IntValue particleMaxLifetime;
public static ForgeConfigSpec.DoubleValue particleExtraFriction; public static ForgeConfigSpec.DoubleValue particleExtraFriction;
public static ForgeConfigSpec.DoubleValue particleExtraQuadSize;
public static ForgeConfigSpec.DoubleValue particleExtraSpeedMultiplierX;
public static ForgeConfigSpec.DoubleValue particleExtraSpeedMultiplierY;
public static ForgeConfigSpec.DoubleValue particleExtraSpeedMultiplierZ;
public static ForgeConfigSpec.DoubleValue particleExtraLightColor;
public static ForgeConfigSpec.DoubleValue particleExtraScale; public static ForgeConfigSpec.DoubleValue particleExtraScale;
public static ForgeConfigSpec.DoubleValue particleExtraBrightness;
public static ForgeConfigSpec.ConfigValue<String> particleExtraColor;
Client(ForgeConfigSpec.Builder builder) { Client(ForgeConfigSpec.Builder builder) {
builder.comment("Settings for the firefly bush.").push("bush"); builder.comment("Settings for the firefly bush.").push("bush");
@ -103,18 +100,12 @@ public final class Config {
builder.comment("Extra settings for the firefly particle.").push("extra"); builder.comment("Extra settings for the firefly particle.").push("extra");
particleExtraFriction = builder particleExtraFriction = builder
.defineInRange("particleExtraFriction", 0.96, 0, Double.MAX_VALUE); .defineInRange("particleExtraFriction", 0.96, 0, Double.MAX_VALUE);
particleExtraQuadSize = builder
.defineInRange("particleExtraQuadSize", 0.75, 0, Double.MAX_VALUE);
particleExtraSpeedMultiplierX = builder
.defineInRange("particleExtraSpeedMultiplierX", 0.8, Double.MIN_VALUE, Double.MAX_VALUE);
particleExtraSpeedMultiplierY = builder
.defineInRange("particleExtraSpeedMultiplierY", 0.8, Double.MIN_VALUE, Double.MAX_VALUE);
particleExtraSpeedMultiplierZ = builder
.defineInRange("particleExtraSpeedMultiplierZ", 0.8, Double.MIN_VALUE, Double.MAX_VALUE);
particleExtraLightColor = builder
.defineInRange("particleExtraLightColor", 255.0, 0, 255);
particleExtraScale = builder particleExtraScale = builder
.defineInRange("particleExtraScale", 1.5, 0, Double.MAX_VALUE); .defineInRange("particleExtraScale", 0.75, 0, Double.MAX_VALUE);
particleExtraBrightness = builder
.defineInRange("particleExtraBrightness", 255.0, 0, 255);
particleExtraColor = builder
.define("particleExtraColor", "#ffffff");
builder.pop(); builder.pop();
builder.pop(); builder.pop();
} }

16
src/main/java/dev/micle/firefly_bush_backport/particle/FireflyParticle.java
View File

@ -11,6 +11,7 @@ import net.minecraftforge.api.distmarker.OnlyIn;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import javax.annotation.ParametersAreNonnullByDefault; import javax.annotation.ParametersAreNonnullByDefault;
import java.awt.*;
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
public class FireflyParticle extends TextureSheetParticle { public class FireflyParticle extends TextureSheetParticle {
@ -18,10 +19,10 @@ public class FireflyParticle extends TextureSheetParticle {
super(clientLevel, x, y, z, xSpeed, ySpeed, zSpeed); super(clientLevel, x, y, z, xSpeed, ySpeed, zSpeed);
this.speedUpWhenYMotionIsBlocked = true; this.speedUpWhenYMotionIsBlocked = true;
this.friction = Config.Client.particleExtraFriction.get().floatValue(); this.friction = Config.Client.particleExtraFriction.get().floatValue();
this.quadSize *= Config.Client.particleExtraQuadSize.get().floatValue(); this.quadSize *= Config.Client.particleExtraScale.get().floatValue();
this.yd *= Config.Client.particleExtraSpeedMultiplierY.get(); this.yd *= 0.8F;
this.xd *= Config.Client.particleExtraSpeedMultiplierX.get(); this.xd *= 0.8F;
this.zd *= Config.Client.particleExtraSpeedMultiplierZ.get(); this.zd *= 0.8F;
} }
@Override @Override
@ -31,7 +32,7 @@ public class FireflyParticle extends TextureSheetParticle {
@Override @Override
public int getLightColor(float partialTick) { public int getLightColor(float partialTick) {
return (int) (Config.Client.particleExtraLightColor.get().floatValue() * getFadeAmount( return (int) (Config.Client.particleExtraBrightness.get().floatValue() * getFadeAmount(
this.getLifetimeProgress(this.age + partialTick), this.getLifetimeProgress(this.age + partialTick),
Config.Client.particleFadeInLightTime.get().floatValue(), Config.Client.particleFadeInLightTime.get().floatValue(),
Config.Client.particleFadeOutLightTime.get().floatValue()) Config.Client.particleFadeOutLightTime.get().floatValue())
@ -97,10 +98,13 @@ public class FireflyParticle extends TextureSheetParticle {
fireflyParticle.setLifetime(clientLevel.random.nextIntBetweenInclusive( fireflyParticle.setLifetime(clientLevel.random.nextIntBetweenInclusive(
Config.Client.particleMinLifetime.get(), Config.Client.particleMaxLifetime.get() Config.Client.particleMinLifetime.get(), Config.Client.particleMaxLifetime.get()
)); ));
fireflyParticle.scale(Config.Client.particleExtraScale.get().floatValue()); fireflyParticle.scale(1.5F);
fireflyParticle.pickSprite(this.sprite); fireflyParticle.pickSprite(this.sprite);
fireflyParticle.setAlpha(0.0F); fireflyParticle.setAlpha(0.0F);
Color color = Color.decode(Config.Client.particleExtraColor.get());
fireflyParticle.setColor(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F);
return fireflyParticle; return fireflyParticle;
} }
} }