Make botania glass blocks match vanilla glass blocks in not allowing fluid drip and not showing flowing texture. Closes #3264

This commit is contained in:
Vincent Lee committed 2020-04-26 11:59:54 -05:00
1 parent fd363c3f7b
commit bd021962cf
8 files changed
+42 -16

No files matched your search

@@ -8,7 +8,6 @@
*/
package vazkii.botania.common.block;
import net.minecraft.block.AbstractGlassBlock;
import net.minecraft.block.BlockState;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
@@ -18,10 +17,11 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.client.fx.SparkleParticleData;
import vazkii.botania.common.block.decor.BlockModGlass;
import java.util.Random;
public class BlockBifrostPerm extends AbstractGlassBlock {
public class BlockBifrostPerm extends BlockModGlass {
public BlockBifrostPerm(Properties builder) {
super(builder);
}
@@ -38,16 +38,7 @@ import vazkii.botania.common.block.corporea.BlockCorporeaFunnel;
import vazkii.botania.common.block.corporea.BlockCorporeaIndex;
import vazkii.botania.common.block.corporea.BlockCorporeaInterceptor;
import vazkii.botania.common.block.corporea.BlockCorporeaRetainer;
import vazkii.botania.common.block.decor.BlockBuriedPetals;
import vazkii.botania.common.block.decor.BlockElfGlass;
import vazkii.botania.common.block.decor.BlockFloatingFlower;
import vazkii.botania.common.block.decor.BlockManaFlame;
import vazkii.botania.common.block.decor.BlockModMushroom;
import vazkii.botania.common.block.decor.BlockPetalBlock;
import vazkii.botania.common.block.decor.BlockShinyFlower;
import vazkii.botania.common.block.decor.BlockStarfield;
import vazkii.botania.common.block.decor.BlockTinyPotato;
import vazkii.botania.common.block.decor.ItemBlockBlaze;
import vazkii.botania.common.block.decor.*;
import vazkii.botania.common.block.dispenser.BehaviourFelPumpkin;
import vazkii.botania.common.block.dispenser.BehaviourPoolMinecart;
import vazkii.botania.common.block.dispenser.BehaviourWand;
@@ -503,7 +494,7 @@ public final class ModBlocks {
register(r, new BlockRFGenerator(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)), LibBlockNames.FLUXFIELD);
register(r, new BlockElfGlass(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).sound(SoundType.GLASS).lightValue(15).nonOpaque()), LibBlockNames.ELF_GLASS);
register(r, new BlockBrewery(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)), LibBlockNames.BREWERY);
register(r, new GlassBlock(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).sound(SoundType.GLASS).lightValue(15).nonOpaque()), LibBlockNames.MANA_GLASS);
register(r, new BlockModGlass(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).sound(SoundType.GLASS).lightValue(15).nonOpaque()), LibBlockNames.MANA_GLASS);
register(r, new BlockTerraPlate(Block.Properties.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL)), LibBlockNames.TERRA_PLATE);
builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE);
@@ -8,12 +8,11 @@
*/
package vazkii.botania.common.block.decor;
import net.minecraft.block.AbstractGlassBlock;
import net.minecraft.item.ItemStack;
import vazkii.botania.api.recipe.IElvenItem;
public class BlockElfGlass extends AbstractGlassBlock implements IElvenItem {
public class BlockElfGlass extends BlockModGlass implements IElvenItem {
public BlockElfGlass(Properties builder) {
super(builder);
@@ -23,5 +22,4 @@ public class BlockElfGlass extends AbstractGlassBlock implements IElvenItem {
public boolean isElvenItem(ItemStack stack) {
return true;
}
}
@@ -0,0 +1,26 @@
/*
* This class is distributed as part of the Botania Mod.
* Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*/
package vazkii.botania.common.block.decor;
import net.minecraft.block.AbstractGlassBlock;
import net.minecraft.block.BlockState;
import net.minecraft.fluid.IFluidState;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.ILightReader;
public class BlockModGlass extends AbstractGlassBlock {
public BlockModGlass(Properties props) {
super(props);
}
@Override
public boolean shouldDisplayFluidOverlay(BlockState state, ILightReader world, BlockPos pos, IFluidState fluidState) {
return true;
}
}
@@ -88,6 +88,8 @@ public class BlockTagProvider extends BlockTagsProvider {
.sorted(Comparator.comparing(Block::getRegistryName))
.toArray(Block[]::new)
);
getBuilder(BlockTags.IMPERMEABLE).add(ModBlocks.elfGlass, ModBlocks.manaGlass, ModBlocks.bifrost, ModBlocks.bifrostPerm);
}
@Nonnull