diff --git a/src/generated/resources/data/minecraft/tags/blocks/impermeable.json b/src/generated/resources/data/minecraft/tags/blocks/impermeable.json new file mode 100644 index 000000000..3ad5a282d --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/impermeable.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "botania:elf_glass", + "botania:mana_glass", + "botania:bifrost", + "botania:bifrost_perm" + ] +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 74b9cf897..12c47e31f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -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); } diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 1229e9952..961015010 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -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); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java index 79252b142..59485d4c8 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java @@ -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; } - } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockModGlass.java new file mode 100644 index 000000000..c98a5ea1b --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModGlass.java @@ -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; + } +} diff --git a/src/main/java/vazkii/botania/data/BlockTagProvider.java b/src/main/java/vazkii/botania/data/BlockTagProvider.java index bfc0ffe1b..dbe8e3512 100644 --- a/src/main/java/vazkii/botania/data/BlockTagProvider.java +++ b/src/main/java/vazkii/botania/data/BlockTagProvider.java @@ -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 diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_axe.png~ b/src/main/resources/assets/minecraft/textures/entity/banner/botania_axe.png~ new file mode 100644 index 000000000..1f4cf8453 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_axe.png~ differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_dominant.png~ b/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_dominant.png~ new file mode 100644 index 000000000..d0f621a01 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_dominant.png~ differ