From 2b1a02b23d169de11172f27fa135179aa5a0f8fd Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 30 Sep 2015 22:57:33 +0100 Subject: [PATCH] Changed some checks to use Material instead of Block. --- .../block/subtile/functional/SubTileBubbell.java | 3 ++- .../subtile/generating/SubTileHydroangeas.java | 13 +++++++------ .../block/subtile/generating/SubTileThermalily.java | 7 ++++--- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java index cd96604a1..7d90ea700 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.block.Block; +import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -48,7 +49,7 @@ public class SubTileBubbell extends SubTileFunctional { for(int k = -range; k < range + 1; k++) if(MathHelper.pointDistanceSpace(i, j, k, 0, 0, 0) < range) { Block block = supertile.getWorldObj().getBlock(supertile.xCoord + i, supertile.yCoord + j, supertile.zCoord + k); - if(block == Blocks.water || block == Blocks.flowing_water) { + if(block.getMaterial() == Material.water) { supertile.getWorldObj().setBlock(supertile.xCoord + i, supertile.yCoord + j, supertile.zCoord + k, ModBlocks.fakeAir, 0, 2); TileFakeAir air = (TileFakeAir) supertile.getWorldObj().getTileEntity(supertile.xCoord + i, supertile.yCoord + j, supertile.zCoord + k); air.setFlower(supertile); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java index 76a23abb4..a91d29fa8 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java @@ -16,6 +16,7 @@ import java.util.Collections; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -62,14 +63,14 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { supertile.zCoord + offsetArray[1] }; - Block search = getBlockToSearchFor(); - if(supertile.getWorldObj().getBlock(positions[0], supertile.yCoord, positions[1]) == search && (getBlockToSearchBelow() == null || supertile.getWorldObj().getBlock(positions[0], supertile.yCoord - 1, positions[1]) == getBlockToSearchBelow()) && supertile.getWorldObj().getBlockMetadata(positions[0], supertile.yCoord, positions[1]) == 0) { - if(search != Blocks.water) + Material search = getMaterialToSearchFor(); + if(supertile.getWorldObj().getBlock(positions[0], supertile.yCoord, positions[1]).getMaterial() == search && (getBlockToSearchBelow() == null || supertile.getWorldObj().getBlock(positions[0], supertile.yCoord - 1, positions[1]) == getBlockToSearchBelow()) && supertile.getWorldObj().getBlockMetadata(positions[0], supertile.yCoord, positions[1]) == 0) { + if(search != Material.water) supertile.getWorldObj().setBlockToAir(positions[0], supertile.yCoord, positions[1]); else { int waterAround = 0; for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) - if(supertile.getWorldObj().getBlock(positions[0] + dir.offsetX, supertile.yCoord, positions[1] + dir.offsetZ) == search) + if(supertile.getWorldObj().getBlock(positions[0] + dir.offsetX, supertile.yCoord, positions[1] + dir.offsetZ).getMaterial() == search) waterAround++; if(waterAround < 2) @@ -122,8 +123,8 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { Botania.proxy.wispFX(supertile.getWorldObj(), supertile.xCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.yCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.zCoord + 0.5, 0.05F, 0.05F, 0.7F, (float) Math.random() / 6, (float) -Math.random() / 60); } - public Block getBlockToSearchFor() { - return Blocks.water; + public Material getMaterialToSearchFor() { + return Material.water; } public Block getBlockToSearchBelow() { diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java index 1514b00b3..02ce55e1e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.block.Block; +import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.Botania; @@ -44,10 +45,10 @@ public class SubTileThermalily extends SubTileHydroangeas { } @Override - public Block getBlockToSearchFor() { - return Blocks.lava; + public Material getMaterialToSearchFor() { + return Material.lava; } - + @Override public void playSound() { supertile.getWorldObj().playSoundEffect(supertile.xCoord, supertile.yCoord, supertile.zCoord, "botania:thermalily", 0.2F, 1F);