Clean Up Flower

This commit is contained in:
Nedelosk committed 2017-08-02 15:42:10 +02:00
1 parent fa4a5b0a17
commit 65431e73d4
7 files changed
+36 -86

No files matched your search

@@ -190,24 +190,31 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister
public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
ItemStack stack = player.getHeldItem(hand);
if (type == EnumFlowerStage.POLLEN) {
IFlower flower = Binnie.GENETICS.getFlowerRoot().getMember(stack);
TileEntity target = world.getTileEntity(pos);
if (!(target instanceof IPollinatable)) {
return EnumActionResult.PASS;
}
IPollinatable pollinatable = (IPollinatable) target;
if (!pollinatable.canMateWith(flower)) {
return EnumActionResult.FAIL;
}
pollinatable.mateWith(flower);
if (!player.capabilities.isCreativeMode) {
stack.shrink(1);
}
return EnumActionResult.SUCCESS;
return pollinateFlower(world, pos, player, stack);
}
return placeFlower(player, stack, world, pos, hand, facing, hitX, hitY, hitZ);
}
IBlockState iblockstate = world.getBlockState(pos);
Block block = iblockstate.getBlock();
private EnumActionResult pollinateFlower(World world, BlockPos pos, EntityPlayer player, ItemStack stack){
IFlower flower = Binnie.GENETICS.getFlowerRoot().getMember(stack);
TileEntity target = world.getTileEntity(pos);
if (!(target instanceof IPollinatable)) {
return EnumActionResult.PASS;
}
IPollinatable pollinatable = (IPollinatable) target;
if (!pollinatable.canMateWith(flower)) {
return EnumActionResult.FAIL;
}
pollinatable.mateWith(flower);
if (!player.capabilities.isCreativeMode) {
stack.shrink(1);
}
return EnumActionResult.SUCCESS;
}
private EnumActionResult placeFlower(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ){
IBlockState blockState = world.getBlockState(pos);
Block block = blockState.getBlock();
if (!block.isReplaceable(world, pos)) {
pos = pos.offset(facing);
@@ -215,11 +222,11 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister
if (stack.getCount() != 0 && player.canPlayerEdit(pos, facing, stack) && world.mayPlace(Botany.flower, pos, false, facing, null)) {
int i = getMetadata(stack.getMetadata());
IBlockState iblockstate1 = Botany.flower.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, i, player, hand);
IBlockState stateForPlacement = Botany.flower.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, i, player, hand);
if (placeBlockAt(stack, player, world, pos, facing, hitX, hitY, hitZ, iblockstate1)) {
SoundType soundtype = world.getBlockState(pos).getBlock().getSoundType(world.getBlockState(pos), world, pos, player);
world.playSound(player, pos, soundtype.getPlaceSound(), SoundCategory.BLOCKS, (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F);
if (placeBlockAt(stack, player, world, pos, facing, hitX, hitY, hitZ, stateForPlacement)) {
SoundType soundType = block.getSoundType(stateForPlacement, world, pos, player);
world.playSound(player, pos, soundType.getPlaceSound(), SoundCategory.BLOCKS, (soundType.getVolume() + 1.0F) / 2.0F, soundType.getPitch() * 0.8F);
stack.shrink(1);
}
@@ -369,8 +369,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
@Override
public SPacketUpdateTileEntity getUpdatePacket() {
// TODO getFlower().getGenome() != null always true?
if (renderInfo == null && getFlower() != null && getFlower().getGenome() != null) {
if (renderInfo == null && getFlower() != null) {
renderInfo = new RenderInfo(getFlower(), this);
}
return (renderInfo != null) ? new SPacketUpdateTileEntity(pos, 0, getUpdateTag()) : null;
@@ -14,6 +14,7 @@ import forestry.api.genetics.IAllele;
import forestry.api.genetics.IChromosome;
import forestry.core.genetics.Chromosome;
import forestry.core.genetics.Individual;
import forestry.core.utils.Translator;
import binnie.botany.api.EnumFlowerChromosome;
import binnie.botany.api.IAlleleFlowerSpecies;
@@ -23,6 +24,7 @@ import binnie.botany.api.IFlowerColor;
import binnie.botany.api.IFlowerGenome;
import binnie.botany.api.IFlowerMutation;
import binnie.botany.core.BotanyCore;
import binnie.core.util.I18N;
public class Flower extends Individual implements IFlower {
public IFlowerGenome genome;
@@ -84,15 +86,14 @@ public class Flower extends Individual implements IFlower {
public void addTooltip(List<String> list) {
IAlleleFlowerSpecies primary = genome.getPrimary();
IAlleleFlowerSpecies secondary = genome.getSecondary();
// TODO localize
if (!isPureBred(EnumFlowerChromosome.SPECIES)) {
list.add(TextFormatting.BLUE + primary.getAlleleName() + "-" + secondary.getAlleleName() + " Hybrid");
list.add(TextFormatting.BLUE + Translator.translateToLocal("for.bees.hybrid").replaceAll("%PRIMARY", primary.getAlleleName()).replaceAll("%SECONDARY", secondary.getAlleleName()));
}
list.add(TextFormatting.GOLD + "Age: " + getAge());
list.add(TextFormatting.GOLD + "T: " + getGenome().getPrimary().getTemperature() + " / " + getGenome().getToleranceTemperature());
list.add(TextFormatting.GOLD + "M: " + getGenome().getPrimary().getMoisture() + " / " + getGenome().getToleranceMoisture());
list.add(TextFormatting.GOLD + "pH: " + getGenome().getPrimary().getHumidity() + " / " + getGenome().getTolerancePH());
list.add(TextFormatting.GOLD + I18N.localise("item.botany.flower.age", getAge()));
list.add(TextFormatting.GREEN + "T: " + getGenome().getPrimary().getTemperature() + " / " + getGenome().getToleranceTemperature());
list.add(TextFormatting.AQUA + "M: " + getGenome().getPrimary().getMoisture() + " / " + getGenome().getToleranceMoisture());
list.add(TextFormatting.AQUA + "pH: " + getGenome().getPrimary().getHumidity() + " / " + getGenome().getTolerancePH());
list.add(TextFormatting.GOLD + "Fert: " + getGenome().getFertility() + "x");
}
@@ -9,7 +9,6 @@ import binnie.botany.api.EnumFlowerChromosome;
public class FlowerTemplates {
public static IAllele[] getDefaultTemplate() {
IAllele[] alleles = new IAllele[EnumFlowerChromosome.values().length];
//TODO: Test flower reset
AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SPECIES, FlowerDefinition.Poppy.getSpecies());
AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.PRIMARY, EnumFlowerColor.Red.getFlowerColorAllele());
AlleleHelper.getInstance().set(alleles, EnumFlowerChromosome.SECONDARY, EnumFlowerColor.Red.getFlowerColorAllele());
@@ -31,14 +31,6 @@ public class PageSpeciesFlowerGenome extends PageSpecies {
super(parent, tab);
}
//TODO: unused ?
/*public static String tolerated(boolean t) {
if (t) {
return "Tolerated";
}
return "Not Tolerated";
}*/
@Override
public void onValueChanged(IAlleleSpecies species) {
deleteAllChildren();
@@ -1,49 +0,0 @@
package binnie.botany.network;
import java.io.IOException;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.PacketBuffer;
import net.minecraft.network.play.server.SPacketUpdateTileEntity;
import net.minecraft.util.math.BlockPos;
import binnie.botany.flower.TileEntityFlower;
import binnie.botany.genetics.EnumFlowerColor;
import binnie.botany.genetics.EnumFlowerType;
// TODO unused class?
public class PacketFlowerUpdate extends SPacketUpdateTileEntity {
public TileEntityFlower.RenderInfo render;
public PacketFlowerUpdate(BlockPos blockPos, int metadata, NBTTagCompound compound, TileEntityFlower.RenderInfo render) {
super(blockPos, metadata, compound);
this.render = render;
}
@Override
public void readPacketData(PacketBuffer buf) throws IOException {
super.readPacketData(buf);
render = new TileEntityFlower.RenderInfo();
render.primary = EnumFlowerColor.values()[buf.readByte()].getFlowerColorAllele();
render.secondary = EnumFlowerColor.values()[buf.readByte()].getFlowerColorAllele();
render.stem = EnumFlowerColor.values()[buf.readByte()].getFlowerColorAllele();
render.type = EnumFlowerType.values()[buf.readByte()];
render.age = buf.readByte();
render.section = buf.readByte();
render.wilted = buf.readBoolean();
render.flowered = buf.readBoolean();
}
@Override
public void writePacketData(PacketBuffer buf) throws IOException {
super.writePacketData(buf);
buf.writeByte(render.primary.getID());
buf.writeByte(render.secondary.getID());
buf.writeByte(render.stem.getID());
buf.writeByte(render.type.ordinal());
buf.writeByte(render.age);
buf.writeByte(render.section);
buf.writeBoolean(render.wilted);
buf.writeBoolean(render.flowered);
}
}
@@ -73,6 +73,7 @@ botany.tube.material.iron.name=Iron
botany.tube.material.bronze.name=Bronze
item.botany.flower.destroy=This item is bugged. Destroy it!
item.botany.flower.age=Age: %s
item.botany.grammar.flower=%PRIMARY, %STEM Stem
item.botany.grammar.flower.secondary=%PRIMARY and %SECONDARY, %STEM Stem