From ca1e0a6a3544f94e41b8bbfddc9e9e81be3d1e24 Mon Sep 17 00:00:00 2001 From: Hubry Date: Thu, 26 Dec 2019 20:35:24 +0100 Subject: [PATCH] Use vanilla glass as base for our glass, fixes #3070 --- .../botania/common/block/BlockBifrostPerm.java | 12 ++++++------ .../botania/common/block/decor/BlockManaGlass.java | 7 ++----- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index e2bc496e1..a8b496c74 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block; +import net.minecraft.block.AbstractGlassBlock; import net.minecraft.block.BlockState; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.math.BlockPos; @@ -21,7 +22,7 @@ import vazkii.botania.client.fx.SparkleParticleData; import javax.annotation.Nonnull; import java.util.Random; -public class BlockBifrostPerm extends BlockMod { +public class BlockBifrostPerm extends AbstractGlassBlock { public BlockBifrostPerm(Properties builder) { super(builder); } @@ -29,13 +30,12 @@ public class BlockBifrostPerm extends BlockMod { @OnlyIn(Dist.CLIENT) @Override public void animateTick(BlockState state, World world, BlockPos pos, Random rand) { - if(rand.nextBoolean()) { - SparkleParticleData data = SparkleParticleData.sparkle(0.45F + 0.2F * (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 6); - world.addParticle(data, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 0, 0, 0); - } + if (rand.nextBoolean()) { + SparkleParticleData data = SparkleParticleData.sparkle(0.45F + 0.2F * (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 6); + world.addParticle(data, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 0, 0, 0); + } } - @OnlyIn(Dist.CLIENT) @Nonnull @Override public BlockRenderLayer getRenderLayer() { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java index aaa02cbf7..59ef0dce3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -10,20 +10,17 @@ */ package vazkii.botania.common.block.decor; +import net.minecraft.block.AbstractGlassBlock; import net.minecraft.util.BlockRenderLayer; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.common.block.BlockMod; import javax.annotation.Nonnull; -public class BlockManaGlass extends BlockMod { +public class BlockManaGlass extends AbstractGlassBlock { public BlockManaGlass(Properties builder) { super(builder); } - @OnlyIn(Dist.CLIENT) @Nonnull @Override public BlockRenderLayer getRenderLayer() {