Added the Solegnolia.

This commit is contained in:
Lizbeth Rika committed 2015-04-11 17:10:29 +01:00
1 parent 485f9ae2de
commit 3013c787f3
7 files changed
+80 -2

No files matched your search

@@ -93,7 +93,8 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid
LibBlockNames.SUBTILE_DAFFOMILL,
LibBlockNames.SUBTILE_VINCULOTUS,
LibBlockNames.SUBTILE_SPECTRANTHEMUM,
LibBlockNames.SUBTILE_BUBBELL
LibBlockNames.SUBTILE_BUBBELL,
LibBlockNames.SUBTILE_SOLEGNOLIA
}));
}
@@ -85,6 +85,7 @@ import vazkii.botania.common.block.subtile.functional.SubTileMarimorphosis;
import vazkii.botania.common.block.subtile.functional.SubTileMedumone;
import vazkii.botania.common.block.subtile.functional.SubTilePollidisiac;
import vazkii.botania.common.block.subtile.functional.SubTileRannuncarpus;
import vazkii.botania.common.block.subtile.functional.SubTileSolegnolia;
import vazkii.botania.common.block.subtile.functional.SubTileSpectranthemum;
import vazkii.botania.common.block.subtile.functional.SubTileTangleberrie;
import vazkii.botania.common.block.subtile.functional.SubTileTigerseye;
@@ -396,6 +397,7 @@ public final class ModBlocks {
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MEDUMONE, SubTileMedumone.class);
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MARIMORPHOSIS, SubTileMarimorphosis.class);
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_BUBBELL, SubTileBubbell.class);
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_SOLEGNOLIA, SubTileSolegnolia.class);
}
private static void registerTile(Class<? extends TileEntity> clazz, String key) {
@@ -0,0 +1,71 @@
/**
* This class was created by <Vazkii>. 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 11, 2015, 4:53:35 PM (GMT)]
*/
package vazkii.botania.common.block.subtile.functional;
import java.util.Collections;
import java.util.Set;
import java.util.WeakHashMap;
import net.minecraft.entity.Entity;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.RadiusDescriptor.Circle;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.common.core.helper.MathHelper;
public class SubTileSolegnolia extends SubTileFunctional {
private static final int RANGE = 5;
public static Set<SubTileSolegnolia> existingFlowers = Collections.newSetFromMap(new WeakHashMap());
private static boolean registered = false;
@Override
public void onUpdate() {
super.onUpdate();
if(!existingFlowers.contains(this)) {
existingFlowers.add(this);
if(!registered)
registered = true;
}
if(ticksExisted % 10 == 0 && mana > 0)
mana--;
}
public static boolean hasSolegnoliaAround(Entity e) {
for(SubTileSolegnolia flower : existingFlowers) {
if(flower.mana == 0 || flower.supertile.getWorldObj() != e.worldObj || flower.supertile.getWorldObj().getTileEntity(flower.supertile.xCoord, flower.supertile.yCoord, flower.supertile.zCoord) != flower.supertile)
continue;
if(MathHelper.pointDistanceSpace(e.posX, e.posY, e.posZ, flower.supertile.xCoord + 0.5, flower.supertile.yCoord + 0.5, flower.supertile.zCoord + 0.5) <= RANGE)
return true;
}
return false;
}
@Override
public int getMaxMana() {
return 20;
}
@Override
public int getColor() {
return 0xC99C4D;
}
@Override
public RadiusDescriptor getRadius() {
return new RadiusDescriptor.Circle(toChunkCoordinates(), RANGE);
}
}
@@ -26,6 +26,7 @@ import vazkii.botania.api.mana.IManaItem;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.subtile.functional.SubTileSolegnolia;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.core.helper.MathHelper;
import vazkii.botania.common.core.helper.Vector3;
@@ -107,7 +108,7 @@ public class ItemMagnetRing extends ItemBauble {
}
private boolean canPullItem(EntityItem item) {
if(item.isDead)
if(item.isDead || SubTileSolegnolia.hasSolegnoliaAround(item))
return false;
ItemStack stack = item.getEntityItem();
@@ -120,6 +120,7 @@ public final class LibBlockNames {
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 SUBTILE_SOLEGNOLIA = "solegnolia";
public static final String QUARTZ_DARK = "Dark";
public static final String QUARTZ_MANA = "Mana";