From ed286099ee66fc57f0bfa6c287f9bbac9d192bc3 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Mon, 1 Mar 2021 01:21:38 +0300 Subject: [PATCH] Particles & shader fixes --- .../java/ru/betterend/world/biome/DragonGraveyardsBiome.java | 4 +++- .../world/features/bushes/LargeAmaranitaFeature.java | 2 +- .../assets/betterend/materialmaps/block/amaranita_fur.json | 3 +++ .../assets/betterend/materialmaps/block/clawfern.json | 2 +- .../assets/betterend/shaders/material/glow_green_2.frag | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/betterend/materialmaps/block/amaranita_fur.json diff --git a/src/main/java/ru/betterend/world/biome/DragonGraveyardsBiome.java b/src/main/java/ru/betterend/world/biome/DragonGraveyardsBiome.java index 7535e700..765ae2a3 100644 --- a/src/main/java/ru/betterend/world/biome/DragonGraveyardsBiome.java +++ b/src/main/java/ru/betterend/world/biome/DragonGraveyardsBiome.java @@ -3,6 +3,7 @@ package ru.betterend.world.biome; import net.minecraft.entity.EntityType; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndFeatures; +import ru.betterend.registry.EndParticles; import ru.betterend.registry.EndSounds; public class DragonGraveyardsBiome extends EndBiome { @@ -10,7 +11,8 @@ public class DragonGraveyardsBiome extends EndBiome { super(new BiomeDefinition("dragon_graveyards") .setGenChance(0.1F) .setFogColor(244, 46, 79) - .setFogDensity(1.1F) + .setFogDensity(1.3F) + .setParticles(EndParticles.FIREFLY, 0.0007F) .setMusic(EndSounds.MUSIC_OPENSPACE) .setLoop(EndSounds.AMBIENT_GLOWING_GRASSLANDS) .setSurface(EndBlocks.SANGNUM) diff --git a/src/main/java/ru/betterend/world/features/bushes/LargeAmaranitaFeature.java b/src/main/java/ru/betterend/world/features/bushes/LargeAmaranitaFeature.java index 58990979..09f5e5ff 100644 --- a/src/main/java/ru/betterend/world/features/bushes/LargeAmaranitaFeature.java +++ b/src/main/java/ru/betterend/world/features/bushes/LargeAmaranitaFeature.java @@ -9,8 +9,8 @@ import net.minecraft.util.math.Direction; import net.minecraft.world.StructureWorldAccess; import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.DefaultFeatureConfig; -import ru.betterend.blocks.BlockProperties.TripleShape; import ru.betterend.blocks.BlockProperties; +import ru.betterend.blocks.BlockProperties.TripleShape; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndTags; import ru.betterend.util.BlocksHelper; diff --git a/src/main/resources/assets/betterend/materialmaps/block/amaranita_fur.json b/src/main/resources/assets/betterend/materialmaps/block/amaranita_fur.json new file mode 100644 index 00000000..5879aa38 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/amaranita_fur.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:waving_wall_inverted_glow_all" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/clawfern.json b/src/main/resources/assets/betterend/materialmaps/block/clawfern.json index de846edf..352de84b 100644 --- a/src/main/resources/assets/betterend/materialmaps/block/clawfern.json +++ b/src/main/resources/assets/betterend/materialmaps/block/clawfern.json @@ -1,3 +1,3 @@ { - "defaultMaterial": "betterend:waving_floor_glow_green" + "defaultMaterial": "betterend:waving_floor" } diff --git a/src/main/resources/assets/betterend/shaders/material/glow_green_2.frag b/src/main/resources/assets/betterend/shaders/material/glow_green_2.frag index 8a3c3722..3733aa0d 100644 --- a/src/main/resources/assets/betterend/shaders/material/glow_green_2.frag +++ b/src/main/resources/assets/betterend/shaders/material/glow_green_2.frag @@ -4,5 +4,5 @@ void frx_startFragment(inout frx_FragmentData fragData) { float a = abs(fragData.spriteColor.g - fragData.spriteColor.r); float b = abs(fragData.spriteColor.g - fragData.spriteColor.b); - fragData.emissivity = (fragData.spriteColor.g > 0.3) ? 0.3 : 0; + fragData.emissivity = (fragData.spriteColor.g > 0.3) ? 0.6 : 0; }