diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 2a6187b65..01e41f02f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -75,6 +75,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid LibBlockNames.SUBTILE_GOURMARYLLIS, LibBlockNames.SUBTILE_NARSLIMMUS, LibBlockNames.SUBTILE_SPECTROLUS, + LibBlockNames.SUBTILE_RAFFLOWSIA, LibBlockNames.SUBTILE_DANDELIFEON, // Functional diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 0d5fa46ed..6f5c58b78 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -113,6 +113,7 @@ import vazkii.botania.common.block.subtile.generating.SubTileKekimurus; import vazkii.botania.common.block.subtile.generating.SubTileMunchdew; import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus; import vazkii.botania.common.block.subtile.generating.SubTileNightshade; +import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia; import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus; import vazkii.botania.common.block.subtile.generating.SubTileThermalily; import vazkii.botania.common.block.tile.TileAlfPortal; @@ -472,6 +473,7 @@ public final class ModBlocks { BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_NARSLIMMUS, SubTileNarslimmus.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_SPECTROLUS, SubTileSpectrolus.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_DANDELIFEON, SubTileDandelifeon.class); + BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_RAFFLOWSIA, SubTileRafflowsia.class); registerSubTileWithMini(LibBlockNames.SUBTILE_BELLETHORN, SubTileBellethorn.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_DREADTHORN, SubTileDreadthorn.class); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java new file mode 100644 index 000000000..55ca70d46 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java @@ -0,0 +1,130 @@ +/** + * 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 @ [Oct 11, 2015, 5:05:05 PM (GMT)] + */ +package vazkii.botania.common.block.subtile.generating; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.subtile.ISubTileContainer; +import vazkii.botania.api.subtile.RadiusDescriptor; +import vazkii.botania.api.subtile.SubTileEntity; +import vazkii.botania.api.subtile.SubTileGenerating; +import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.lexicon.LexiconData; + +public class SubTileRafflowsia extends SubTileGenerating { + + private static final String TAG_LAST_FLOWER = "lastFlower"; + private static final String TAG_LAST_FLOWER_TIMES = "lastFlowerTimes"; + + String lastFlower; + int lastFlowerTimes; + + private static final int RANGE = 5; + + @Override + public void onUpdate() { + super.onUpdate(); + + int mana = 1200; + + if(getMaxMana() - this.mana >= mana && !supertile.getWorldObj().isRemote && ticksExisted % 40 == 0) { + for(int i = 0; i < RANGE * 2 + 1; i++) + for(int j = 0; j < RANGE * 2 + 1; j++) + for(int k = 0; k < RANGE * 2 + 1; k++) { + int x = supertile.xCoord + i - RANGE; + int y = supertile.yCoord + j - RANGE; + int z = supertile.zCoord + k - RANGE; + Block block = supertile.getWorldObj().getBlock(x, y, z); + TileEntity tile = supertile.getWorldObj().getTileEntity(x, y, z); + if(tile instanceof ISubTileContainer) { + SubTileEntity stile = ((ISubTileContainer) tile).getSubTile(); + String name = stile.getUnlocalizedName(); + + if(stile instanceof SubTileGenerating && ((SubTileGenerating) stile).isPassiveFlower()) { + boolean last = name.equals(lastFlower); + if(last) + lastFlowerTimes++; + else { + lastFlower = name; + lastFlowerTimes = 1; + } + + float mod = 1F / lastFlowerTimes; + + int meta = supertile.getWorldObj().getBlockMetadata(x, y, z) + 1; + supertile.getWorldObj().setBlockToAir(x, y, z); + + supertile.getWorldObj().playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12)); + this.mana += mana * mod; + sync(); + return; + } + } + } + } + } + + @Override + public void writeToPacketNBT(NBTTagCompound cmp) { + super.writeToPacketNBT(cmp); + + cmp.setString(TAG_LAST_FLOWER, lastFlower); + cmp.setInteger(TAG_LAST_FLOWER_TIMES, lastFlowerTimes); + } + + @Override + public void readFromPacketNBT(NBTTagCompound cmp) { + super.readFromPacketNBT(cmp); + + lastFlower = cmp.getString(TAG_LAST_FLOWER); + lastFlowerTimes = cmp.getInteger(TAG_LAST_FLOWER_TIMES); + } + + @Override + public void populateDropStackNBTs(List drops) { + super.populateDropStackNBTs(drops); + + ItemStack stack = drops.get(0); + ItemNBTHelper.setString(stack, TAG_LAST_FLOWER, lastFlower); + ItemNBTHelper.setInt(stack, TAG_LAST_FLOWER_TIMES, lastFlowerTimes); + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) { + super.onBlockPlacedBy(world, x, y, z, entity, stack); + + lastFlower = ItemNBTHelper.getString(stack, TAG_LAST_FLOWER, ""); + lastFlowerTimes = ItemNBTHelper.getInt(stack, TAG_LAST_FLOWER_TIMES, 0); + } + + @Override + public RadiusDescriptor getRadius() { + return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + } + + @Override + public int getColor() { + return 0x502C76; + } + + @Override + public int getMaxMana() { + return 6000; + } + +} diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index 04147d44f..8b38b1843 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -121,6 +121,7 @@ public final class LibBlockNames { public static final String SUBTILE_NARSLIMMUS = "narslimmus"; public static final String SUBTILE_SPECTROLUS = "spectrolus"; public static final String SUBTILE_DANDELIFEON = "dandelifeon"; + public static final String SUBTILE_RAFFLOWSIA = "rafflowsia"; public static final String SUBTILE_BELLETHORN = "bellethorn"; public static final String SUBTILE_DREADTHORN = "dreadthorn"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index a539c2c05..bfaff5ebd 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1193,6 +1193,8 @@ tile.botania:flower.spectrolus.name=Spectrolus tile.botania:flower.spectrolus.reference=Profiting off Hate tile.botania:flower.dandelifeon.name=Dandelifeon tile.botania:flower.dandelifeon.reference=C'est la vie +tile.botania:flower.rafflowsia.name=Rafflowsia +tile.botania:flower.rafflowsia.reference=Trap Hole Nightmare # - FUNCTIONAL tile.botania:flower.bellethorn.name=Bellethorne diff --git a/src/main/resources/assets/botania/textures/blocks/unused/rafflowsia.png b/src/main/resources/assets/botania/textures/blocks/alt/rafflowsia.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/rafflowsia.png rename to src/main/resources/assets/botania/textures/blocks/alt/rafflowsia.png diff --git a/src/main/resources/assets/botania/textures/blocks/rafflowsia.png b/src/main/resources/assets/botania/textures/blocks/rafflowsia.png new file mode 100644 index 000000000..f56706656 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/rafflowsia.png differ