From 6b615fe818abccbcfbef6e9967cfeeed0880d270 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 11 Apr 2015 16:10:40 +0100 Subject: [PATCH] Bubbell recipe/docs~ --- .../subtile/functional/SubTileBubbell.java | 28 +++++++++---------- .../common/crafting/ModPetalRecipes.java | 4 ++- .../botania/common/lexicon/LexiconData.java | 4 +++ .../vazkii/botania/common/lib/LibLexicon.java | 1 + .../resources/assets/botania/lang/en_US.lang | 5 ++++ 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java index 0afed35dc..2db209de2 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java @@ -15,11 +15,15 @@ import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.ISubTileContainer; +import vazkii.botania.api.subtile.RadiusDescriptor; +import vazkii.botania.api.subtile.RadiusDescriptor.Circle; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileFakeAir; import vazkii.botania.common.core.helper.MathHelper; +import vazkii.botania.common.lexicon.LexiconData; public class SubTileBubbell extends SubTileFunctional { @@ -28,7 +32,6 @@ public class SubTileBubbell extends SubTileFunctional { private static final String TAG_RANGE = "range"; int range = 2; - boolean hadMana = false; @Override public void onUpdate() { @@ -36,7 +39,6 @@ public class SubTileBubbell extends SubTileFunctional { if(mana > COST_PER_TICK) { mana -= COST_PER_TICK; - hadMana = true; if(ticksExisted % 10 == 0 && range < RANGE) range++; @@ -52,18 +54,6 @@ public class SubTileBubbell extends SubTileFunctional { air.setFlower(supertile); } } - } else { - if(hadMana) { - for(int i = -range; i < range + 1; i++) - for(int j = -range; j < range + 1; j++) - for(int k = -range; k < range + 1; k++) - if(MathHelper.pointDistanceSpace(i, j, k, 0, 0, 0) < range && supertile.getWorldObj().getBlock(supertile.xCoord + i, supertile.yCoord + j, supertile.zCoord + k) == ModBlocks.fakeAir) { - supertile.getWorldObj().setBlock(supertile.xCoord + i, supertile.yCoord + j, supertile.zCoord + k, Blocks.water); - break; - } - } - - hadMana = false; } } @@ -101,5 +91,15 @@ public class SubTileBubbell extends SubTileFunctional { public int getColor() { return 0x0DCF89; } + + @Override + public RadiusDescriptor getRadius() { + return new RadiusDescriptor.Circle(toChunkCoordinates(), RANGE); + } + @Override + public LexiconEntry getEntry() { + return LexiconData.bubbell; + } + } diff --git a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java index c3676f0c2..979310e3b 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -68,6 +68,7 @@ public final class ModPetalRecipes { public static RecipePetals spectranthemumRecipe; public static RecipePetals medumoneRecipe; public static RecipePetals marimorphosisRecipe; + public static RecipePetals bubbellRecipe; public static void init() { pureDaisyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY), white, white, white, white); @@ -109,7 +110,8 @@ public final class ModPetalRecipes { spectranthemumRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SPECTRANTHEMUM), whiteMana, whiteMana, white, white, cyan, runeEnvy, runeWater, redstoneRoot, pixieDust); medumoneRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MEDUMONE), brown, brown, brownMana, gray, grayMana, runeEarth, redstoneRoot); marimorphosisRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MARIMORPHOSIS), grayMana, yellow, green, lime, lightBlue, red, runeEarth, runeFire, redstoneRoot); - + bubbellRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BUBBELL), cyanMana, cyan, blue, lightBlue, lightBlueMana, runeWater, runeSummer, pixieDust); + ItemStack stack = new ItemStack(Items.skull, 1, 3); ItemNBTHelper.setString(stack, "SkullOwner", "Vazkii"); Object[] inputs = new Object[16]; diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index e93e78a47..260885750 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -110,6 +110,7 @@ public final class LexiconData { public static LexiconEntry spectranthemum; public static LexiconEntry medumone; public static LexiconEntry marimorphosis; + public static LexiconEntry bubbell; public static LexiconEntry generatingIntro; public static LexiconEntry daybloom; @@ -453,6 +454,9 @@ public final class LexiconData { marimorphosis = new BLexiconEntry(LibLexicon.FFLOWER_MARIMORPHOSIS, categoryFunctionalFlowers); marimorphosis.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_METAMORPHIC_STONES), new PagePetalRecipe("2", ModPetalRecipes.marimorphosisRecipe)); + bubbell = new ALexiconEntry(LibLexicon.FFLOWER_BUBBELL, categoryFunctionalFlowers); + bubbell.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.bubbellRecipe)); + // GENERATING FLOWERS ENTRIES generatingIntro = new BLexiconEntry(LibLexicon.GFLOWER_INTRO, categoryGenerationFlowers); generatingIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2")); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index 2313c38ef..a1bdc937d 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -82,6 +82,7 @@ public final class LibLexicon { public static final String FFLOWER_SPECTRANTHEMUN = "spectranthemum"; public static final String FFLOWER_MEDUMONE = "medumone"; public static final String FFLOWER_MARIMORPHOSIS = "marimorphosis"; + public static final String FFLOWER_BUBBELL = "bubbell"; public static final String GFLOWER_INTRO = "gIntro"; public static final String GFLOWER_DAYBLOOM = "daybloom"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 742bd7498..c7837f076 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1720,6 +1720,11 @@ botania.page.marimorphosis0=The &1Marimorphosis&0 is a flower that executes meta botania.page.marimorphosis1=The various flavours of &1Metamorphic Stone&0 botania.page.marimorphosis2=&oThis flower is pretty gneiss&r. +# -- BUBBELL +botania.entry.bubbell=Bubbell +botania.page.bubbell0=Building underwater is a no small task. Clearing air under the sea is incredibly troublesome and time consuming. Placing down a &1Bubbell&0 underwater and providing it with &4Mana&0 (preferably a priori) will have it start to create a dome of air which will keep water at bay. The dome has about twelve blocks of radius. &4Mana&0 is required constantly to keep it up and going. +botania.page.bubbell1=&oLike some casual game&r. + # - GENERATING FLOWERS # -- AN INTRODUCTION TO GENERATION botania.entry.gIntro=An Introduction to Generation