From 7947d92b1d5a726f1b1b541ddc10bd12ab5ae866 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Thu, 26 Nov 2020 15:44:28 +0300 Subject: [PATCH] Fixes --- .../entities/render/PedestalItemRenderer.java | 1 - .../gui/EndStoneSmelterScreenHandler.java | 2 -- .../client/render/EternalCrystalRenderer.java | 1 - .../betterend/particle/InfusionParticle.java | 1 - .../particle/InfusionParticleType.java | 2 -- .../ru/betterend/rituals/InfusionRitual.java | 1 - .../java/ru/betterend/util/ColorUtil.java | 2 -- .../world/features/trees/TenaneaFeature.java | 20 ++++++++++--------- 8 files changed, 11 insertions(+), 19 deletions(-) diff --git a/src/main/java/ru/betterend/blocks/entities/render/PedestalItemRenderer.java b/src/main/java/ru/betterend/blocks/entities/render/PedestalItemRenderer.java index f86817c6..962de810 100644 --- a/src/main/java/ru/betterend/blocks/entities/render/PedestalItemRenderer.java +++ b/src/main/java/ru/betterend/blocks/entities/render/PedestalItemRenderer.java @@ -19,7 +19,6 @@ import net.minecraft.item.Items; import net.minecraft.util.DyeColor; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; - import ru.betterend.blocks.EternalPedestal; import ru.betterend.blocks.basis.BlockPedestal; import ru.betterend.blocks.entities.PedestalBlockEntity; diff --git a/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreenHandler.java b/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreenHandler.java index 6a16fba8..e2aaa7cf 100644 --- a/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreenHandler.java +++ b/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreenHandler.java @@ -3,7 +3,6 @@ package ru.betterend.client.gui; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.screenhandler.v1.ScreenHandlerRegistry; - import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.Inventory; @@ -19,7 +18,6 @@ import net.minecraft.screen.PropertyDelegate; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.screen.slot.Slot; import net.minecraft.world.World; - import ru.betterend.BetterEnd; import ru.betterend.blocks.EndStoneSmelter; import ru.betterend.blocks.entities.EndStoneSmelterBlockEntity; diff --git a/src/main/java/ru/betterend/client/render/EternalCrystalRenderer.java b/src/main/java/ru/betterend/client/render/EternalCrystalRenderer.java index f9cba339..d4a23f39 100644 --- a/src/main/java/ru/betterend/client/render/EternalCrystalRenderer.java +++ b/src/main/java/ru/betterend/client/render/EternalCrystalRenderer.java @@ -10,7 +10,6 @@ import net.minecraft.client.util.math.Vector3f; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3i; - import ru.betterend.BetterEnd; import ru.betterend.blocks.AuroraCrystalBlock; import ru.betterend.util.ColorUtil; diff --git a/src/main/java/ru/betterend/particle/InfusionParticle.java b/src/main/java/ru/betterend/particle/InfusionParticle.java index 8f6d75e2..4055437e 100644 --- a/src/main/java/ru/betterend/particle/InfusionParticle.java +++ b/src/main/java/ru/betterend/particle/InfusionParticle.java @@ -2,7 +2,6 @@ package ru.betterend.particle; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; - import net.minecraft.client.particle.Particle; import net.minecraft.client.particle.ParticleFactory; import net.minecraft.client.particle.ParticleTextureSheet; diff --git a/src/main/java/ru/betterend/particle/InfusionParticleType.java b/src/main/java/ru/betterend/particle/InfusionParticleType.java index 7518fe12..498dfde8 100644 --- a/src/main/java/ru/betterend/particle/InfusionParticleType.java +++ b/src/main/java/ru/betterend/particle/InfusionParticleType.java @@ -6,7 +6,6 @@ import com.mojang.serialization.Codec; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; - import net.minecraft.command.argument.ItemStackArgument; import net.minecraft.command.argument.ItemStringReader; import net.minecraft.item.ItemStack; @@ -14,7 +13,6 @@ import net.minecraft.network.PacketByteBuf; import net.minecraft.particle.ParticleEffect; import net.minecraft.particle.ParticleType; import net.minecraft.util.registry.Registry; - import ru.betterend.registry.EndParticles; import ru.betterend.util.ColorUtil; diff --git a/src/main/java/ru/betterend/rituals/InfusionRitual.java b/src/main/java/ru/betterend/rituals/InfusionRitual.java index 5b8f52f1..85bb4384 100644 --- a/src/main/java/ru/betterend/rituals/InfusionRitual.java +++ b/src/main/java/ru/betterend/rituals/InfusionRitual.java @@ -12,7 +12,6 @@ import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; - import ru.betterend.blocks.entities.InfusionPedestalEntity; import ru.betterend.blocks.entities.PedestalBlockEntity; import ru.betterend.particle.InfusionParticleType; diff --git a/src/main/java/ru/betterend/util/ColorUtil.java b/src/main/java/ru/betterend/util/ColorUtil.java index 49749cc7..83ff6882 100644 --- a/src/main/java/ru/betterend/util/ColorUtil.java +++ b/src/main/java/ru/betterend/util/ColorUtil.java @@ -10,7 +10,6 @@ import com.google.common.collect.Maps; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.impl.client.indigo.renderer.helper.ColorHelper; - import net.minecraft.client.MinecraftClient; import net.minecraft.client.texture.NativeImage; import net.minecraft.item.BlockItem; @@ -20,7 +19,6 @@ import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; import net.minecraft.util.registry.Registry; - import ru.betterend.BetterEnd; @Environment(EnvType.CLIENT) diff --git a/src/main/java/ru/betterend/world/features/trees/TenaneaFeature.java b/src/main/java/ru/betterend/world/features/trees/TenaneaFeature.java index a27a2892..bed487e7 100644 --- a/src/main/java/ru/betterend/world/features/trees/TenaneaFeature.java +++ b/src/main/java/ru/betterend/world/features/trees/TenaneaFeature.java @@ -143,17 +143,19 @@ public class TenaneaFeature extends DefaultFeature { support.forEach((bpos) -> { int count = MHelper.randRange(3, 8, random); mut.set(bpos); - BlocksHelper.setWithoutUpdate(world, mut, top); - for (int i = 1; i < count; i++) { - mut.setY(mut.getY() - 1); - if (world.isAir(mut.down())) { - BlocksHelper.setWithoutUpdate(world, mut, middle); - } - else { - break; + if (world.getBlockState(mut.up()).isOf(EndBlocks.TENANEA_LEAVES)) { + BlocksHelper.setWithoutUpdate(world, mut, top); + for (int i = 1; i < count; i++) { + mut.setY(mut.getY() - 1); + if (world.isAir(mut.down())) { + BlocksHelper.setWithoutUpdate(world, mut, middle); + } + else { + break; + } } + BlocksHelper.setWithoutUpdate(world, mut, bottom); } - BlocksHelper.setWithoutUpdate(world, mut, bottom); }); }