diff --git a/lang b/lang index addea45c4..1ecd82f36 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit addea45c4fa01d8c74d4e0bf9ac14a109d7797d0 +Subproject commit 1ecd82f36f487e27c977c92022436ba74c7d3c35 diff --git a/src/main/java/forestry/api/farming/package-info.java b/src/main/java/forestry/api/farming/package-info.java index 68fab74ac..d599fba86 100644 --- a/src/main/java/forestry/api/farming/package-info.java +++ b/src/main/java/forestry/api/farming/package-info.java @@ -5,7 +5,7 @@ ******************************************************************************/ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -@API(apiVersion = "2.1.0", owner = "ForestryAPI|core", provides = "ForestryAPI|farming") +@API(apiVersion = "2.2.0", owner = "ForestryAPI|core", provides = "ForestryAPI|farming") package forestry.api.farming; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/forestry/api/lepidopterology/IButterfly.java b/src/main/java/forestry/api/lepidopterology/IButterfly.java index 1725f9e0c..3db351707 100644 --- a/src/main/java/forestry/api/lepidopterology/IButterfly.java +++ b/src/main/java/forestry/api/lepidopterology/IButterfly.java @@ -5,8 +5,11 @@ ******************************************************************************/ package forestry.api.lepidopterology; +import java.util.Set; + import javax.annotation.Nullable; +import forestry.api.core.IErrorState; import forestry.api.genetics.IIndividualLiving; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; @@ -48,6 +51,27 @@ public interface IButterfly extends IIndividualLiving { */ @Nullable IButterfly spawnCaterpillar(World world, IButterflyNursery nursery); + + /** + * Determines whether the caterpillar can grow. + * + * @param cocoon the {@link IButterflyCocoon} the caterpillar resides in. + * @param nursery the {@link IButterflyNursery} of the caterpillar. + * @return an empty set if the caterpillar can grow, a set of error states if the caterpillar can not grow + * @since 5.3.3 + */ + Set getCanGrow(IButterflyNursery nursery, @Nullable IButterflyCocoon cocoon); + + /** + * Determines whether the caterpillar can spawn. (Used to auto-spawn butterflies out of a cocoon.) + * + * @param cocoon the {@link IButterflyCocoon} the caterpillar resides in. + * @param nursery the {@link IButterflyNursery} of the caterpillar. + * @return an empty set if the caterpillar can spawn, a set of error states if the caterpillar can not spawn + * @since 5.3.3 + */ + Set getCanSpawn(IButterflyNursery nursery, @Nullable IButterflyCocoon cocoon); + /** * @param playerKill Whether or not the butterfly was killed by a player. diff --git a/src/main/java/forestry/api/lepidopterology/IButterflyCocoon.java b/src/main/java/forestry/api/lepidopterology/IButterflyCocoon.java index 6e669f0c0..4d2613781 100644 --- a/src/main/java/forestry/api/lepidopterology/IButterflyCocoon.java +++ b/src/main/java/forestry/api/lepidopterology/IButterflyCocoon.java @@ -13,7 +13,7 @@ package forestry.api.lepidopterology; import forestry.api.genetics.IHousing; public interface IButterflyCocoon extends IHousing { - + IButterfly getCaterpillar(); void setCaterpillar(IButterfly butterfly); diff --git a/src/main/java/forestry/api/lepidopterology/IButterflyNursery.java b/src/main/java/forestry/api/lepidopterology/IButterflyNursery.java index 9f76952d9..2b0d667d2 100644 --- a/src/main/java/forestry/api/lepidopterology/IButterflyNursery.java +++ b/src/main/java/forestry/api/lepidopterology/IButterflyNursery.java @@ -10,15 +10,19 @@ import javax.annotation.Nullable; import forestry.api.climate.IClimateProvider; import forestry.api.genetics.IHousing; import forestry.api.genetics.IIndividual; +import net.minecraft.world.World; public interface IButterflyNursery extends IHousing, IClimateProvider { @Nullable IButterfly getCaterpillar(); + @Nullable IIndividual getNanny(); void setCaterpillar(@Nullable IButterfly caterpillar); boolean canNurse(IButterfly caterpillar); + + World getWorldObj(); } diff --git a/src/main/java/forestry/api/lepidopterology/package-info.java b/src/main/java/forestry/api/lepidopterology/package-info.java index 4610d9a33..ab304db65 100644 --- a/src/main/java/forestry/api/lepidopterology/package-info.java +++ b/src/main/java/forestry/api/lepidopterology/package-info.java @@ -5,7 +5,7 @@ ******************************************************************************/ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -@API(apiVersion = "1.3.0", owner = "ForestryAPI|core", provides = "ForestryAPI|lepidopterology") +@API(apiVersion = "1.4.0", owner = "ForestryAPI|core", provides = "ForestryAPI|lepidopterology") package forestry.api.lepidopterology; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/forestry/api/multiblock/IGreenhouseComponent.java b/src/main/java/forestry/api/multiblock/IGreenhouseComponent.java index 34c70f21f..84456a2f2 100644 --- a/src/main/java/forestry/api/multiblock/IGreenhouseComponent.java +++ b/src/main/java/forestry/api/multiblock/IGreenhouseComponent.java @@ -10,6 +10,7 @@ import forestry.api.climate.IClimateSourceProvider; import forestry.api.climate.IClimatiserDefinition; import forestry.api.greenhouse.IGreenhouseListener; import forestry.api.lepidopterology.IButterflyCocoon; +import forestry.api.lepidopterology.IButterflyNursery; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; @@ -32,7 +33,7 @@ public interface IGreenhouseComponent exte IClimatiserDefinition getDefinition(); } - interface Nursery extends IGreenhouseComponent { + interface Nursery extends IGreenhouseComponent, IButterflyNursery { void addCocoonLoot(IButterflyCocoon cocoon, NonNullList loot); } diff --git a/src/main/java/forestry/api/multiblock/IGreenhouseController.java b/src/main/java/forestry/api/multiblock/IGreenhouseController.java index ed5e1a3d4..b942aef6b 100644 --- a/src/main/java/forestry/api/multiblock/IGreenhouseController.java +++ b/src/main/java/forestry/api/multiblock/IGreenhouseController.java @@ -13,6 +13,7 @@ import forestry.api.core.ICamouflageHandler; import forestry.api.greenhouse.IGreenhouseHousing; import forestry.api.greenhouse.IInternalBlock; import forestry.api.lepidopterology.IButterfly; +import forestry.api.lepidopterology.IButterflyCocoon; public interface IGreenhouseController extends IMultiblockController, IGreenhouseHousing, ICamouflageHandler, IClimateControlProvider { @@ -21,6 +22,16 @@ public interface IGreenhouseController extends IMultiblockController, IGreenhous */ Set getInternalBlocks(); + /** + * spawns a butterfly in a greenhouse + * @return true if it has spawned it, and false if it has not + */ + boolean spawnButterfly(IGreenhouseComponent.Nursery nursery); + + /** + * @deprecated use {@link #spawnButterfly(IButterflyCocoon)} + */ + @Deprecated boolean spawnButterfly(IButterfly butterfly); IClimateRegion getRegion(); diff --git a/src/main/java/forestry/apiculture/PluginApiculture.java b/src/main/java/forestry/apiculture/PluginApiculture.java index 825b96983..4f55b647c 100644 --- a/src/main/java/forestry/apiculture/PluginApiculture.java +++ b/src/main/java/forestry/apiculture/PluginApiculture.java @@ -38,6 +38,7 @@ import forestry.api.storage.ICrateRegistry; import forestry.api.storage.StorageManager; import forestry.apiculture.blocks.BlockAlvearyType; import forestry.apiculture.blocks.BlockCandle; +import forestry.apiculture.blocks.BlockHoneyComb; import forestry.apiculture.blocks.BlockRegistryApiculture; import forestry.apiculture.capabilities.ArmorApiarist; import forestry.apiculture.commands.CommandBee; @@ -487,6 +488,15 @@ public class PluginApiculture extends BlankForestryPlugin { "C", 'B', new ItemStack(blocks.apiary), 'C', Items.MINECART); + for(int i = 0;i < blocks.beeCombs.length;i++){ + BlockHoneyComb block = blocks.beeCombs[i]; + for(int m = 0;m < EnumHoneyComb.VALUES.length - i * 16;m++){ + RecipeUtil.addRecipe(new ItemStack(block, 1, m), + "###", + "###", + "###", '#', items.beeComb.get(EnumHoneyComb.get(i * 16 + m), 1)); + } + } // FOOD STUFF if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FOOD)) { diff --git a/src/main/java/forestry/apiculture/blocks/BlockBeeProductType.java b/src/main/java/forestry/apiculture/blocks/BlockBeeProductType.java new file mode 100644 index 000000000..10b511678 --- /dev/null +++ b/src/main/java/forestry/apiculture/blocks/BlockBeeProductType.java @@ -0,0 +1,22 @@ +package forestry.apiculture.blocks; + +import java.util.Locale; + +import net.minecraft.util.IStringSerializable; + +public enum BlockBeeProductType implements IStringSerializable { + BEE_COMBS, + BEESWAX; + + public static final BlockBeeProductType[] VALUES = values(); + + @Override + public String getName() { + return name().toLowerCase(Locale.ENGLISH); + } + + public int getMeta() { + return ordinal(); + } + +} diff --git a/src/main/java/forestry/apiculture/blocks/BlockCandle.java b/src/main/java/forestry/apiculture/blocks/BlockCandle.java index 3b66f3c19..e3ed0a2ad 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockCandle.java +++ b/src/main/java/forestry/apiculture/blocks/BlockCandle.java @@ -332,6 +332,7 @@ public class BlockCandle extends BlockTorch implements IItemModelRegister, ITile return new ItemStack(this, amount, 1); } + @SideOnly(Side.CLIENT) @Override public int colorMultiplier(IBlockState state, @Nullable IBlockAccess worldIn, @Nullable BlockPos pos, int tintIndex) { if (worldIn != null && pos != null) { diff --git a/src/main/java/forestry/apiculture/blocks/BlockHoneyComb.java b/src/main/java/forestry/apiculture/blocks/BlockHoneyComb.java new file mode 100644 index 000000000..198abea1a --- /dev/null +++ b/src/main/java/forestry/apiculture/blocks/BlockHoneyComb.java @@ -0,0 +1,162 @@ +package forestry.apiculture.blocks; + +import javax.annotation.Nullable; + +import com.google.common.base.Predicate; + +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.IStateMapperRegister; +import forestry.api.core.Tabs; +import forestry.apiculture.items.EnumHoneyComb; +import forestry.core.blocks.IBlockWithMeta; +import forestry.core.blocks.IColoredBlock; +import forestry.core.config.Config; +import forestry.core.config.Constants; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.statemap.StateMapperBase; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public abstract class BlockHoneyComb extends Block implements IItemModelRegister, IBlockWithMeta, IColoredBlock, IStateMapperRegister { + public final int minMeta; + + public static final BlockHoneyComb[] create(){ + BlockHoneyComb[] blocks = new BlockHoneyComb[2]; + for(int i = 0;i < blocks.length;i++){ + HoneyCombPredicate filter = new HoneyCombPredicate(i, 16); + PropertyEnum variant = PropertyEnum.create("type", EnumHoneyComb.class, filter); + blocks[i] = new BlockHoneyComb(filter.minMeta) { + @Override + protected PropertyEnum getVariant() { + return variant; + } + }; + } + return blocks; + } + + public BlockHoneyComb(int minMeta) { + super(Material.CLOTH); + setHardness(1F); + setCreativeTab(Tabs.tabApiculture); + setDefaultState(this.blockState.getBaseState().withProperty(getVariant(), getVariant().getAllowedValues().iterator().next())); + this.minMeta = minMeta; + } + + protected abstract PropertyEnum getVariant(); + + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, getVariant()); + } + + @Override + public int getMetaFromState(IBlockState state) { + return state.getValue(getVariant()).ordinal()-minMeta; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(getVariant(), EnumHoneyComb.get(minMeta + meta)); + } + + @Override + public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList list) { + for (EnumHoneyComb honeyComb : getVariant().getAllowedValues()) { + if(!honeyComb.isSecret() || Config.isDebug){ + list.add(get(honeyComb)); + } + } + } + + @Override + public String getUnlocalizedName() { + return "tile.for.bee_combs"; + } + + @SideOnly(Side.CLIENT) + @Override + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.CUTOUT; + } + + @Override + public int damageDropped(IBlockState state) { + return getMetaFromState(state); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModel(Item item, IModelManager manager) { + for (EnumHoneyComb comb : getVariant().getAllowedValues()) { + manager.registerItemModel(item, comb.ordinal()-minMeta, "block_bee_combs"); + } + } + + public ItemStack get(EnumHoneyComb honeyComb) { + return new ItemStack(this, 1, honeyComb.ordinal() - minMeta); + } + + @Override + public String getNameFromMeta(int meta) { + EnumHoneyComb honeyComb = EnumHoneyComb.get(minMeta + meta); + return honeyComb.name; + } + + @SideOnly(Side.CLIENT) + @Override + public int colorMultiplier(IBlockState state, IBlockAccess worldIn, BlockPos pos, int tintIndex) { + int meta = getMetaFromState(state); + EnumHoneyComb honeyComb = EnumHoneyComb.get(minMeta + meta); + if (tintIndex == 1) { + return honeyComb.primaryColor; + } else { + return honeyComb.secondaryColor; + } + } + + @SideOnly(Side.CLIENT) + @Override + public void registerStateMapper() { + ModelLoader.setCustomStateMapper(this, new HoneyCombStateMapper()); + } + + private static class HoneyCombPredicate implements Predicate { + private final int minMeta; + private final int maxMeta; + + public HoneyCombPredicate(int blockNumber, int variantsPerBlock) { + this.minMeta = blockNumber * variantsPerBlock; + this.maxMeta = minMeta + variantsPerBlock - 1; + } + + @Override + public boolean apply(@Nullable EnumHoneyComb honeyComb) { + return honeyComb != null && honeyComb.ordinal() >= minMeta && honeyComb.ordinal() <= maxMeta; + } + } + + @SideOnly(Side.CLIENT) + private static class HoneyCombStateMapper extends StateMapperBase { + + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) { + return new ModelResourceLocation(Constants.MOD_ID + ":bee_combs", "normal"); + } + + } +} diff --git a/src/main/java/forestry/apiculture/blocks/BlockRegistryApiculture.java b/src/main/java/forestry/apiculture/blocks/BlockRegistryApiculture.java index 723c76ce7..0e1da6d96 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockRegistryApiculture.java +++ b/src/main/java/forestry/apiculture/blocks/BlockRegistryApiculture.java @@ -13,6 +13,7 @@ package forestry.apiculture.blocks; import java.util.Map; import forestry.api.core.Tabs; +import forestry.apiculture.items.ItemBlockHoneyComb; import forestry.apiculture.items.ItemBlockCandle; import forestry.core.blocks.BlockBase; import forestry.core.blocks.BlockRegistry; @@ -27,6 +28,7 @@ public class BlockRegistryApiculture extends BlockRegistry { public final BlockBeeHives beehives; public final BlockCandle candle; public final BlockStump stump; + public final BlockHoneyComb[] beeCombs; private final Map alvearyBlockMap; public BlockRegistryApiculture() { @@ -48,6 +50,12 @@ public class BlockRegistryApiculture extends BlockRegistry { registerBlock(candle, new ItemBlockCandle(candle), "candle"); stump = new BlockStump(); registerBlock(stump, new ItemBlockForestry(stump), "stump"); + + beeCombs = BlockHoneyComb.create(); + for(int i = 0;i < beeCombs.length;i++){ + BlockHoneyComb block = beeCombs[i]; + registerBlock(block, new ItemBlockHoneyComb(block), "bee_combs_" + i); + } alvearyBlockMap = BlockAlveary.create(); for (BlockAlveary block : alvearyBlockMap.values()) { diff --git a/src/main/java/forestry/apiculture/items/EnumHoneyComb.java b/src/main/java/forestry/apiculture/items/EnumHoneyComb.java index 094479a07..e81efbcf3 100644 --- a/src/main/java/forestry/apiculture/items/EnumHoneyComb.java +++ b/src/main/java/forestry/apiculture/items/EnumHoneyComb.java @@ -13,7 +13,9 @@ package forestry.apiculture.items; import java.awt.Color; import java.util.Locale; -public enum EnumHoneyComb { +import net.minecraft.util.IStringSerializable; + +public enum EnumHoneyComb implements IStringSerializable { HONEY(new Color(0xe8d56a), new Color(0xffa12b)), COCOA(new Color(0x674016), new Color(0xffb62b), true), SIMMERING(new Color(0x981919), new Color(0xffb62b)), @@ -50,6 +52,11 @@ public enum EnumHoneyComb { this.secondaryColor = secondary.getRGB(); this.secret = secret; } + + @Override + public String getName() { + return name; + } public boolean isSecret() { return secret; diff --git a/src/main/java/forestry/apiculture/items/ItemBlockHoneyComb.java b/src/main/java/forestry/apiculture/items/ItemBlockHoneyComb.java new file mode 100644 index 000000000..0af379aa0 --- /dev/null +++ b/src/main/java/forestry/apiculture/items/ItemBlockHoneyComb.java @@ -0,0 +1,29 @@ +package forestry.apiculture.items; + +import forestry.apiculture.blocks.BlockHoneyComb; +import forestry.core.items.IColoredItem; +import forestry.core.items.ItemBlockForestry; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public class ItemBlockHoneyComb extends ItemBlockForestry implements IColoredItem { + + public ItemBlockHoneyComb(Block block) { + super(block); + } + + @SideOnly(Side.CLIENT) + @Override + public int getColorFromItemstack(ItemStack stack, int tintIndex) { + int meta = stack.getMetadata(); + EnumHoneyComb honeyComb = EnumHoneyComb.get(getBlock().minMeta + meta); + if (tintIndex == 1) { + return honeyComb.primaryColor; + } else { + return honeyComb.secondaryColor; + } + } + +} diff --git a/src/main/java/forestry/core/utils/ClimateUtil.java b/src/main/java/forestry/core/utils/ClimateUtil.java index 58df0e8a9..a40ccceea 100644 --- a/src/main/java/forestry/core/utils/ClimateUtil.java +++ b/src/main/java/forestry/core/utils/ClimateUtil.java @@ -12,15 +12,19 @@ package forestry.core.utils; import java.util.ArrayList; import java.util.Locale; +import java.util.Set; import forestry.api.climate.IClimateInfo; import forestry.api.climate.IClimatePosition; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.ForestryAPI; +import forestry.api.core.IErrorState; +import forestry.api.genetics.AlleleManager; import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IClimateHelper; import forestry.core.climate.ClimateRegion; +import forestry.core.errors.EnumErrorCode; import forestry.core.network.PacketBufferForestry; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -224,6 +228,27 @@ public class ClimateUtil implements IClimateHelper { return Translator.translateToLocal("for.gui." + humidity.toString().toLowerCase(Locale.ENGLISH)); } + public static void addClimateErrorStates(EnumTemperature temperature, EnumHumidity humidity, + EnumTemperature baseTemp, EnumTolerance tolTemp, + EnumHumidity baseHumid, EnumTolerance tolHumid, Set errorStates){ + + if (!AlleleManager.climateHelper.isWithinLimits(temperature, baseTemp, tolTemp)) { + if (baseTemp.ordinal() > temperature.ordinal()) { + errorStates.add(EnumErrorCode.TOO_COLD); + } else { + errorStates.add(EnumErrorCode.TOO_HOT); + } + } + + if (!AlleleManager.climateHelper.isWithinLimits(humidity, baseHumid, tolHumid)) { + if (baseHumid.ordinal() > humidity.ordinal()) { + errorStates.add(EnumErrorCode.TOO_ARID); + } else { + errorStates.add(EnumErrorCode.TOO_HUMID); + } + } + } + public static float getTemperature(World world, BlockPos pos){ return ForestryAPI.climateManager.getInfo(world, pos).getTemperature(); } diff --git a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java index 2ecbd584a..3a92a87b7 100644 --- a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java +++ b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java @@ -31,6 +31,7 @@ import forestry.api.core.ICamouflagedTile; import forestry.api.greenhouse.GreenhouseEvents.CheckInternalBlockFaceEvent; import forestry.api.greenhouse.GreenhouseEvents.CreateInternalBlockEvent; import forestry.api.lepidopterology.IButterfly; +import forestry.api.lepidopterology.IButterflyCocoon; import forestry.api.greenhouse.IInternalBlock; import forestry.api.greenhouse.IInternalBlockFace; import forestry.api.multiblock.IGreenhouseComponent; @@ -711,6 +712,23 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im } @Override + public boolean spawnButterfly(IButterflyCocoon cocoon) { + for(IInternalBlock block : internalBlocks){ + BlockPos pos = block.getPos(); + if(world.isAirBlock(pos)){ + if(ButterflyUtils.spawnButterfly(cocoon, world, pos)){ + return true; + } + } + } + return false; + } + + /** + * TODO: remove in 5.4 or 5.3.4 + */ + @Override + @Deprecated public boolean spawnButterfly(IButterfly butterfly) { for(IInternalBlock block : internalBlocks){ BlockPos pos = block.getPos(); diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseNursery.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseNursery.java index 0f1f5be97..0105dcf94 100644 --- a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseNursery.java +++ b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseNursery.java @@ -12,10 +12,15 @@ package forestry.greenhouse.tiles; import java.io.IOException; import java.util.Random; +import java.util.Set; import javax.annotation.Nullable; +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; import forestry.api.core.IErrorLogic; +import forestry.api.core.IErrorState; +import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyCocoon; @@ -26,6 +31,7 @@ import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.InventoryAnalyzer; import forestry.core.network.IStreamableGui; import forestry.core.network.PacketBufferForestry; +import forestry.core.utils.ClimateUtil; import forestry.core.utils.InventoryUtil; import forestry.energy.EnergyHelper; import forestry.energy.EnergyManager; @@ -38,8 +44,10 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ITickable; import net.minecraft.util.NonNullList; +import net.minecraft.world.biome.Biome; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -54,6 +62,7 @@ public class TileGreenhouseNursery extends TileGreenhouse implements IGreenhouse private int energyPerWorkCycle; @Nullable private IButterfly butterfly; + private IButterflyCocoon cocoon; private int tickCount = rand.nextInt(256); @@ -101,7 +110,7 @@ public class TileGreenhouseNursery extends TileGreenhouse implements IGreenhouse IErrorLogic errorLogic = getErrorLogic(); - if(!hasWork()){ + if(!canWork()){ return; } @@ -137,27 +146,51 @@ public class TileGreenhouseNursery extends TileGreenhouse implements IGreenhouse return tickCount % tickInterval == 0; } - protected boolean hasWork(){ + protected boolean canWork(){ IErrorLogic errorLogic = getErrorLogic(); Integer inputSlotIndex = getInputSlotIndex(); boolean hasCocoon = inputSlotIndex != null || !getStackInSlot(InventoryGreenhouseNursery.SLOT_WORK).isEmpty(); - getErrorLogic().setCondition(!hasCocoon, EnumErrorCode.NO_RESOURCE_INVENTORY); - return hasCocoon; + errorLogic.setCondition(!hasCocoon, EnumErrorCode.NO_RESOURCE_INVENTORY); + if(butterfly == null && hasCocoon){ + ItemStack stack = getStackInSlot(InventoryGreenhouseNursery.SLOT_WORK); + butterfly = ButterflyManager.butterflyRoot.getMember(stack); + if(butterfly == null){ + setInventorySlotContents(InventoryGreenhouseNursery.SLOT_WORK, ItemStack.EMPTY); + errorLogic.setCondition(true, EnumErrorCode.NO_RESOURCE_INVENTORY); + return false; + } + } + if(canSpawnButterfly()){ + Set queenErrors = butterfly.getCanSpawn(this, null); + for (IErrorState errorState : queenErrors) { + errorLogic.setCondition(true, errorState); + } + }else{ + Set queenErrors = butterfly.getCanGrow(this, null); + for (IErrorState errorState : queenErrors) { + errorLogic.setCondition(true, errorState); + } + } + return !errorLogic.hasErrors(); } protected boolean workCycle(){ moveCocoonToWorkSlot(); - ItemStack stack = getStackInSlot(InventoryGreenhouseNursery.SLOT_WORK); - if(butterfly == null){ - butterfly = ButterflyManager.butterflyRoot.getMember(stack); - if(butterfly == null){ - setInventorySlotContents(InventoryGreenhouseNursery.SLOT_WORK, ItemStack.EMPTY); - } - } if(butterfly != null){ - int age = getAge(); - if(age >= 0 && age < 2){ + if(canSpawnButterfly()){ + IGreenhouseControllerInternal controller = getMultiblockLogic().getController(); + if(controller.spawnButterfly(this)){ + setInventorySlotContents(InventoryGreenhouseNursery.SLOT_WORK, ItemStack.EMPTY); + setTicksPerWorkCycle(1); + setEnergyPerWorkCycle(0); + butterfly = null; + cocoon = null; + } + return false; + } else { + ItemStack stack = getStackInSlot(InventoryGreenhouseNursery.SLOT_WORK); + int age = getAge(); IButterflyGenome genome = butterfly.getGenome(); float matureTime = genome.getLifespan() / (genome.getFertility() * 2); matureTime*=MATURE_TIME_MULTIPLIER; @@ -168,21 +201,15 @@ public class TileGreenhouseNursery extends TileGreenhouse implements IGreenhouse } setTicksPerWorkCycle(caterpillarMatureTime); setEnergyPerWorkCycle(ENERGY_PER_WORK_CYCLE); - }else{ - IGreenhouseControllerInternal controller = getMultiblockLogic().getController(); - if(controller.spawnButterfly(butterfly)){ - setInventorySlotContents(InventoryGreenhouseNursery.SLOT_WORK, ItemStack.EMPTY); - setTicksPerWorkCycle(1); - setEnergyPerWorkCycle(0); - butterfly = null; - } - return false; } } return true; } - + private boolean canSpawnButterfly(){ + int age = getAge(); + return age > 2 && butterfly != null; + } private void moveCocoonToWorkSlot() { if (!getStackInSlot(InventoryAnalyzer.SLOT_ANALYZE).isEmpty()) { @@ -250,6 +277,23 @@ public class TileGreenhouseNursery extends TileGreenhouse implements IGreenhouse workCounter = data.readVarInt(); ticksPerWorkCycle = data.readVarInt(); } + + @Override + public NBTTagCompound writeToNBT(NBTTagCompound data) { + super.writeToNBT(data); + data.setInteger("workCounter", workCounter); + data.setInteger("ticksPerWorkCycle", ticksPerWorkCycle); + data.setInteger("energyPerWorkCycle", energyPerWorkCycle); + return data; + } + + @Override + public void readFromNBT(NBTTagCompound data) { + super.readFromNBT(data); + workCounter = data.getInteger("workCounter"); + ticksPerWorkCycle = data.getInteger("ticksPerWorkCycle"); + energyPerWorkCycle = data.getInteger("energyPerWorkCycle"); + } @Override public void addCocoonLoot(IButterflyCocoon cocoon, NonNullList cocoonDrops) { @@ -280,5 +324,39 @@ public class TileGreenhouseNursery extends TileGreenhouse implements IGreenhouse public IInventoryAdapter getInternalInventory() { return inventory; } + + @Override + public IButterfly getCaterpillar() { + return butterfly; + } + + @Override + public IIndividual getNanny() { + return null; + } + + @Override + public void setCaterpillar(IButterfly caterpillar) { + } + + @Override + public boolean canNurse(IButterfly caterpillar) { + return false; + } + + @Override + public Biome getBiome() { + return world.getBiome(pos); + } + + @Override + public EnumTemperature getTemperature() { + return EnumTemperature.getFromBiome(getBiome(), world, pos); + } + + @Override + public EnumHumidity getHumidity() { + return EnumHumidity.getFromValue(ClimateUtil.getHumidity(world, pos)); + } } diff --git a/src/main/java/forestry/lepidopterology/ButterflyUtils.java b/src/main/java/forestry/lepidopterology/ButterflyUtils.java index fa3f1c056..3b8af23a4 100644 --- a/src/main/java/forestry/lepidopterology/ButterflyUtils.java +++ b/src/main/java/forestry/lepidopterology/ButterflyUtils.java @@ -2,6 +2,7 @@ package forestry.lepidopterology; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IButterfly; +import forestry.api.lepidopterology.IButterflyCocoon; import forestry.core.utils.Log; import forestry.lepidopterology.entities.EntityButterfly; import net.minecraft.entity.EntityLiving; @@ -30,6 +31,18 @@ public class ButterflyUtils { } return false; } + + public static boolean spawnButterfly(IButterflyCocoon cocoon, World world, BlockPos pos){ + IButterfly butterfly = cocoon.getCaterpillar(); + if (world.countEntities(EntityButterfly.class) > PluginLepidopterology.spawnConstraint) { + return false; + } + + if (world.isAirBlock(pos)) { + return attemptButterflySpawn(world, butterfly, pos); + } + return false; + } } diff --git a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java index 9bfc64b25..91b840f7e 100755 --- a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java +++ b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java @@ -11,6 +11,8 @@ package forestry.lepidopterology.genetics; import javax.annotation.Nullable; + +import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Map; @@ -19,7 +21,9 @@ import java.util.Set; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; +import forestry.api.core.IErrorState; import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleTolerance; import forestry.api.genetics.IChromosome; @@ -35,6 +39,7 @@ import forestry.api.lepidopterology.IButterflyGenome; import forestry.api.lepidopterology.IButterflyMutation; import forestry.api.lepidopterology.IButterflyNursery; import forestry.api.lepidopterology.IEntityButterfly; +import forestry.core.errors.EnumErrorCode; import forestry.core.genetics.Chromosome; import forestry.core.genetics.GenericRatings; import forestry.core.genetics.IndividualLiving; @@ -123,6 +128,53 @@ public class Butterfly extends IndividualLiving implements IButterfly { public IButterflyGenome getMate() { return mate; } + + @Override + public Set getCanSpawn(IButterflyNursery nursery, @Nullable IButterflyCocoon cocoon) { + World world = nursery.getWorldObj(); + + Set errorStates = new HashSet<>(); + // / Night or darkness requires nocturnal species + boolean isDaytime = world.isDaytime(); + if(!isActiveThisTime(isDaytime)){ + if(isDaytime){ + errorStates.add(EnumErrorCode.NOT_NIGHT); + }else{ + errorStates.add(EnumErrorCode.NOT_DAY); + } + } + + // / And finally climate check + IAlleleButterflySpecies species = genome.getPrimary(); + EnumTemperature actualTemperature = nursery.getTemperature(); + EnumTemperature baseTemperature = species.getTemperature(); + EnumTolerance toleranceTemperature = genome.getToleranceTemp(); + EnumHumidity actualHumidity = nursery.getHumidity(); + EnumHumidity baseHumidity = species.getHumidity(); + EnumTolerance toleranceHumidity = genome.getToleranceHumid(); + ClimateUtil.addClimateErrorStates(actualTemperature, actualHumidity, baseTemperature, toleranceTemperature, baseHumidity, toleranceHumidity, errorStates); + + return errorStates; + } + + @Override + public Set getCanGrow(IButterflyNursery nursery, @Nullable IButterflyCocoon cocoon) { + World world = nursery.getWorldObj(); + + Set errorStates = new HashSet<>(); + + // / And finally climate check + IAlleleButterflySpecies species = genome.getPrimary(); + EnumTemperature actualTemperature = nursery.getTemperature(); + EnumTemperature baseTemperature = species.getTemperature(); + EnumTolerance toleranceTemperature = genome.getToleranceTemp(); + EnumHumidity actualHumidity = nursery.getHumidity(); + EnumHumidity baseHumidity = species.getHumidity(); + EnumTolerance toleranceHumidity = genome.getToleranceHumid(); + ClimateUtil.addClimateErrorStates(actualTemperature, actualHumidity, baseTemperature, toleranceTemperature, baseHumidity, toleranceHumidity, errorStates); + + return errorStates; + } @Override public boolean canSpawn(World world, double x, double y, double z) { diff --git a/src/main/java/forestry/lepidopterology/tiles/TileCocoon.java b/src/main/java/forestry/lepidopterology/tiles/TileCocoon.java index 39503d36b..5dc974cf1 100644 --- a/src/main/java/forestry/lepidopterology/tiles/TileCocoon.java +++ b/src/main/java/forestry/lepidopterology/tiles/TileCocoon.java @@ -17,6 +17,7 @@ import java.util.HashSet; import java.util.Set; import com.google.common.base.Preconditions; + import forestry.api.genetics.IAllele; import forestry.api.greenhouse.GreenhouseManager; import forestry.api.lepidopterology.ButterflyManager; diff --git a/src/main/java/forestry/plugins/compat/PluginImmersiveEngineering.java b/src/main/java/forestry/plugins/compat/PluginImmersiveEngineering.java index 7b3ce4de8..639c085cd 100644 --- a/src/main/java/forestry/plugins/compat/PluginImmersiveEngineering.java +++ b/src/main/java/forestry/plugins/compat/PluginImmersiveEngineering.java @@ -4,7 +4,6 @@ import javax.annotation.Nullable; import com.google.common.base.Optional; import forestry.api.core.ForestryAPI; -import forestry.api.farming.Farmables; import forestry.api.farming.ICrop; import forestry.api.recipes.RecipeManagers; import forestry.core.config.Constants; diff --git a/src/main/resources/assets/forestry/blockstates/bee_combs.json b/src/main/resources/assets/forestry/blockstates/bee_combs.json new file mode 100644 index 000000000..da835d976 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/bee_combs.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "forestry:bee_combs" } + } +} diff --git a/src/main/resources/assets/forestry/models/block/bee_combs.json b/src/main/resources/assets/forestry/models/block/bee_combs.json new file mode 100644 index 000000000..b3e8555f4 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/bee_combs.json @@ -0,0 +1,32 @@ +{ + "parent": "block/block", + "textures": { + "particle": "forestry:blocks/bee_combs.0", + "texture": "forestry:blocks/bee_combs.0", + "overlay": "forestry:blocks/bee_combs.1" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "texture": "#texture", "cullface": "down", "tintindex": 0 }, + "up": { "texture": "#texture", "cullface": "up", "tintindex": 0 }, + "north": { "texture": "#texture", "cullface": "north", "tintindex": 0 }, + "south": { "texture": "#texture", "cullface": "south", "tintindex": 0 }, + "west": { "texture": "#texture", "cullface": "west", "tintindex": 0 }, + "east": { "texture": "#texture", "cullface": "east", "tintindex": 0 } + } + }, + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "texture": "#overlay", "cullface": "down", "tintindex": 1 }, + "up": { "texture": "#overlay", "cullface": "up", "tintindex": 1 }, + "north": { "texture": "#overlay", "cullface": "north", "tintindex": 1 }, + "south": { "texture": "#overlay", "cullface": "south", "tintindex": 1 }, + "west": { "texture": "#overlay", "cullface": "west", "tintindex": 1 }, + "east": { "texture": "#overlay", "cullface": "east", "tintindex": 1 } + } + } + ] +} diff --git a/src/main/resources/assets/forestry/models/block/beeswax.json b/src/main/resources/assets/forestry/models/block/beeswax.json new file mode 100644 index 000000000..640c3df00 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/beeswax.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/beeswax" + } +} diff --git a/src/main/resources/assets/forestry/models/item/block_bee_combs.json b/src/main/resources/assets/forestry/models/item/block_bee_combs.json new file mode 100644 index 000000000..ca401218f --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/block_bee_combs.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/bee_combs", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/product/beeswax.json b/src/main/resources/assets/forestry/models/item/product/beeswax.json new file mode 100644 index 000000000..de6f33da6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/product/beeswax.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/beeswax", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/textures/blocks/bee_combs.0.png b/src/main/resources/assets/forestry/textures/blocks/bee_combs.0.png new file mode 100644 index 000000000..972e1c6e3 Binary files /dev/null and b/src/main/resources/assets/forestry/textures/blocks/bee_combs.0.png differ diff --git a/src/main/resources/assets/forestry/textures/blocks/bee_combs.1.png b/src/main/resources/assets/forestry/textures/blocks/bee_combs.1.png new file mode 100644 index 000000000..463be91fc Binary files /dev/null and b/src/main/resources/assets/forestry/textures/blocks/bee_combs.1.png differ diff --git a/src/main/resources/assets/forestry/textures/blocks/beeswax.png b/src/main/resources/assets/forestry/textures/blocks/beeswax.png new file mode 100644 index 000000000..6dcfd24b9 Binary files /dev/null and b/src/main/resources/assets/forestry/textures/blocks/beeswax.png differ diff --git a/src/main/resources/assets/forestry/textures/items/bee_comb.png b/src/main/resources/assets/forestry/textures/items/bee_comb.png new file mode 100644 index 000000000..cca769f20 Binary files /dev/null and b/src/main/resources/assets/forestry/textures/items/bee_comb.png differ