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

Added weighted randomness to color list.

Browse Source
This commit is contained in:
Micle
2025-06-06 21:54:55 +01:00
parent d9571e65dd
commit 1915462811
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
package dev.micle.firefly_bush_backport.config; package dev.micle.firefly_bush_backport.config;
import dev.micle.firefly_bush_backport.FireflyBushBackport; import dev.micle.firefly_bush_backport.FireflyBushBackport;
import net.minecraft.util.random.SimpleWeightedRandomList;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.common.ForgeConfigSpec;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
@ -10,7 +11,6 @@ import net.minecraftforge.fml.event.config.ModConfigEvent;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import java.awt.*; import java.awt.*;
import java.util.Arrays;
import java.util.List; import java.util.List;
@Mod.EventBusSubscriber(modid = FireflyBushBackport.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) @Mod.EventBusSubscriber(modid = FireflyBushBackport.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
@ -70,7 +70,8 @@ public final class Config {
public static ForgeConfigSpec.DoubleValue particleExtraFriction; public static ForgeConfigSpec.DoubleValue particleExtraFriction;
public static ForgeConfigSpec.DoubleValue particleExtraScale; public static ForgeConfigSpec.DoubleValue particleExtraScale;
public static ForgeConfigSpec.DoubleValue particleExtraBrightness; public static ForgeConfigSpec.DoubleValue particleExtraBrightness;
public static ForgeConfigSpec.ConfigValue<List<? extends String>> particleExtraColors; private static ForgeConfigSpec.ConfigValue<List<? extends String>> particleExtraColors;
public static SimpleWeightedRandomList<Color> particleExtraColorsWeightedList;
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");
@ -108,15 +109,23 @@ public final class Config {
particleExtraBrightness = builder particleExtraBrightness = builder
.defineInRange("particleExtraBrightness", 255.0, 0, 255); .defineInRange("particleExtraBrightness", 255.0, 0, 255);
particleExtraColors = builder particleExtraColors = builder
.defineList("particleExtraColors", List.of("#ffffff"), Client::isValidColorEntry); .comment("List of color hex values and their weight. Format: '<color_hex>,<weight>'")
.defineList("particleExtraColors", List.of("#ffffff,1"), Client::isValidColorEntry);
builder.pop(); builder.pop();
builder.pop(); builder.pop();
} }
private static void onConfigReload() {} private static void onConfigReload() {
SimpleWeightedRandomList.Builder<Color> particleExtraColorsWeightedListBuilder = SimpleWeightedRandomList.builder();
for (String entry : particleExtraColors.get()) {
String[] splitEntry = entry.split(",");
particleExtraColorsWeightedListBuilder.add(Color.decode(splitEntry[0]), Integer.parseInt(splitEntry[1]));
}
particleExtraColorsWeightedList = particleExtraColorsWeightedListBuilder.build();
}
private static boolean isValidColorEntry(Object entry) { private static boolean isValidColorEntry(Object entry) {
return entry instanceof String && ((String) entry).matches("#(\\w{6})$"); return entry instanceof String && ((String) entry).matches("#\\w{6},\\d+$");
} }
} }

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

@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull;
import javax.annotation.ParametersAreNonnullByDefault; import javax.annotation.ParametersAreNonnullByDefault;
import java.awt.*; import java.awt.*;
import java.util.List; import java.util.Optional;
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
public class FireflyParticle extends TextureSheetParticle { public class FireflyParticle extends TextureSheetParticle {
@ -103,9 +103,10 @@ public class FireflyParticle extends TextureSheetParticle {
fireflyParticle.pickSprite(this.sprite); fireflyParticle.pickSprite(this.sprite);
fireflyParticle.setAlpha(0.0F); fireflyParticle.setAlpha(0.0F);
List<? extends String> possibleColors = Config.Client.particleExtraColors.get(); Optional<Color> optionalColor = Config.Client.particleExtraColorsWeightedList.getRandomValue(clientLevel.random);
Color color = Color.decode(possibleColors.get(clientLevel.random.nextIntBetweenInclusive(0, possibleColors.size() - 1))); optionalColor.ifPresent(color ->
fireflyParticle.setColor(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F); fireflyParticle.setColor(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F)
);
return fireflyParticle; return fireflyParticle;
} }