diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index d8bff58e2..075722c82 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -502,7 +502,7 @@ public final class ModBlocks { registerSubTileWithMini(LibBlockNames.SUBTILE_RANNUNCARPUS, SubTileRannuncarpus.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_HYACIDUS, SubTileHyacidus.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_POLLIDISIAC, SubTilePollidisiac.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_CLAYCONIA, SubTileClayconia.class); + registerSubTileWithMini(LibBlockNames.SUBTILE_CLAYCONIA, SubTileClayconia.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_LOONIUM, SubTileLoonuim.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_DAFFOMILL, SubTileDaffomill.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_VINCULOTUS, SubTileVinculotus.class); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java index 9686fdbf8..11e645f5b 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java @@ -26,16 +26,19 @@ import vazkii.botania.common.lexicon.LexiconData; public class SubTileClayconia extends SubTileFunctional { + private static final int COST = 80; private static final int RANGE = 5; private static final int RANGE_Y = 3; + + private static final int RANGE_MINI = 2; + private static final int RANGE_Y_MINI = 1; @Override public void onUpdate() { super.onUpdate(); if(!supertile.getWorldObj().isRemote && ticksExisted % 5 == 0) { - int manaCost = 80; - if(mana >= manaCost) { + if(mana >= COST) { ChunkCoordinates coords = getCoordsToPut(); if(coords != null) { supertile.getWorldObj().setBlockToAir(coords.posX, coords.posY, coords.posZ); @@ -43,7 +46,7 @@ public class SubTileClayconia extends SubTileFunctional { supertile.getWorldObj().playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(Block.getBlockFromName("sand"))); EntityItem item = new EntityItem(supertile.getWorldObj(), coords.posX + 0.5, coords.posY + 0.5, coords.posZ + 0.5, new ItemStack(Items.clay_ball)); supertile.getWorldObj().spawnEntityInWorld(item); - mana -= manaCost; + mana -= COST; } } } @@ -52,9 +55,12 @@ public class SubTileClayconia extends SubTileFunctional { public ChunkCoordinates getCoordsToPut() { List possibleCoords = new ArrayList(); - for(int i = -RANGE; i < RANGE + 1; i++) - for(int j = -RANGE_Y; j < RANGE_Y + 1; j++) - for(int k = -RANGE; k < RANGE + 1; k++) { + int range = getRange(); + int rangeY = getRangeY(); + + for(int i = -range; i < range + 1; i++) + for(int j = -rangeY; j < rangeY + 1; j++) + for(int k = -range; k < range + 1; k++) { int x = supertile.xCoord + i; int y = supertile.yCoord + j; int z = supertile.zCoord + k; @@ -70,9 +76,17 @@ public class SubTileClayconia extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Square(toChunkCoordinates(), getRange()); } + public int getRange() { + return RANGE; + } + + public int getRangeY() { + return RANGE_Y; + } + @Override public int getColor() { return 0x7B8792; @@ -88,4 +102,8 @@ public class SubTileClayconia extends SubTileFunctional { return LexiconData.clayconia; } + public static class Mini extends SubTileClayconia { + @Override public int getRange() { return RANGE_MINI; } + @Override public int getRangeY() { return RANGE_Y_MINI; } + } } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index deab1afa5..dd435b950 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1300,6 +1300,8 @@ tile.botania:flower.pollidisiac.name=Pollidisiac tile.botania:flower.pollidisiac.reference=Birds and bees tile.botania:flower.clayconia.name=Clayconia tile.botania:flower.clayconia.reference=Rupees not included +tile.botania:flower.clayconiaChibi.name=Clayconia Petite +tile.botania:flower.clayconiaChibi.reference=Rupees not included tile.botania:flower.loonium.name=Loonium tile.botania:flower.loonium.reference=Hold it up above your head tile.botania:flower.daffomill.name=Daffomill diff --git a/src/main/resources/assets/botania/textures/blocks/clayconiaChibi.png b/src/main/resources/assets/botania/textures/blocks/clayconiaChibi.png new file mode 100644 index 000000000..ac2673893 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/clayconiaChibi.png differ