mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 10:55:17 +00:00
Passive flowers no longer decay if planted on Enchanted Soil.
This commit is contained in:
1 parent
9124e4f77f
commit
d90cd50e38
7 files changed
+69
-27
No files matched your search
@@ -1,4 +1,4 @@
|
||||
@API(owner = "Botania", apiVersion = "62", provides = "BotaniaAPI")
|
||||
@API(owner = "Botania", apiVersion = "63", provides = "BotaniaAPI")
|
||||
package vazkii.botania.api;
|
||||
import cpw.mods.fml.common.API;
|
||||
|
||||
@@ -39,6 +39,11 @@ public class SubTileEntity {
|
||||
protected TileEntity supertile;
|
||||
|
||||
public int ticksExisted = 0;
|
||||
|
||||
/** true if this flower is working on Enchanted Soil **/
|
||||
public boolean overgrowth = false;
|
||||
/** true if this flower is working on Enchanted Soil and this is the second tick **/
|
||||
public boolean overgrowthBoost = false;
|
||||
|
||||
/** The Tag items should use to store which sub tile they are. **/
|
||||
public static final String TAG_TYPE = "type";
|
||||
@@ -213,6 +218,13 @@ public class SubTileEntity {
|
||||
public int getPowerLevel(int side) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets if this SubTileEntity is affected by Enchanted Soil's speed boost.
|
||||
*/
|
||||
public boolean isOvergrowthAffected() {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -11,10 +11,13 @@
|
||||
package vazkii.botania.api.subtile;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.ScaledResolution;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -22,10 +25,13 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ChunkCoordinates;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.internal.IManaNetwork;
|
||||
import vazkii.botania.api.mana.IManaCollector;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
import vazkii.botania.common.core.helper.ItemNBTHelper;
|
||||
|
||||
/**
|
||||
* The basic class for a Generating Flower.
|
||||
@@ -39,6 +45,7 @@ public class SubTileGenerating extends SubTileEntity {
|
||||
private static final String TAG_COLLECTOR_X = "collectorX";
|
||||
private static final String TAG_COLLECTOR_Y = "collectorY";
|
||||
private static final String TAG_COLLECTOR_Z = "collectorZ";
|
||||
private static final String TAG_PASSIVE_DECAY_TICKS = "passiveDecayTicks";
|
||||
|
||||
protected int mana;
|
||||
|
||||
@@ -47,6 +54,7 @@ public class SubTileGenerating extends SubTileEntity {
|
||||
int sizeLastCheck = -1;
|
||||
protected TileEntity linkedCollector = null;
|
||||
public int knownMana = -1;
|
||||
public int passiveDecayTicks;
|
||||
|
||||
ChunkCoordinates cachedCollectorCoordinates = null;
|
||||
|
||||
@@ -87,17 +95,21 @@ public class SubTileGenerating extends SubTileEntity {
|
||||
if(Math.random() > particleChance)
|
||||
BotaniaAPI.internalHandler.sparkleFX(supertile.getWorldObj(), supertile.xCoord + 0.3 + Math.random() * 0.5, supertile.yCoord + 0.5 + Math.random() * 0.5, supertile.zCoord + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5);
|
||||
}
|
||||
|
||||
|
||||
boolean passive = isPassiveFlower();
|
||||
if(!supertile.getWorldObj().isRemote) {
|
||||
int muhBalance = BotaniaAPI.internalHandler.getPassiveFlowerDecay();
|
||||
|
||||
if(isPassiveFlower() && muhBalance > 0 && ticksExisted > muhBalance) {
|
||||
if(passive && muhBalance > 0 && passiveDecayTicks > muhBalance) {
|
||||
supertile.getWorldObj().playAuxSFX(2001, supertile.xCoord, supertile.yCoord, supertile.zCoord, Block.getIdFromBlock(supertile.getBlockType()));
|
||||
if(supertile.getWorldObj().getBlock(supertile.xCoord, supertile.yCoord - 1, supertile.zCoord).isSideSolid(supertile.getWorldObj(), supertile.xCoord, supertile.yCoord - 1, supertile.zCoord, ForgeDirection.UP))
|
||||
supertile.getWorldObj().setBlock(supertile.xCoord, supertile.yCoord, supertile.zCoord, Blocks.deadbush);
|
||||
else supertile.getWorldObj().setBlockToAir(supertile.xCoord, supertile.yCoord, supertile.zCoord);
|
||||
}
|
||||
}
|
||||
|
||||
if(!overgrowth && passive)
|
||||
passiveDecayTicks++;
|
||||
}
|
||||
|
||||
public void linkCollector() {
|
||||
@@ -172,6 +184,26 @@ public class SubTileGenerating extends SubTileEntity {
|
||||
public int getValueForPassiveGeneration() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ArrayList<ItemStack> getDrops(ArrayList<ItemStack> list) {
|
||||
ArrayList<ItemStack> drops = super.getDrops(list);
|
||||
if(isPassiveFlower())
|
||||
populateDropStackNBTs(drops);
|
||||
return drops;
|
||||
}
|
||||
|
||||
public void populateDropStackNBTs(List<ItemStack> drops) {
|
||||
if(isPassiveFlower() && ticksExisted > 0 && ConfigHandler.hardcorePassiveGeneration > 0)
|
||||
ItemNBTHelper.setInt(drops.get(0), TAG_PASSIVE_DECAY_TICKS, passiveDecayTicks);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) {
|
||||
super.onBlockPlacedBy(world, x, y, z, entity, stack);
|
||||
if(isPassiveFlower())
|
||||
passiveDecayTicks = ItemNBTHelper.getInt(stack, TAG_PASSIVE_DECAY_TICKS, 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onWanded(EntityPlayer player, ItemStack wand) {
|
||||
@@ -198,11 +230,12 @@ public class SubTileGenerating extends SubTileEntity {
|
||||
@Override
|
||||
public void readFromPacketNBT(NBTTagCompound cmp) {
|
||||
mana = cmp.getInteger(TAG_MANA);
|
||||
passiveDecayTicks = cmp.getInteger(TAG_PASSIVE_DECAY_TICKS);
|
||||
|
||||
int x = cmp.getInteger(TAG_COLLECTOR_X);
|
||||
int y = cmp.getInteger(TAG_COLLECTOR_Y);
|
||||
int z = cmp.getInteger(TAG_COLLECTOR_Z);
|
||||
|
||||
|
||||
cachedCollectorCoordinates = y < 0 ? null : new ChunkCoordinates(x, y, z);
|
||||
}
|
||||
|
||||
@@ -210,7 +243,8 @@ public class SubTileGenerating extends SubTileEntity {
|
||||
public void writeToPacketNBT(NBTTagCompound cmp) {
|
||||
cmp.setInteger(TAG_MANA, mana);
|
||||
cmp.setInteger(TAG_TICKS_EXISTED, ticksExisted);
|
||||
|
||||
cmp.setInteger(TAG_PASSIVE_DECAY_TICKS, passiveDecayTicks);
|
||||
|
||||
if(cachedCollectorCoordinates != null) {
|
||||
cmp.setInteger(TAG_COLLECTOR_X, cachedCollectorCoordinates.posX);
|
||||
cmp.setInteger(TAG_COLLECTOR_Y, cachedCollectorCoordinates.posY);
|
||||
@@ -266,5 +300,10 @@ public class SubTileGenerating extends SubTileEntity {
|
||||
int color = getColor();
|
||||
BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, res, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isOvergrowthAffected() {
|
||||
return !isPassiveFlower();
|
||||
}
|
||||
|
||||
}
|
||||
-18
@@ -27,22 +27,4 @@ public class SubTilePassiveGenerating extends SubTileGenerating {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ArrayList<ItemStack> getDrops(ArrayList<ItemStack> list) {
|
||||
ArrayList<ItemStack> drops = super.getDrops(list);
|
||||
populateDropStackNBTs(drops);
|
||||
return drops;
|
||||
}
|
||||
|
||||
public void populateDropStackNBTs(List<ItemStack> drops) {
|
||||
if(isPassiveFlower() && ticksExisted > 0 && ConfigHandler.hardcorePassiveGeneration > 0)
|
||||
ItemNBTHelper.setInt(drops.get(0), TAG_TICKS_EXISTED, ticksExisted);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) {
|
||||
super.onBlockPlacedBy(world, x, y, z, entity, stack);
|
||||
ticksExisted = ItemNBTHelper.getInt(stack, TAG_TICKS_EXISTED, 0);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -89,9 +89,17 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil
|
||||
}
|
||||
}
|
||||
|
||||
boolean special = isOnSpecialSoil();
|
||||
if(special) {
|
||||
subTile.overgrowth = true;
|
||||
if(subTile.isOvergrowthAffected()) {
|
||||
subTile.onUpdate();
|
||||
subTile.overgrowthBoost = true;
|
||||
}
|
||||
}
|
||||
subTile.onUpdate();
|
||||
if(isOnSpecialSoil())
|
||||
subTile.onUpdate();
|
||||
subTile.overgrowth = false;
|
||||
subTile.overgrowthBoost = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -759,7 +759,7 @@ public final class LexiconData {
|
||||
fireChakram.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeFireChakram));
|
||||
|
||||
overgrowthSeed = new BLexiconEntry(LibLexicon.TOOL_OVERGROWTH_SEED, categoryTools);
|
||||
overgrowthSeed.setLexiconPages(new PageText("0")).setIcon(new ItemStack(ModItems.overgrowthSeed));
|
||||
overgrowthSeed.setLexiconPages(new PageText("0"), new PageText("1")).setIcon(new ItemStack(ModItems.overgrowthSeed));
|
||||
|
||||
livingwoodBow = new BLexiconEntry(LibLexicon.TOOL_LIVINGWOOD_BOW, categoryTools);
|
||||
livingwoodBow.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeLivingwoodBow));
|
||||
|
||||
Reference in new issue
Block a user