From bd021962cfc0a67b390120f5f40ae515ea21aa71 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 26 Apr 2020 11:57:44 -0500 Subject: [PATCH] Make botania glass blocks match vanilla glass blocks in not allowing fluid drip and not showing flowing texture. Closes #3264 --- .../minecraft/tags/blocks/impermeable.json | 9 ++++++ .../common/block/BlockBifrostPerm.java | 4 +-- .../botania/common/block/ModBlocks.java | 13 ++------- .../common/block/decor/BlockElfGlass.java | 4 +-- .../common/block/decor/BlockModGlass.java | 26 ++++++++++++++++++ .../vazkii/botania/data/BlockTagProvider.java | 2 ++ .../textures/entity/banner/botania_axe.png~ | Bin 0 -> 543 bytes .../entity/banner/botania_spark_dominant.png~ | Bin 0 -> 1323 bytes 8 files changed, 42 insertions(+), 16 deletions(-) create mode 100644 src/generated/resources/data/minecraft/tags/blocks/impermeable.json create mode 100644 src/main/java/vazkii/botania/common/block/decor/BlockModGlass.java create mode 100644 src/main/resources/assets/minecraft/textures/entity/banner/botania_axe.png~ create mode 100644 src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_dominant.png~ 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 0000000000000000000000000000000000000000..1f4cf84538b3ede8e4b4c18add8046d699184882 GIT binary patch literal 543 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj11LJ;A7srr_TW@b}TzkksfbD_(i(Ci6*K7q{J`R)59ZuoUYD;Ke z^FWVRIOZ{9fQC(Tyz3V^r$dZRN+0K^aJqK&+TWLaB%-M*;yQ7|BM(i{;;*p`5nrD? zcf0Z6bTb2s0s|w50|S#l1B2zmz3t!sJ$1Z)_5AIBY0pjG|Gj%Y`1a<%OQsmO-+r=g zMlql7ub&YG;J*C%n>Zx>JMd7StErNObDnHyHk zKNxDW@#9ereivvk!9(mpZU13S)iikc!6h0Hq58o4k+{|pYYt~kDJEe2GI+ZBxvXM; z3;+Yb0DP*zaU@BSZVpJ2L>$NUCIFu2DHICP$;k=1-EK{v&1R!WBtmAh`O87fW-~=1 z5wh8An(J=2n@&znC=?12&+}bPGTJtq&4xG0WHRb?uh)y4n;QT?sZ@d_NgZuSl7v#J z1OT|Xxq;W~Rr@lTjB4Lzv*9ye0FWN-Qvm(_{fNb4D3{Cdcs%fUJjms8_$XszV;yab zjg7VF=W;pKUb$RGEEYq5e}8uYa2y9g5FiKw3}i6EED;o{-~ zo#gWJ6057Luv)F3u2{QfwOX;dx{Axo%Z~OhE-sMET0@$oU8o}N;rQlXcZm;V)X1VJE&!$FgilQcCoMQ*p7 zhK7d7WHQn9^)*$iRodCvp;D=&js>9a*MlGtA(2QR9*_TcwZGfq@i-ER#Fu(q34+03 z5CE{Ywx%0^wY4<>Krk5W3V^FDT)9v>gSwar9Pr0MBt^7(u;I5=jT)`7U|{Xg&K_p5fR1XaoXJ6q}SKi)@}M* zkHEyl1h%%e)Sz^5aDd(2-L?U%R4Tz@v3$A87K=sA1wP8|?k)}v4%FXUTU(fznCQ+i zxUjI$*2(ARXDEt-m6a9b^Lb6*_VzXeLFhPnK@hOLy{)+?pU-1uWd(|&;Q9Hv?U)M- z3%`2|`u+YEC$iZrW@l$HGBTn%!t*>97Z){pGcz+C0nE(IXml4B7s2zq+CMTfg4x+w zWV6|p@%?`P?*Uj}UsngN*XxjFS>x!(_C6y_r_&wv(&@A&1MH;7^E_l(M!jBF_1D+e zbq6541%hNUNmi?s_V@QmQ50%6n;nCO!C=r-h_|=59d+OLNs>ecgMpr&o?7%?Utj6) z@Q|ENCq<)Cnwy)WWHQ;^VyImk9UWDVuJ05w?+dE8BXx9i^vB0#SMq?5kvtlWqS0um zlexOOg3IOl@?MwAg{!M8^}a@FUJK`dk?_g-W~wJZnx`J3)t;;0KnefURMBo`cBYjG*YEfp=!0N+YwZ)R;f~{kkM%D zy?27LETd2;U|?WCw;eDrFn~g#(3_6{&+~9Poe)J)Hvpn2!s&E=nsxqqIoy-q$8{=) z*_R;(fB|3t7yt%<0r-1Gw?81V9l!uE01N;FzyL4+3;+Yb05AXy00Y1PFaQhy1Hb?< h01N;FzyS1~`~%&`IXO>CIobdK002ovPDHLkV1lM`Tl@e3 literal 0 HcmV?d00001