From a9a119e172be6fc5186ea28f9c364ebc95a28cb9 Mon Sep 17 00:00:00 2001 From: gnembon Date: Fri, 9 Jul 2021 22:16:29 -0300 Subject: [PATCH] default foliage color has to be fixed on the server since its actually part of client resourcepack. Fixes #992 --- src/main/java/carpet/script/utils/BiomeInfo.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/java/carpet/script/utils/BiomeInfo.java b/src/main/java/carpet/script/utils/BiomeInfo.java index 30a003b9..2394cddb 100644 --- a/src/main/java/carpet/script/utils/BiomeInfo.java +++ b/src/main/java/carpet/script/utils/BiomeInfo.java @@ -21,20 +21,13 @@ import java.util.function.BiFunction; public class BiomeInfo { - // copy of from Biome.getDefaultFoliageColor - private static int getDefaultFoliageColor(Biome b) { - double d = MathHelper.clamp(b.getTemperature(), 0.0F, 1.0F); - double e = MathHelper.clamp(b.getDownfall(), 0.0F, 1.0F); - return FoliageColors.getColor(d, e); - } - public final static Map> biomeFeatures = new HashMap>(){{ put("top_material", (w, b) -> new BlockValue( b.getGenerationSettings().getSurfaceConfig().getTopMaterial(), null, null)); put("under_material", (w, b) -> new BlockValue( b.getGenerationSettings().getSurfaceConfig().getUnderMaterial(), null, null)); put("category", (w, b) -> StringValue.of(b.getCategory().getName())); put("temperature", (w, b) -> NumericValue.of(b.getTemperature())); put("fog_color", (w, b) -> ValueConversions.ofRGB(((BiomeEffectsInterface)b.getEffects()).getCMFogColor())); - put("foliage_color", (w, b) -> ValueConversions.ofRGB(((BiomeEffectsInterface)b.getEffects()).getCMFoliageColor().orElseGet(() -> getDefaultFoliageColor(b)))); + put("foliage_color", (w, b) -> ValueConversions.ofRGB(((BiomeEffectsInterface)b.getEffects()).getCMFoliageColor().orElse(4764952))); // client Biome.getDefaultFoliageColor put("sky_color", (w, b) -> ValueConversions.ofRGB(((BiomeEffectsInterface)b.getEffects()).getCMSkyColor())); put("water_color", (w, b) -> ValueConversions.ofRGB(((BiomeEffectsInterface)b.getEffects()).getCMWaterColor())); put("water_fog_color", (w, b) -> ValueConversions.ofRGB(((BiomeEffectsInterface)b.getEffects()).getCMWaterFogColor()));