Fix #1156 Fix #286 Fix #1155 Add villagers and villager houses

This commit is contained in:
mezz committed 2016-05-18 21:57:02 -07:00
1 parent 6b4d7ebcc4
commit fb7cd3ee09
30 files changed
+820 -297

No files matched your search

@@ -81,7 +81,7 @@ public interface IBeeRoot extends ISpeciesRoot {
* Valid {@link IBeeGenome}
* @return {@link IBee} from the passed genome
*/
IBee getBee(World world, IBeeGenome genome);
IBee getBee(IBeeGenome genome);
/**
* Creates an IBee suitable for a queen containing the necessary second genome for the mate.
@@ -0,0 +1,73 @@
/*******************************************************************************
* Copyright 2011-2014 SirSengir
*
* This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
******************************************************************************/
package forestry.api.arboriculture;
import net.minecraft.block.BlockDoor;
import net.minecraft.block.BlockFence;
import net.minecraft.block.BlockFenceGate;
import net.minecraft.block.BlockLog;
import net.minecraft.block.BlockSlab;
import net.minecraft.block.BlockStairs;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack;
public interface IWoodAccess {
// ITEMS
ItemStack getLog(EnumWoodType woodType, boolean fireproof);
ItemStack getPlanks(EnumWoodType woodType, boolean fireproof);
ItemStack getSlab(EnumWoodType woodType, boolean fireproof);
ItemStack getFence(EnumWoodType woodType, boolean fireproof);
ItemStack getFenceGate(EnumWoodType woodType, boolean fireproof);
ItemStack getStairs(EnumWoodType woodType, boolean fireproof);
/**
* All doors in Minecraft are fireproof.
*/
ItemStack getDoor(EnumWoodType woodType);
// BLOCKS
/**
* Forestry logs have their own properties for woodType and use {@link BlockLog.EnumAxis} for orientation.
*/
IBlockState getLogBlock(EnumWoodType woodType, boolean fireproof);
/**
* Forestry slabs have no properties except their wood type.
*/
IBlockState getPlanksBlock(EnumWoodType woodType, boolean fireProof);
/**
* Forestry slabs have the same properties as {@link BlockSlab}
*/
IBlockState getSlabBlock(EnumWoodType woodType, boolean fireproof);
/**
* Forestry fences have the same properties as {@link BlockFence}
*/
IBlockState getFenceBlock(EnumWoodType woodType, boolean fireproof);
/**
* Forestry fence gates have the same properties as {@link BlockFenceGate}
*/
IBlockState getFenceGateBlock(EnumWoodType woodType, boolean fireproof);
/**
* Forestry stairs have the same properties as {@link BlockStairs}
*/
IBlockState getStairsBlock(EnumWoodType woodType, boolean fireproof);
/**
* Forestry doors have the same properties as {@link BlockDoor}
*/
IBlockState getDoorBlock(EnumWoodType woodType);
}
@@ -1,24 +0,0 @@
/*******************************************************************************
* Copyright 2011-2014 SirSengir
*
* This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
******************************************************************************/
package forestry.api.arboriculture;
import net.minecraft.item.ItemStack;
public interface IWoodItemAccess {
ItemStack getLog(EnumWoodType woodType, boolean fireproof);
ItemStack getPlanks(EnumWoodType woodType, boolean fireproof);
ItemStack getSlab(EnumWoodType woodType, boolean fireproof);
ItemStack getFence(EnumWoodType woodType, boolean fireproof);
ItemStack getFenceGate(EnumWoodType woodType, boolean fireproof);
ItemStack getStairs(EnumWoodType woodType, boolean fireproof);
ItemStack getDoor(EnumWoodType woodType);
}
@@ -15,7 +15,7 @@ public class TreeManager {
/**
* Convenient access to wood items.
*/
public static IWoodItemAccess woodItemAccess;
public static IWoodAccess woodAccess;
/**
* Used to create new trees.
@@ -14,12 +14,12 @@ public interface IForestryConstants {
/**
* @return The villager ID for the Apiarist Villager.
*/
int getApicultureVillagerID();
String getApicultureVillagerID();
/**
* @return The villager ID for the Arborist Villager.
*/
int getArboricultureVillagerID();
String getArboricultureVillagerID();
/**
* @return The {@link LootTableLoadEvent} key for adding items to the Forestry Villager chest.
@@ -123,6 +123,12 @@ public interface IAlleleRegistry {
*/
Collection<IAllele> getRegisteredAlleles(IChromosomeType type);
/**
* @return unmodifiable collection of all the known chromosome types.
* @since Forestry 5.0
*/
Collection<IChromosomeType> getChromosomeTypes(IAllele allele);
/* CLASSIFICATIONS */
/**
@@ -23,4 +23,12 @@ public interface IAlleleSpeciesBuilder {
/** Uncounted species do not count toward total species discovered. */
IAlleleSpeciesBuilder setIsNotCounted();
/**
* Manually the genetic complexity.
* If this is not set, the complexity is based on the number of breeding steps to reach this species.
*
* @see forestry.api.genetics.IAlleleSpecies#getComplexity()
*/
void setComplexity(int complexity);
}