Skip to content

Fix seasonal foliage colors in Distant Horizons #571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
FugLong wants to merge 1 commit into
base: 1.21.9
Choose a base branch
from
Draft

Fix seasonal foliage colors in Distant Horizons #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions common/src/main/java/sereneseasons/init/ModClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.BlockAndTintGetter;
import net.minecraft.world.level.FoliageColor;
import net.minecraft.world.level.GrassColor;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState;
import sereneseasons.api.SSItems;
Expand All @@ -42,6 +44,26 @@

public class ModClient
{
private static final Block[] SEASONAL_FOLIAGE_BLOCKS = new Block[] {
Blocks.OAK_LEAVES,
Blocks.JUNGLE_LEAVES,
Blocks.ACACIA_LEAVES,
Blocks.DARK_OAK_LEAVES,
Blocks.MANGROVE_LEAVES,
Blocks.AZALEA_LEAVES,
Blocks.FLOWERING_AZALEA_LEAVES,
Blocks.VINE
};

private static final Block[] SEASONAL_GRASS_BLOCKS = new Block[] {
Blocks.GRASS_BLOCK,
Blocks.SHORT_GRASS,
Blocks.TALL_GRASS,
Blocks.FERN,
Blocks.LARGE_FERN,
Blocks.SUGAR_CANE
};

public static void setup()
{
SeasonColorHandlers.setup();
Expand Down Expand Up @@ -188,5 +210,44 @@ private static void registerBlockColors(RegisterColorsEvent.Block event)

return birchColor;
}, Blocks.BIRCH_LEAVES);

event.register(ModClient::resolveSeasonalFoliageColor, SEASONAL_FOLIAGE_BLOCKS);
event.register(ModClient::resolveSeasonalGrassColor, SEASONAL_GRASS_BLOCKS);
}

private static int resolveSeasonalFoliageColor(BlockState state, @Nullable BlockAndTintGetter blockGetter, @Nullable BlockPos pos, int tintIndex)
{
Level level = resolveLevel(blockGetter);
if (pos == null || level == null)
{
return -1;
}

Holder<Biome> biome = level.getBiome(pos);
return SeasonColorHandlers.getSeasonalColor(level, biome, pos.getX(), pos.getZ(), SeasonColorHandlers.ResolverType.FOLIAGE);
}

private static int resolveSeasonalGrassColor(BlockState state, @Nullable BlockAndTintGetter blockGetter, @Nullable BlockPos pos, int tintIndex)
{
Level level = resolveLevel(blockGetter);
if (pos == null || level == null)
{
return -1;
}

Holder<Biome> biome = level.getBiome(pos);
return SeasonColorHandlers.getSeasonalColor(level, biome, pos.getX(), pos.getZ(), SeasonColorHandlers.ResolverType.GRASS);
}

@Nullable
private static Level resolveLevel(@Nullable BlockAndTintGetter blockGetter)
{
if (blockGetter instanceof Level level)
{
return level;
}

Minecraft minecraft = Minecraft.getInstance();
return minecraft.level;
}
}
65 changes: 52 additions & 13 deletions common/src/main/java/sereneseasons/season/SeasonColorHandlers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,24 +70,63 @@ private static int resolveColors(ResolverType type, Biome biome, double x, doubl

if (biomeHolder != null)
{
ISeasonState calendar = SeasonHelper.getSeasonState(level);
ISeasonColorProvider colorProvider = biomeHolder.is(ModTags.Biomes.TROPICAL_BIOMES) ? calendar.getTropicalSeason() : calendar.getSubSeason();
return getSeasonalColor(level, biomeHolder, x, z, type, originalColor);
}

int seasonalColor = switch (type) {
case GRASS -> SeasonColorUtil.applySeasonalGrassColouring(colorProvider, biomeHolder, originalColor);
case FOLIAGE -> SeasonColorUtil.applySeasonalFoliageColouring(colorProvider, biomeHolder, originalColor);
};
return originalColor;
}

int currentColor = seasonalColor;
for (ColorOverride override : resolverOverrides.get(type))
{
currentColor = override.apply(originalColor, seasonalColor, currentColor, biomeHolder, x, z);
}
public static int getSeasonalColor(@Nullable Level level, Holder<Biome> biomeHolder, double x, double z, ResolverType type)
{
int originalColor = originalColorFor(biomeHolder, x, z, type);
return getSeasonalColor(level, biomeHolder, x, z, type, originalColor);
}

return currentColor;
public static int getSeasonalColor(@Nullable Level level, Holder<Biome> biomeHolder, double x, double z, ResolverType type, int originalColor)
{
if (level == null || biomeHolder == null)
{
return originalColor;
}

return originalColor;
if (biomeHolder.is(ModTags.Biomes.BLACKLISTED_BIOMES) || !ModConfig.seasons.isDimensionWhitelisted(level.dimension()))
{
return originalColor;
}

ISeasonState calendar = SeasonHelper.getSeasonState(level);
ISeasonColorProvider colorProvider = biomeHolder.is(ModTags.Biomes.TROPICAL_BIOMES) ? calendar.getTropicalSeason() : calendar.getSubSeason();

int seasonalColor = switch (type) {
case GRASS -> SeasonColorUtil.applySeasonalGrassColouring(colorProvider, biomeHolder, originalColor);
case FOLIAGE -> SeasonColorUtil.applySeasonalFoliageColouring(colorProvider, biomeHolder, originalColor);
};

int currentColor = seasonalColor;
for (ColorOverride override : resolverOverrides.get(type))
{
currentColor = override.apply(originalColor, seasonalColor, currentColor, biomeHolder, x, z);
}

return currentColor;
}

private static int originalColorFor(Holder<Biome> biomeHolder, double x, double z, ResolverType type)
{
ColorResolver resolver = switch (type) {
case GRASS -> originalGrassColorResolver;
case FOLIAGE -> originalFoliageColorResolver;
};

if (resolver != null)
{
return resolver.getColor(biomeHolder.value(), x, z);
}

return switch (type) {
case GRASS -> biomeHolder.value().getGrassColor(x, z);
case FOLIAGE -> biomeHolder.value().getFoliageColor();
};
}

public interface ColorOverride
Expand Down