diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 04f9d5d70..2f4c5c190 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -508,7 +508,7 @@ public final class ModBlocks { BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MEDUMONE, SubTileMedumone.class); registerSubTileWithMini(LibBlockNames.SUBTILE_MARIMORPHOSIS, SubTileMarimorphosis.class); registerSubTileWithMini(LibBlockNames.SUBTILE_BUBBELL, SubTileBubbell.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_SOLEGNOLIA, SubTileSolegnolia.class); + registerSubTileWithMini(LibBlockNames.SUBTILE_SOLEGNOLIA, SubTileSolegnolia.class); } public static void registerMultiparts() { 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 index f5eeacd5e..1840e111b 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -23,7 +23,8 @@ import vazkii.botania.common.lexicon.LexiconData; public class SubTileSolegnolia extends SubTileFunctional { - private static final int RANGE = 5; + private static final double RANGE = 5; + private static final double RANGE_MINI = 1; public static Set existingFlowers = Collections.newSetFromMap(new WeakHashMap()); private static boolean registered = false; @@ -52,7 +53,8 @@ public class SubTileSolegnolia extends SubTileFunctional { if(flower.mana == 0 || flower.redstoneSignal > 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) + double range = flower.getRange(); + 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; } @@ -69,14 +71,22 @@ public class SubTileSolegnolia extends SubTileFunctional { return 0xC99C4D; } + public double getRange() { + return RANGE; + } + @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Circle(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Circle(toChunkCoordinates(), getRange()); } @Override public LexiconEntry getEntry() { return LexiconData.solegnolia; } + + public static class Mini extends SubTileSolegnolia { + @Override public double getRange() { return RANGE_MINI; } + } } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 2c185bab7..2e9f68e96 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1281,6 +1281,8 @@ tile.botania:flower.bubbellChibi.name=Bubbell Petite tile.botania:flower.bubbellChibi.reference=And whistle tile.botania:flower.solegnolia.name=Solegnolia tile.botania:flower.solegnolia.reference=All your magnets are belong to us +tile.botania:flower.solegnoliaChibi.name=Solegnolia Petite +tile.botania:flower.solegnoliaChibi.reference=All your magnets are belong to us # ITEM NAMES item.botania:lexicon.name=Lexica Botania diff --git a/src/main/resources/assets/botania/textures/blocks/alt/solegnoliaChibi.png b/src/main/resources/assets/botania/textures/blocks/alt/solegnoliaChibi.png new file mode 100644 index 000000000..fb752ce09 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/solegnoliaChibi.png differ