From a2ce936b31c9c50d721c866c2807a9ccb6b0af26 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Thu, 8 Oct 2020 11:57:30 +0300 Subject: [PATCH 1/2] Fog density change fix --- .../ru/betterend/mixin/client/BackgroundRendererMixin.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/ru/betterend/mixin/client/BackgroundRendererMixin.java b/src/main/java/ru/betterend/mixin/client/BackgroundRendererMixin.java index 0ea8882b..085c11f4 100644 --- a/src/main/java/ru/betterend/mixin/client/BackgroundRendererMixin.java +++ b/src/main/java/ru/betterend/mixin/client/BackgroundRendererMixin.java @@ -17,6 +17,7 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.fluid.FluidState; +import net.minecraft.util.Util; import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biome.Category; @@ -29,6 +30,7 @@ public class BackgroundRendererMixin { private static float lastFogDensity; private static float fogDensity; private static float lerp; + private static long time; @Shadow private static float red; @@ -39,7 +41,9 @@ public class BackgroundRendererMixin { @Inject(method = "render", at = @At("RETURN")) private static void onRender(Camera camera, float tickDelta, ClientWorld world, int i, float f, CallbackInfo info) { - lerp += tickDelta * 0.01F; + long l = Util.getMeasuringTimeMs() - time; + time += l; + lerp += l * 0.001F; if (lerp > 1) lerp = 1; FluidState fluidState = camera.getSubmergedFluidState(); From 4356a54e2bbb9a692ca2aee0cca2ed8a9b780924 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Thu, 8 Oct 2020 13:02:54 +0300 Subject: [PATCH 2/2] Bone meal usage --- .../ru/betterend/registry/BlockTagRegistry.java | 2 ++ .../java/ru/betterend/util/BlocksHelper.java | 16 +++++++++++++++- src/main/resources/betterend.mixins.common.json | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/main/java/ru/betterend/registry/BlockTagRegistry.java b/src/main/java/ru/betterend/registry/BlockTagRegistry.java index 10e07c7e..abe222cc 100644 --- a/src/main/java/ru/betterend/registry/BlockTagRegistry.java +++ b/src/main/java/ru/betterend/registry/BlockTagRegistry.java @@ -2,6 +2,7 @@ package ru.betterend.registry; import net.fabricmc.fabric.api.tag.TagRegistry; import net.minecraft.block.Block; +import net.minecraft.tag.BlockTags; import net.minecraft.tag.Tag; import net.minecraft.tag.Tag.Identified; import ru.betterend.BetterEnd; @@ -16,5 +17,6 @@ public class BlockTagRegistry { public static void register() { TagHelper.addTag(END_GROUND, BlockRegistry.END_MOSS, BlockRegistry.END_MYCELIUM); + TagHelper.addTag(BlockTags.NYLIUM, BlockRegistry.END_MOSS, BlockRegistry.END_MYCELIUM); } } diff --git a/src/main/java/ru/betterend/util/BlocksHelper.java b/src/main/java/ru/betterend/util/BlocksHelper.java index 66519785..47429d97 100644 --- a/src/main/java/ru/betterend/util/BlocksHelper.java +++ b/src/main/java/ru/betterend/util/BlocksHelper.java @@ -9,6 +9,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.FallingBlock; import net.minecraft.state.property.Property; +import net.minecraft.tag.BlockTags; import net.minecraft.util.BlockMirror; import net.minecraft.util.BlockRotation; import net.minecraft.util.math.BlockPos; @@ -19,6 +20,7 @@ import net.minecraft.world.WorldAccess; import ru.betterend.blocks.BlockBlueVine; import ru.betterend.blocks.basis.BlockDoublePlant; import ru.betterend.blocks.basis.BlockGlowingFur; +import ru.betterend.registry.BlockTagRegistry; public class BlocksHelper { public static final int FLAG_UPDATE_BLOCK = 1; @@ -28,7 +30,7 @@ public class BlocksHelper { public static final int FLAG_IGNORE_OBSERVERS = 16; public static final int SET_SILENT = FLAG_UPDATE_BLOCK | FLAG_IGNORE_OBSERVERS | FLAG_SEND_CLIENT_CHANGES; - public static final Direction[] HORIZONTAL = new Direction[] { Direction.NORTH, Direction.SOUTH, Direction.EAST, Direction.WEST }; + public static final Direction[] HORIZONTAL = makeHorizontal(); private static final Mutable POS = new Mutable(); protected static final BlockState AIR = Blocks.AIR.getDefaultState(); @@ -188,4 +190,16 @@ public class BlocksHelper { } } } + + public static boolean isEndNylium(Block block) { + return block.isIn(BlockTags.NYLIUM) && block.isIn(BlockTagRegistry.END_GROUND); + } + + public static boolean isEndNylium(BlockState state) { + return isEndNylium(state.getBlock()); + } + + public static Direction[] makeHorizontal() { + return new Direction[] { Direction.NORTH, Direction.SOUTH, Direction.EAST, Direction.WEST }; + } } diff --git a/src/main/resources/betterend.mixins.common.json b/src/main/resources/betterend.mixins.common.json index a208d020..4b16d8bd 100644 --- a/src/main/resources/betterend.mixins.common.json +++ b/src/main/resources/betterend.mixins.common.json @@ -16,6 +16,7 @@ "RecipeManagerMixin", "AbstractBlockMixin", "LivingEntityMixin", + "BoneMealItemMixin", "SlimeEntityMixin", "BrewingAccessor", "BiomeMixin"