diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java new file mode 100644 index 000000000..1d610b4fd --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -0,0 +1,66 @@ +/** + * This class was created by . It's 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 + * + * File Created @ [Apr 10, 2015, 10:22:38 PM (GMT)] + */ +package vazkii.botania.common.block; + +import java.util.List; +import java.util.Random; + +import vazkii.botania.common.lib.LibBlockNames; +import net.minecraft.block.material.Material; +import net.minecraft.entity.Entity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +public class BlockFakeAir extends BlockMod { + + public BlockFakeAir() { + super(Material.air); + setBlockName(LibBlockNames.FAKE_AIR); + setBlockBounds(0, 0, 0, 0, 0, 0); + } + + @Override + boolean registerInCreative() { + return false; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { + // NO-OP + } + + @Override + public int quantityDropped(Random p_149745_1_) { + return 0; + } + + @Override + public boolean isReplaceable(IBlockAccess world, int x, int y, int z) { + return true; + } + + @Override + public boolean isAir(IBlockAccess world, int x, int y, int z) { + return true; + } + +} diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 07a7866ce..ec237e3f1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -92,7 +92,8 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid LibBlockNames.SUBTILE_LOONIUM, LibBlockNames.SUBTILE_DAFFOMILL, LibBlockNames.SUBTILE_VINCULOTUS, - LibBlockNames.SUBTILE_SPECTRANTHEMUM + LibBlockNames.SUBTILE_SPECTRANTHEMUM, + LibBlockNames.SUBTILE_BUBBELL })); } diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index fc671a4d4..29f725c5e 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -69,6 +69,7 @@ import vazkii.botania.common.block.subtile.SubTileManastar; import vazkii.botania.common.block.subtile.SubTilePureDaisy; import vazkii.botania.common.block.subtile.functional.SubTileAgricarnation; import vazkii.botania.common.block.subtile.functional.SubTileBellethorn; +import vazkii.botania.common.block.subtile.functional.SubTileBubbell; import vazkii.botania.common.block.subtile.functional.SubTileClayconia; import vazkii.botania.common.block.subtile.functional.SubTileDaffomill; import vazkii.botania.common.block.subtile.functional.SubTileDreadthorn; @@ -210,6 +211,7 @@ public final class ModBlocks { public static Block pump; public static Block doubleFlower1; public static Block doubleFlower2; + public static Block fakeAir; public static void init() { flower = new BlockModFlower(); @@ -276,7 +278,8 @@ public final class ModBlocks { pump = new BlockPump(); doubleFlower1 = new BlockModDoubleFlower(false); doubleFlower2 = new BlockModDoubleFlower(true); - + fakeAir = new BlockFakeAir(); + ModFluffBlocks.init(); for(int i = 0; i < 16; i++) @@ -390,6 +393,7 @@ public final class ModBlocks { BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_SPECTRANTHEMUM, SubTileSpectranthemum.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MEDUMONE, SubTileMedumone.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MARIMORPHOSIS, SubTileMarimorphosis.class); + BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_BUBBELL, SubTileBubbell.class); } private static void registerTile(Class clazz, String key) { 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 new file mode 100644 index 000000000..78e3f396b --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java @@ -0,0 +1,65 @@ +/** + * This class was created by . It's 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 + * + * File Created @ [Apr 10, 2015, 10:28:42 PM (GMT)] + */ +package vazkii.botania.common.block.subtile.functional; + +import net.minecraft.block.BlockLiquid; +import net.minecraft.nbt.NBTTagCompound; +import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.core.helper.MathHelper; + +public class SubTileBubbell extends SubTileFunctional { + + private static final int RANGE = 12; + private static final String TAG_RANGE = "range"; + + int range = 2; + + @Override + public void onUpdate() { + super.onUpdate(); + + if(ticksExisted % 10 == 0 && range < RANGE) + range++; + + // TODO Mana check + for(int i = -range; i < range + 1; i++) + for(int j = -range; j < range + 1; j++) + for(int k = -range; k < range + 1; k++) + if(MathHelper.pointDistanceSpace(i, j, k, 0, 0, 0) < range && supertile.getWorldObj().getBlock(supertile.xCoord + i, supertile.yCoord + j, supertile.zCoord + k) instanceof BlockLiquid) { + System.out.println("doplace"); // TODO + supertile.getWorldObj().setBlock(supertile.xCoord + i, supertile.yCoord + j, supertile.zCoord + k, ModBlocks.fakeAir); + } + } + + @Override + public void writeToPacketNBT(NBTTagCompound cmp) { + super.writeToPacketNBT(cmp); + cmp.setInteger(TAG_RANGE, range); + } + + @Override + public void readFromPacketNBT(NBTTagCompound cmp) { + super.readFromPacketNBT(cmp); + range = cmp.getInteger(TAG_RANGE); + } + + @Override + public int getMaxMana() { + return 10000; + } + + @Override + public int getColor() { + return 0x0DCF89; + } + +} diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java new file mode 100644 index 000000000..86e8b4bee --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java @@ -0,0 +1,15 @@ +/** + * This class was created by . It's 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 + * + * File Created @ [Apr 10, 2015, 10:24:48 PM (GMT)] + */ +package vazkii.botania.common.block.tile; + +public class TileFakeAir { + +} diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index 2abf60135..dcb1a4f8a 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -79,6 +79,7 @@ public final class LibBlockNames { public static final String PUMP = "pump"; public static final String DOUBLE_FLOWER = "doubleFlower"; public static final String STONE = "stone"; + public static final String FAKE_AIR = "fakeAir"; public static final String SUBTILE_PUREDAISY = "puredaisy"; public static final String SUBTILE_MANASTAR = "manastar"; @@ -118,6 +119,7 @@ public final class LibBlockNames { public static final String SUBTILE_SPECTRANTHEMUM = "spectranthemum"; public static final String SUBTILE_MEDUMONE = "medumone"; public static final String SUBTILE_MARIMORPHOSIS = "marimorphosis"; + public static final String SUBTILE_BUBBELL = "bubbell"; public static final String QUARTZ_DARK = "Dark"; public static final String QUARTZ_MANA = "Mana"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 06157f425..742bd7498 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -976,6 +976,8 @@ tile.botania:flower.medumone.name=Medumone tile.botania:flower.medumone.reference='Twas Hades all along tile.botania:flower.marimorphosis.name=Marimorphosis tile.botania:flower.marimorphosis.reference=Solid as a rock +tile.botania:flower.bubbell.name=Bubbell +tile.botania:flower.bubbell.reference=And whistle # ITEM NAMES item.botania:lexicon.name=Lexica Botania diff --git a/src/main/resources/assets/botania/textures/blocks/unused/bubbell.png b/src/main/resources/assets/botania/textures/blocks/bubbell.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/bubbell.png rename to src/main/resources/assets/botania/textures/blocks/bubbell.png