From 3013c787f3994e82ff0023247ab947a68c487fcc Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 11 Apr 2015 17:10:29 +0100 Subject: [PATCH] Added the Solegnolia. --- .../common/block/BlockSpecialFlower.java | 3 +- .../botania/common/block/ModBlocks.java | 2 + .../subtile/functional/SubTileSolegnolia.java | 71 ++++++++++++++++++ .../item/equipment/bauble/ItemMagnetRing.java | 3 +- .../botania/common/lib/LibBlockNames.java | 1 + .../resources/assets/botania/lang/en_US.lang | 2 + .../blocks/{unused => }/solegnolia.png | Bin 7 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java rename src/main/resources/assets/botania/textures/blocks/{unused => }/solegnolia.png (100%) diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index ec237e3f1..2ddf6d5c6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -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 })); } diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index fbb7b61f8..48171e919 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -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 clazz, String key) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java new file mode 100644 index 000000000..6eacf1da9 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -0,0 +1,71 @@ +/** + * 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 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 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); + } + +} diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java index 314d0fa62..d3d4446a8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java @@ -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(); diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index dcb1a4f8a..a4102f688 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -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"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index c9c4aefe2..11b1e4873 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -979,6 +979,8 @@ 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 +tile.botania:flower.solegnolia.name=Solegnolia +tile.botania:flower.solegnolia.reference=WIP # ITEM NAMES item.botania:lexicon.name=Lexica Botania diff --git a/src/main/resources/assets/botania/textures/blocks/unused/solegnolia.png b/src/main/resources/assets/botania/textures/blocks/solegnolia.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/solegnolia.png rename to src/main/resources/assets/botania/textures/blocks/solegnolia.png