From b0fe511fc8158c7869ebeb80649433fc91f799f9 Mon Sep 17 00:00:00 2001 From: TheWhiteWolves Date: Sat, 13 Feb 2016 01:09:21 +0000 Subject: [PATCH] Add the Clayconia Petite (X & Z range 2, Y range 1), Closes #1805 --- .../botania/common/block/ModBlocks.java | 2 +- .../subtile/functional/SubTileClayconia.java | 32 ++++++++++++++---- .../resources/assets/botania/lang/en_US.lang | 2 ++ .../textures/blocks/clayconiaChibi.png | Bin 0 -> 3239 bytes 4 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/blocks/clayconiaChibi.png 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 0000000000000000000000000000000000000000..ac26738930feff4e19eccd04b83f66ae7a4f5b0e GIT binary patch literal 3239 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 Z;5SWyuzWKI+w%Yb002ovPDHLkV1mjqA%6e> literal 0 HcmV?d00001