From c7b94cc8af8a32788047b0d33218e091e086a588 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 24 Apr 2016 23:21:01 -0700 Subject: [PATCH] Make hive bees aggressive, add Bee Smoker item to calm them --- lang | 2 +- .../forestry/api/apiculture/IHiveTile.java | 23 ++ .../api/apiculture/hives/IHiveRegistry.java | 46 ++- .../apiculture/ArmorApiaristHelper.java | 5 + .../forestry/apiculture/PluginApiculture.java | 52 ++- .../apiculture/blocks/BlockBeeHives.java | 69 ++-- .../apiculture/entities/EntityFXBee.java | 5 - .../forestry/apiculture/flowers/Flower.java | 6 - .../apiculture/flowers/FlowerRegistry.java | 26 +- .../forestry/apiculture/genetics/Bee.java | 2 +- .../genetics/alleles/AlleleEffect.java | 2 +- .../items/ItemRegistryApiculture.java | 3 + .../forestry/apiculture/items/ItemSmoker.java | 90 +++++ .../multiblock/FakeAlvearyController.java | 34 +- .../multiblock/TileAlvearySwarmer.java | 2 +- .../tiles/FakeBeeHousingInventory.java | 38 ++ .../tiles/HiveBeeHousingInventory.java | 58 ++++ .../forestry/apiculture/tiles/TileHive.java | 325 ++++++++++++++++++ .../forestry/apiculture/tiles/TileSwarm.java | 68 ---- .../apiculture/worldgen/HiveDescription.java | 100 +++++- .../worldgen/HiveDescriptionSwarmer.java | 15 +- .../java/forestry/core/config/Config.java | 2 +- .../forestry/core/entities/EntityFXSmoke.java | 92 +++++ .../java/forestry/core/errors/ErrorLogic.java | 2 +- .../java/forestry/core/items/ItemScoop.java | 2 +- .../java/forestry/core/proxy/ProxyRender.java | 9 +- .../core/proxy/ProxyRenderClient.java | 16 +- .../assets/forestry/blockstates/beehives.json | 3 +- .../models/block/beehives/desert.json | 14 +- .../forestry/models/block/beehives/end.json | 14 +- .../models/block/beehives/forest.json | 14 +- .../models/block/beehives/jungle.json | 14 +- .../models/block/beehives/meadows.json | 14 +- .../forestry/models/block/beehives/snow.json | 14 +- .../forestry/models/block/beehives/swamp.json | 14 +- .../forestry/models/block/beehives/swarm.json | 12 + .../forestry/models/item/beehives/swarm.json | 10 + .../assets/forestry/models/item/smoker.json | 18 + .../{beehive.3.side.png => desert.side.png} | Bin .../{beehive.3.top.png => desert.top.png} | Bin .../{beehive.5.side.png => end.side.png} | Bin .../{beehive.5.top.png => end.top.png} | Bin .../{beehive.1.side.png => forest.side.png} | Bin .../{beehive.1.top.png => forest.top.png} | Bin .../{beehive.4.side.png => jungle.side.png} | Bin .../{beehive.4.top.png => jungle.top.png} | Bin .../{beehive.2.side.png => meadows.side.png} | Bin .../{beehive.2.top.png => meadows.top.png} | Bin .../{beehive.6.side.png => snow.side.png} | Bin .../{beehive.6.top.png => snow.top.png} | Bin .../{beehive.7.side.png => swamp.side.png} | Bin .../{beehive.7.top.png => swamp.top.png} | Bin .../{beehive.8.side.png => swarm.side.png} | Bin .../{beehive.8.top.png => swarm.top.png} | Bin .../assets/forestry/textures/items/smoker.png | Bin 0 -> 306 bytes 55 files changed, 958 insertions(+), 277 deletions(-) create mode 100644 src/main/java/forestry/api/apiculture/IHiveTile.java create mode 100644 src/main/java/forestry/apiculture/items/ItemSmoker.java create mode 100644 src/main/java/forestry/apiculture/tiles/FakeBeeHousingInventory.java create mode 100644 src/main/java/forestry/apiculture/tiles/HiveBeeHousingInventory.java create mode 100644 src/main/java/forestry/apiculture/tiles/TileHive.java delete mode 100644 src/main/java/forestry/apiculture/tiles/TileSwarm.java create mode 100644 src/main/java/forestry/core/entities/EntityFXSmoke.java create mode 100644 src/main/resources/assets/forestry/models/block/beehives/swarm.json create mode 100644 src/main/resources/assets/forestry/models/item/beehives/swarm.json create mode 100644 src/main/resources/assets/forestry/models/item/smoker.json rename src/main/resources/assets/forestry/textures/blocks/beehives/{beehive.3.side.png => desert.side.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/beehives/{beehive.3.top.png => desert.top.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/beehives/{beehive.5.side.png => end.side.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/beehives/{beehive.5.top.png => end.top.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/beehives/{beehive.1.side.png => forest.side.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/beehives/{beehive.1.top.png => forest.top.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/beehives/{beehive.4.side.png => jungle.side.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/beehives/{beehive.4.top.png => jungle.top.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/beehives/{beehive.2.side.png => meadows.side.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/beehives/{beehive.2.top.png => meadows.top.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/beehives/{beehive.6.side.png => snow.side.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/beehives/{beehive.6.top.png => snow.top.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/beehives/{beehive.7.side.png => swamp.side.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/beehives/{beehive.7.top.png => swamp.top.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/beehives/{beehive.8.side.png => swarm.side.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/beehives/{beehive.8.top.png => swarm.top.png} (100%) mode change 100755 => 100644 create mode 100644 src/main/resources/assets/forestry/textures/items/smoker.png diff --git a/lang b/lang index 34388381f..612a503d3 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 34388381ffbb17947a501ffbded516da9f0e9a48 +Subproject commit 612a503d3c1a135175408cf57f0915cd16591227 diff --git a/src/main/java/forestry/api/apiculture/IHiveTile.java b/src/main/java/forestry/api/apiculture/IHiveTile.java new file mode 100644 index 000000000..56c28848b --- /dev/null +++ b/src/main/java/forestry/api/apiculture/IHiveTile.java @@ -0,0 +1,23 @@ +package forestry.api.apiculture; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; + +public interface IHiveTile { + /** + * Call to calm agitated bees. Used by the smoker to stop wild bees from attacking as much. + * Bees will not stay calm for very long. + */ + void calmBees(); + + /** + * Called when the hive is attacked. + */ + void onAttack(World world, BlockPos pos, EntityPlayer player); + + /** + * Called when the hive is broken. + */ + void onBroken(World world, BlockPos pos, EntityPlayer player, boolean canHarvest); +} diff --git a/src/main/java/forestry/api/apiculture/hives/IHiveRegistry.java b/src/main/java/forestry/api/apiculture/hives/IHiveRegistry.java index 999d6f379..ac89674f1 100644 --- a/src/main/java/forestry/api/apiculture/hives/IHiveRegistry.java +++ b/src/main/java/forestry/api/apiculture/hives/IHiveRegistry.java @@ -5,6 +5,7 @@ ******************************************************************************/ package forestry.api.apiculture.hives; +import javax.annotation.Nonnull; import java.util.List; import net.minecraft.util.IStringSerializable; @@ -15,30 +16,45 @@ public interface IHiveRegistry { /* Forestry Hive Names */ enum HiveType implements IStringSerializable { - FOREST("Forestry:forest"), - MEADOWS("Forestry:meadows"), - DESERT("Forestry:desert"), - JUNGLE("Forestry:jungle"), - END("Forestry:end"), - SNOW("Forestry:snow"), - SWAMP("Forestry:swamp"); + FOREST("Forestry:forest", "Forestry.speciesForest"), + MEADOWS("Forestry:meadows", "Forestry.speciesMeadows"), + DESERT("Forestry:desert", "Forestry.speciesModest"), + JUNGLE("Forestry:jungle", "Forestry.speciesTropical"), + END("Forestry:end", "Forestry.speciesEnded"), + SNOW("Forestry:snow", "Forestry.speciesWintry"), + SWAMP("Forestry:swamp", "Forestry.speciesMarshy"), + SWARM("Forestry:swarm", "Forestry.speciesForest"); public static final HiveType[] VALUES = values(); - - HiveType(String name) { - this.name = name; + + @Nonnull + private final String hiveUid; + @Nonnull + private final String speciesUid; + + HiveType(@Nonnull String hiveUid, @Nonnull String speciesUid) { + this.hiveUid = hiveUid; + this.speciesUid = speciesUid; } - private final String name; - - public String getHiveName() { - return name; + @Nonnull + public String getHiveUid() { + return hiveUid; } - + + @Nonnull + public String getSpeciesUid() { + return speciesUid; + } + @Override public String getName() { return name().toLowerCase(); } + + public int getMeta() { + return ordinal(); + } } diff --git a/src/main/java/forestry/apiculture/ArmorApiaristHelper.java b/src/main/java/forestry/apiculture/ArmorApiaristHelper.java index 0f92ec4de..db735de98 100644 --- a/src/main/java/forestry/apiculture/ArmorApiaristHelper.java +++ b/src/main/java/forestry/apiculture/ArmorApiaristHelper.java @@ -45,6 +45,11 @@ public class ArmorApiaristHelper implements IArmorApiaristHelper { } } + ItemStack heldItem = entity.getHeldItem(); + if (isArmorApiarist(heldItem, entity, cause, doProtect)) { + count++; + } + return count; } } diff --git a/src/main/java/forestry/apiculture/PluginApiculture.java b/src/main/java/forestry/apiculture/PluginApiculture.java index 15e753069..0e0d5fd74 100644 --- a/src/main/java/forestry/apiculture/PluginApiculture.java +++ b/src/main/java/forestry/apiculture/PluginApiculture.java @@ -27,12 +27,15 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.BlockPos; import net.minecraft.util.ResourceLocation; import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.IChunkProvider; import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.ChestGenHooks; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Property; @@ -57,6 +60,7 @@ import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IClassification; import forestry.api.genetics.IClassification.EnumClassLevel; +import forestry.api.genetics.IFlowerAcceptableRule; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.ICrateRegistry; import forestry.api.storage.StorageManager; @@ -94,7 +98,7 @@ import forestry.apiculture.multiblock.TileAlvearySwarmer; import forestry.apiculture.network.PacketRegistryApiculture; import forestry.apiculture.proxy.ProxyApiculture; import forestry.apiculture.tiles.TileCandle; -import forestry.apiculture.tiles.TileSwarm; +import forestry.apiculture.tiles.TileHive; import forestry.apiculture.trigger.ApicultureTriggers; import forestry.apiculture.worldgen.HiveDecorator; import forestry.apiculture.worldgen.HiveDescription; @@ -275,7 +279,7 @@ public class PluginApiculture extends BlankForestryPlugin { BeeManager.inducers.put(items.royalJelly.getItemStack(), 10); GameRegistry.registerTileEntity(TileAlvearyPlain.class, "forestry.Alveary"); - GameRegistry.registerTileEntity(TileSwarm.class, "forestry.Swarm"); + GameRegistry.registerTileEntity(TileHive.class, "forestry.Swarm"); GameRegistry.registerTileEntity(TileAlvearySwarmer.class, "forestry.AlvearySwarmer"); GameRegistry.registerTileEntity(TileAlvearyHeater.class, "forestry.AlvearyHeater"); GameRegistry.registerTileEntity(TileAlvearyFan.class, "forestry.AlvearyFan"); @@ -323,6 +327,8 @@ public class PluginApiculture extends BlankForestryPlugin { FlowerRegistry flowerRegistry = (FlowerRegistry) FlowerManager.flowerRegistry; + flowerRegistry.registerAcceptableFlowerRule(new EndFlowerAcceptableRule(), FlowerManager.FlowerTypeEnd); + // Register acceptable plants flowerRegistry.registerAcceptableFlower(Blocks.dragon_egg, FlowerManager.FlowerTypeEnd); flowerRegistry.registerAcceptableFlower(Blocks.vine, FlowerManager.FlowerTypeJungle); @@ -443,6 +449,11 @@ public class PluginApiculture extends BlankForestryPlugin { "#X#", "###", " # ", '#', "stickWood", 'X', Blocks.wool); + RecipeUtil.addRecipe(items.smoker, + "LS#", + "LF#", + "###", + '#', "ingotTin", 'S', "stickWood", 'F', Items.flint_and_steel, 'L', "leather"); RecipeUtil.addRecipe(new ItemStack(Items.slime_ball), "#X#", "#X#", "#X#", '#', items.propolis, @@ -755,42 +766,42 @@ public class PluginApiculture extends BlankForestryPlugin { private static void registerBeehiveDrops() { ItemStack honeyComb = items.beeComb.get(EnumHoneyComb.HONEY, 1); - hiveRegistry.addDrops(HiveType.FOREST.getHiveName(), + hiveRegistry.addDrops(HiveType.FOREST.getHiveUid(), new HiveDrop(0.80, BeeDefinition.FOREST, honeyComb).setIgnobleShare(0.7), new HiveDrop(0.08, BeeDefinition.FOREST.getRainResist(), honeyComb), new HiveDrop(0.03, BeeDefinition.VALIANT, honeyComb) ); - hiveRegistry.addDrops(HiveType.MEADOWS.getHiveName(), + hiveRegistry.addDrops(HiveType.MEADOWS.getHiveUid(), new HiveDrop(0.80, BeeDefinition.MEADOWS, honeyComb).setIgnobleShare(0.7), new HiveDrop(0.03, BeeDefinition.VALIANT, honeyComb) ); ItemStack parchedComb = items.beeComb.get(EnumHoneyComb.PARCHED, 1); - hiveRegistry.addDrops(HiveType.DESERT.getHiveName(), + hiveRegistry.addDrops(HiveType.DESERT.getHiveUid(), new HiveDrop(0.80, BeeDefinition.MODEST, parchedComb).setIgnobleShare(0.7), new HiveDrop(0.03, BeeDefinition.VALIANT, parchedComb) ); ItemStack silkyComb = items.beeComb.get(EnumHoneyComb.SILKY, 1); - hiveRegistry.addDrops(HiveType.JUNGLE.getHiveName(), + hiveRegistry.addDrops(HiveType.JUNGLE.getHiveUid(), new HiveDrop(0.80, BeeDefinition.TROPICAL, silkyComb).setIgnobleShare(0.7), new HiveDrop(0.03, BeeDefinition.VALIANT, silkyComb) ); ItemStack mysteriousComb = items.beeComb.get(EnumHoneyComb.MYSTERIOUS, 1); - hiveRegistry.addDrops(HiveType.END.getHiveName(), + hiveRegistry.addDrops(HiveType.END.getHiveUid(), new HiveDrop(0.90, BeeDefinition.ENDED, mysteriousComb) ); ItemStack frozenComb = items.beeComb.get(EnumHoneyComb.FROZEN, 1); - hiveRegistry.addDrops(HiveType.SNOW.getHiveName(), + hiveRegistry.addDrops(HiveType.SNOW.getHiveUid(), new HiveDrop(0.80, BeeDefinition.WINTRY, frozenComb).setIgnobleShare(0.5), new HiveDrop(0.03, BeeDefinition.VALIANT, frozenComb) ); ItemStack mossyComb = items.beeComb.get(EnumHoneyComb.MOSSY, 1); - hiveRegistry.addDrops(HiveType.SWAMP.getHiveName(), + hiveRegistry.addDrops(HiveType.SWAMP.getHiveUid(), new HiveDrop(0.80, BeeDefinition.MARSHY, mossyComb).setIgnobleShare(0.4), new HiveDrop(0.03, BeeDefinition.VALIANT, mossyComb) ); @@ -813,6 +824,7 @@ public class PluginApiculture extends BlankForestryPlugin { ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(stack, 7, 12, 12)); ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(items.scoop.getItemStack(), 1, 1, 8)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(items.smoker.getItemStack(), 1, 1, 8)); ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(items.propolis.get(EnumPropolis.NORMAL, 1), 2, 4, 6)); ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(items.beeComb.get(EnumHoneyComb.HONEY, 1), 4, 12, 7)); ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(items.beeComb.get(EnumHoneyComb.FROZEN, 1), 2, 10, 7)); @@ -824,13 +836,13 @@ public class PluginApiculture extends BlankForestryPlugin { } private static void createHives() { - hiveRegistry.registerHive(HiveType.FOREST.getHiveName(), HiveDescription.FOREST); - hiveRegistry.registerHive(HiveType.MEADOWS.getHiveName(), HiveDescription.MEADOWS); - hiveRegistry.registerHive(HiveType.DESERT.getHiveName(), HiveDescription.DESERT); - hiveRegistry.registerHive(HiveType.JUNGLE.getHiveName(), HiveDescription.JUNGLE); - hiveRegistry.registerHive(HiveType.END.getHiveName(), HiveDescription.END); - hiveRegistry.registerHive(HiveType.SNOW.getHiveName(), HiveDescription.SNOW); - hiveRegistry.registerHive(HiveType.SWAMP.getHiveName(), HiveDescription.SWAMP); + hiveRegistry.registerHive(HiveType.FOREST.getHiveUid(), HiveDescription.FOREST); + hiveRegistry.registerHive(HiveType.MEADOWS.getHiveUid(), HiveDescription.MEADOWS); + hiveRegistry.registerHive(HiveType.DESERT.getHiveUid(), HiveDescription.DESERT); + hiveRegistry.registerHive(HiveType.JUNGLE.getHiveUid(), HiveDescription.JUNGLE); + hiveRegistry.registerHive(HiveType.END.getHiveUid(), HiveDescription.END); + hiveRegistry.registerHive(HiveType.SNOW.getHiveUid(), HiveDescription.SNOW); + hiveRegistry.registerHive(HiveType.SWAMP.getHiveUid(), HiveDescription.SWAMP); } private static void createAlleles() { @@ -940,4 +952,12 @@ public class PluginApiculture extends BlankForestryPlugin { } ItemHabitatLocator.registerSprite(); } + + private static class EndFlowerAcceptableRule implements IFlowerAcceptableRule { + @Override + public boolean isAcceptableFlower(String flowerType, World world, BlockPos pos) { + BiomeGenBase biomeGenForCoords = world.getBiomeGenForCoords(pos); + return BiomeDictionary.isBiomeOfType(biomeGenForCoords, BiomeDictionary.Type.END); + } + } } diff --git a/src/main/java/forestry/apiculture/blocks/BlockBeeHives.java b/src/main/java/forestry/apiculture/blocks/BlockBeeHives.java index f6f6d0f44..b00d68f3d 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockBeeHives.java +++ b/src/main/java/forestry/apiculture/blocks/BlockBeeHives.java @@ -33,25 +33,23 @@ import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IHiveDrop; +import forestry.api.apiculture.IHiveTile; import forestry.api.apiculture.hives.IHiveRegistry.HiveType; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.Tabs; import forestry.apiculture.MaterialBeehive; import forestry.apiculture.PluginApiculture; -import forestry.apiculture.tiles.TileSwarm; +import forestry.apiculture.tiles.TileHive; import forestry.core.blocks.IBlockWithMeta; -import forestry.core.config.Config; -import forestry.core.utils.InventoryUtil; -import forestry.core.utils.ItemStackUtil; public class BlockBeeHives extends BlockContainer implements IItemModelRegister, IBlockWithMeta { private static final PropertyEnum HIVE_TYPES = PropertyEnum.create("hive", HiveType.class); public BlockBeeHives() { super(new MaterialBeehive(true)); - setLightLevel(0.8f); - setHardness(1.0f); + setLightLevel(0.4f); + setHardness(2.5f); setCreativeTab(Tabs.tabApiculture); setHarvestLevel("scoop", 0); setDefaultState(this.blockState.getBaseState().withProperty(HIVE_TYPES, HiveType.FOREST)); @@ -64,7 +62,7 @@ public class BlockBeeHives extends BlockContainer implements IItemModelRegister, @Override public int getMetaFromState(IBlockState state) { - return state.getValue(HIVE_TYPES).ordinal(); + return state.getValue(HIVE_TYPES).getMeta(); } @Override @@ -74,7 +72,7 @@ public class BlockBeeHives extends BlockContainer implements IItemModelRegister, @Override public TileEntity createNewTileEntity(World world, int meta) { - return new TileSwarm(); + return new TileHive(); } @Override @@ -83,24 +81,23 @@ public class BlockBeeHives extends BlockContainer implements IItemModelRegister, } @Override - public boolean removedByPlayer(World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { - if (canHarvestBlock(world, pos, player)) { - // Handle TE'd beehives - TileEntity tile = world.getTileEntity(pos); - - if (tile instanceof TileSwarm) { - TileSwarm swarm = (TileSwarm) tile; - if (swarm.containsBees()) { - for (ItemStack beeStack : InventoryUtil.getStacks(swarm.contained)) { - if (beeStack != null) { - ItemStackUtil.dropItemStackAsEntity(beeStack, world, pos); - } - } - } - } + public void onBlockClicked(World world, BlockPos pos, EntityPlayer player) { + super.onBlockClicked(world, pos, player); + TileEntity tile = world.getTileEntity(pos); + if (tile instanceof IHiveTile) { + IHiveTile hive = (IHiveTile) tile; + hive.onAttack(world, pos, player); } + } - return world.setBlockToAir(pos); + @Override + public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) { + boolean canHarvest = canHarvestBlock(world, pos, player); + TileEntity tile = world.getTileEntity(pos); + if (tile instanceof IHiveTile) { + IHiveTile hive = (IHiveTile) tile; + hive.onBroken(world, pos, player, canHarvest); + } } @Override @@ -169,28 +166,28 @@ public class BlockBeeHives extends BlockContainer implements IItemModelRegister, } private static String getHiveNameForMeta(int meta) { - return HiveType.VALUES[meta].getHiveName(); + return HiveType.VALUES[meta].getHiveUid(); + } + + public static HiveType getHiveType(IBlockState state) { + return state.getValue(HIVE_TYPES); } @Override public void getSubBlocks(Item item, CreativeTabs par2CreativeTabs, List itemList) { - itemList.add(new ItemStack(this, 1, 0)); - itemList.add(new ItemStack(this, 1, 1)); - itemList.add(new ItemStack(this, 1, 2)); - itemList.add(new ItemStack(this, 1, 3)); - if (Config.isDebug) { - itemList.add(new ItemStack(this, 1, 4)); + for (IBlockState blockState : getBlockState().getValidStates()) { + if (getHiveType(blockState) != HiveType.SWARM) { + int meta = getMetaFromState(blockState); + itemList.add(new ItemStack(this, 1, meta)); + } } - itemList.add(new ItemStack(this, 1, 5)); - itemList.add(new ItemStack(this, 1, 6)); - // Swarm hive not added } /* ITEM MODELS */ @Override public void registerModel(Item item, IModelManager manager) { - for(int i = 0;i < HiveType.VALUES.length;i++){ - manager.registerItemModel(item, i, "beehives/" + HiveType.VALUES[i].getName()); + for (HiveType hiveType : HiveType.VALUES) { + manager.registerItemModel(item, hiveType.getMeta(), "beehives/" + hiveType.getName()); } } diff --git a/src/main/java/forestry/apiculture/entities/EntityFXBee.java b/src/main/java/forestry/apiculture/entities/EntityFXBee.java index a334cd764..f445b4585 100644 --- a/src/main/java/forestry/apiculture/entities/EntityFXBee.java +++ b/src/main/java/forestry/apiculture/entities/EntityFXBee.java @@ -96,11 +96,6 @@ public class EntityFXBee extends EntityFX { wR.pos(f11 + f1 * f10 - f4 * f10, f12 - f2 * f10, f13 + f3 * f10 - f5 * f10).tex(minU, maxV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); } - @Override - public int getBrightnessForRender(float partialTicks) { - return 0x0000f0; - } - @Override public int getFXLayer() { return 1; diff --git a/src/main/java/forestry/apiculture/flowers/Flower.java b/src/main/java/forestry/apiculture/flowers/Flower.java index d99b27f75..a6e3aa9d2 100644 --- a/src/main/java/forestry/apiculture/flowers/Flower.java +++ b/src/main/java/forestry/apiculture/flowers/Flower.java @@ -12,8 +12,6 @@ package forestry.apiculture.flowers; import com.google.common.base.Objects; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraftforge.oredict.OreDictionary; @@ -45,10 +43,6 @@ public final class Flower { return Block.isEqualTo(this.block, flower.getBlock()) && (this.meta == OreDictionary.WILDCARD_VALUE || flower.getMeta() == OreDictionary.WILDCARD_VALUE || this.meta == flower.getMeta()); } - public int compareTo(@Nonnull Flower other) { - return this.weight.compareTo(other.getWeight()); - } - @Override public int hashCode() { return Objects.hashCode(block); diff --git a/src/main/java/forestry/apiculture/flowers/FlowerRegistry.java b/src/main/java/forestry/apiculture/flowers/FlowerRegistry.java index 6751bd376..9417f4188 100644 --- a/src/main/java/forestry/apiculture/flowers/FlowerRegistry.java +++ b/src/main/java/forestry/apiculture/flowers/FlowerRegistry.java @@ -47,7 +47,6 @@ import forestry.api.genetics.IFlowerRegistry; import forestry.api.genetics.IIndividual; import forestry.core.config.Constants; import forestry.core.utils.BlockUtil; -import forestry.core.utils.Log; import forestry.core.utils.vect.MutableVect; import forestry.core.utils.vect.Vect; @@ -95,11 +94,7 @@ public final class FlowerRegistry implements IFlowerRegistry, IFlowerGrowthHelpe @Override public void registerAcceptableFlowerRule(IFlowerAcceptableRule acceptableFlower, String... flowerTypes) { for (String flowerType : flowerTypes) { - if (defaultFlowerTypes.contains(flowerType)) { - Log.error("IFlowerAcceptableRules are too slow to be applied to Forestry's built-in flower type: " + flowerType + "."); - } else { - registeredRules.put(flowerType, acceptableFlower); - } + registeredRules.put(flowerType, acceptableFlower); } } @@ -216,25 +211,6 @@ public final class FlowerRegistry implements IFlowerRegistry, IFlowerGrowthHelpe meta = block.getMetaFromState(world.getBlockState(pos)); } - /*if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.AGRICRAFT)) { - Block cropBlock = GameRegistry.findBlock("AgriCraft", "crops"); - if (block == cropBlock) { - if (block instanceof IPlantable) { - //For agricraft versions which implement IPlantable in the BlockCrop class - block = ((IPlantable) block).getPlant(world, x, y, z); - } else { - //For earlier versions of AgriCraft - ArrayList drops = block.getDrops(world, x, y, z, 7, 0); - if (drops.get(1).getItem() == Items.wheat_seeds && flowerType.equals(FlowerManager.FlowerTypeWheat)) { - return true; - } - if (drops.get(1).getItem() == Items.nether_wart && flowerType.equals(FlowerManager.FlowerTypeNether)) { - return true; - } - } - } - }*/ - Flower flower = new Flower(block, meta, 0); return acceptedFlowers.contains(flower); } diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index 9079b14ee..34e37278f 100644 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -255,7 +255,7 @@ public class Bee extends IndividualLiving implements IBee { IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); // / Rain needs tolerant flyers - if (world.isRainingAt(housingCoords) && !canFlyInRain(beeModifier)) { + if (world.isRainingAt(housingCoords.add(0, 1, 0)) && !canFlyInRain(beeModifier)) { errorStates.add(EnumErrorCode.IS_RAINING); } diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java index 04340fc6d..7e4d55dc5 100644 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java @@ -139,7 +139,7 @@ public abstract class AlleleEffect extends AlleleCategorized implements IAlleleB Vect min = new Vect(housing.getCoordinates()).add(offset); Vect max = min.add(area); - return AxisAlignedBB.fromBounds(min.getX(), min.getY(), min.getZ(), max.getX(), max.getY(), max.getX()); + return AxisAlignedBB.fromBounds(min.getX(), min.getY(), min.getZ(), max.getX(), max.getY(), max.getZ()); } public static List getEntitiesInRange(IBeeGenome genome, IBeeHousing housing, Class entityClass) { diff --git a/src/main/java/forestry/apiculture/items/ItemRegistryApiculture.java b/src/main/java/forestry/apiculture/items/ItemRegistryApiculture.java index 5e02e0dee..8a697abc8 100644 --- a/src/main/java/forestry/apiculture/items/ItemRegistryApiculture.java +++ b/src/main/java/forestry/apiculture/items/ItemRegistryApiculture.java @@ -49,6 +49,7 @@ public class ItemRegistryApiculture extends ItemRegistry { public final ItemArmorApiarist apiaristBoots; public final ItemScoop scoop; + public final ItemSmoker smoker; public ItemRegistryApiculture() { // / BEES @@ -98,5 +99,7 @@ public class ItemRegistryApiculture extends ItemRegistry { // TOOLS scoop = registerItem(new ItemScoop(), "scoop"); scoop.setHarvestLevel("scoop", 3); + + smoker = registerItem(new ItemSmoker(), "smoker"); } } diff --git a/src/main/java/forestry/apiculture/items/ItemSmoker.java b/src/main/java/forestry/apiculture/items/ItemSmoker.java new file mode 100644 index 000000000..c2315e1f8 --- /dev/null +++ b/src/main/java/forestry/apiculture/items/ItemSmoker.java @@ -0,0 +1,90 @@ +package forestry.apiculture.items; + +import java.util.List; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; + +import forestry.api.apiculture.IArmorApiarist; +import forestry.api.apiculture.IHiveTile; +import forestry.api.core.Tabs; +import forestry.core.items.ItemForestry; +import forestry.core.proxy.Proxies; +import forestry.core.utils.Translator; + +public class ItemSmoker extends ItemForestry implements IArmorApiarist { + private static final int RANGE = 5; + + public ItemSmoker() { + super(Tabs.tabApiculture); + setMaxStackSize(1); + } + + @Override + public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) { + super.onUpdate(stack, worldIn, entityIn, itemSlot, isSelected); + if (worldIn.isRemote && isSelected && worldIn.rand.nextInt(40) == 0) { + addSmoke(worldIn, entityIn, 1); + } + } + + @Override + public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { + super.onUsingTick(stack, player, count); + World worldObj = player.worldObj; + addSmoke(worldObj, player, count % RANGE); + } + + private static void addSmoke(World worldObj, Entity entity, int distance) { + Vec3 look = entity.getLookVec(); + Vec3 handOffset = look.crossProduct(new Vec3(0, 1, 0)); + Vec3 lookDistance = new Vec3(look.xCoord * distance, look.yCoord * distance, look.zCoord * distance); + Vec3 smokePos = lookDistance.add(entity.getPositionVector()).add(handOffset); + Proxies.render.addEntitySmokeFX(worldObj, smokePos.xCoord, smokePos.yCoord + 1, smokePos.zCoord); + BlockPos blockPos = new BlockPos(smokePos.xCoord, smokePos.yCoord + 1, smokePos.zCoord); + TileEntity tileEntity = worldObj.getTileEntity(blockPos); + if (tileEntity instanceof IHiveTile) { + IHiveTile hive = (IHiveTile) tileEntity; + hive.calmBees(); + } + } + + @Override + public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn) { + playerIn.setItemInUse(itemStackIn, this.getMaxItemUseDuration(itemStackIn)); + return itemStackIn; + } + + @Override + public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { + TileEntity tileEntity = world.getTileEntity(pos); + if (tileEntity instanceof IHiveTile) { + IHiveTile hive = (IHiveTile) tileEntity; + hive.calmBees(); + } + return super.onItemUseFirst(stack, player, world, pos, side, hitX, hitY, hitZ); + } + + @Override + public int getMaxItemUseDuration(ItemStack stack) { + return 32; + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { + super.addInformation(stack, playerIn, tooltip, advanced); + tooltip.add(Translator.translateToLocal("item.for.smoker.description")); + } + + @Override + public boolean protectEntity(EntityLivingBase entity, ItemStack armor, String cause, boolean doProtect) { + return true; + } +} diff --git a/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java b/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java index 0fdcf74a3..d7abb07dd 100644 --- a/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java @@ -12,7 +12,6 @@ package forestry.apiculture.multiblock; import java.util.Collections; -import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.Vec3; import net.minecraft.world.biome.BiomeGenBase; @@ -24,6 +23,7 @@ import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IBeekeepingLogic; import forestry.apiculture.FakeBeekeepingLogic; +import forestry.apiculture.tiles.FakeBeeHousingInventory; import forestry.core.inventory.FakeInventoryAdapter; import forestry.core.inventory.IInventoryAdapter; import forestry.core.multiblock.FakeMultiblockController; @@ -95,36 +95,4 @@ public class FakeAlvearyController extends FakeMultiblockController implements I return 0; } - private static class FakeBeeHousingInventory implements IBeeHousingInventory { - public static final FakeBeeHousingInventory instance = new FakeBeeHousingInventory(); - - private FakeBeeHousingInventory() { - - } - - @Override - public ItemStack getQueen() { - return null; - } - - @Override - public ItemStack getDrone() { - return null; - } - - @Override - public void setQueen(ItemStack itemstack) { - - } - - @Override - public void setDrone(ItemStack itemstack) { - - } - - @Override - public boolean addProduct(ItemStack product, boolean all) { - return false; - } - } } diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java index 37ac793ba..d8d2e2de3 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java @@ -201,7 +201,7 @@ public class TileAlvearySwarmer extends TileAlveary implements ISidedInventory, this.active = active; - if (!worldObj.isRemote) { + if (worldObj != null && !worldObj.isRemote) { Proxies.net.sendNetworkPacket(new PacketActiveUpdate(this), worldObj); } } diff --git a/src/main/java/forestry/apiculture/tiles/FakeBeeHousingInventory.java b/src/main/java/forestry/apiculture/tiles/FakeBeeHousingInventory.java new file mode 100644 index 000000000..2dfce0bf0 --- /dev/null +++ b/src/main/java/forestry/apiculture/tiles/FakeBeeHousingInventory.java @@ -0,0 +1,38 @@ +package forestry.apiculture.tiles; + +import net.minecraft.item.ItemStack; + +import forestry.api.apiculture.IBeeHousingInventory; + +public class FakeBeeHousingInventory implements IBeeHousingInventory { + public static final FakeBeeHousingInventory instance = new FakeBeeHousingInventory(); + + private FakeBeeHousingInventory() { + + } + + @Override + public ItemStack getQueen() { + return null; + } + + @Override + public ItemStack getDrone() { + return null; + } + + @Override + public void setQueen(ItemStack itemstack) { + + } + + @Override + public void setDrone(ItemStack itemstack) { + + } + + @Override + public boolean addProduct(ItemStack product, boolean all) { + return false; + } +} diff --git a/src/main/java/forestry/apiculture/tiles/HiveBeeHousingInventory.java b/src/main/java/forestry/apiculture/tiles/HiveBeeHousingInventory.java new file mode 100644 index 000000000..3238823fd --- /dev/null +++ b/src/main/java/forestry/apiculture/tiles/HiveBeeHousingInventory.java @@ -0,0 +1,58 @@ +package forestry.apiculture.tiles; + +import javax.annotation.Nonnull; + +import net.minecraft.item.ItemStack; + +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeType; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeHousingInventory; + +class HiveBeeHousingInventory implements IBeeHousingInventory { + private ItemStack queen; + private ItemStack drone; + + private final TileHive hive; + + public HiveBeeHousingInventory(@Nonnull TileHive hive) { + this.hive = hive; + } + + @Override + public ItemStack getQueen() { + if (queen == null) { + IBee bee = hive.getContainedBee(); + if (bee != null) { + queen = BeeManager.beeRoot.getMemberStack(bee, EnumBeeType.QUEEN); + } + } + return queen; + } + + @Override + public ItemStack getDrone() { + if (drone == null) { + IBee bee = hive.getContainedBee(); + if (bee != null) { + drone = BeeManager.beeRoot.getMemberStack(bee, EnumBeeType.DRONE); + } + } + return drone; + } + + @Override + public void setQueen(ItemStack itemstack) { + this.queen = itemstack; + } + + @Override + public void setDrone(ItemStack itemstack) { + this.drone = itemstack; + } + + @Override + public boolean addProduct(ItemStack product, boolean all) { + return false; + } +} diff --git a/src/main/java/forestry/apiculture/tiles/TileHive.java b/src/main/java/forestry/apiculture/tiles/TileHive.java new file mode 100644 index 000000000..a358c31ec --- /dev/null +++ b/src/main/java/forestry/apiculture/tiles/TileHive.java @@ -0,0 +1,325 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.apiculture.tiles; + +import javax.annotation.Nonnull; +import java.util.Collections; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.Packet; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; +import net.minecraft.util.DamageSource; +import net.minecraft.util.ITickable; +import net.minecraft.util.Vec3; +import net.minecraft.world.EnumSkyBlock; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; + +import com.mojang.authlib.GameProfile; + +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeHousingInventory; +import forestry.api.apiculture.IBeeListener; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.apiculture.IBeekeepingLogic; +import forestry.api.apiculture.IHiveTile; +import forestry.api.apiculture.hives.IHiveRegistry; +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; +import forestry.api.core.ForestryAPI; +import forestry.api.core.IErrorLogic; +import forestry.api.genetics.IAllele; +import forestry.apiculture.BeekeepingLogic; +import forestry.apiculture.blocks.BlockBeeHives; +import forestry.apiculture.genetics.BeeDefinition; +import forestry.apiculture.genetics.alleles.AlleleEffect; +import forestry.apiculture.network.packets.PacketActiveUpdate; +import forestry.core.inventory.InventoryAdapter; +import forestry.core.proxy.Proxies; +import forestry.core.tiles.IActivatable; +import forestry.core.utils.DamageSourceForestry; +import forestry.core.utils.InventoryUtil; +import forestry.core.utils.ItemStackUtil; + +public class TileHive extends TileEntity implements ITickable, IHiveTile, IActivatable, IBeeHousing { + private static final DamageSource damageSourceBeeHive = new DamageSourceForestry("bee.hive"); + + @Nonnull + private final InventoryAdapter contained = new InventoryAdapter(2, "Contained"); + @Nonnull + private final HiveBeeHousingInventory inventory; + @Nonnull + private final BeekeepingLogic beeLogic; + @Nonnull + private final IErrorLogic errorLogic; + private IBee containedBee = null; + private boolean active = true; + private boolean angry = false; + private int calmTime; + + /** + * Hack to make sure that hives glow. + * TODO: remove when Mojang fixes this bug: https://bugs.mojang.com/browse/MC-3329 + * Hives should not need to tick normally. + */ + private boolean updatedLight; + + public TileHive() { + inventory = new HiveBeeHousingInventory(this); + beeLogic = new BeekeepingLogic(this); + errorLogic = ForestryAPI.errorStateRegistry.createErrorLogic(); + } + + @Override + public void update() { + if (worldObj.isRemote) { + if (!updatedLight && worldObj.getWorldTime() % 20 == 0) { + updatedLight = worldObj.checkLightFor(EnumSkyBlock.BLOCK, getPos()); + } + if (active && worldObj.rand.nextInt(4) == 0) { + if (beeLogic.canDoBeeFX()) { + beeLogic.doBeeFX(); + } + } + } else { + boolean canWork = beeLogic.canWork(); // must be called every tick to stay updated + + if (worldObj.rand.nextInt(angry ? 10 : 80) == 0) { + if (calmTime == 0) { + if (canWork) { + AxisAlignedBB boundingBox = AlleleEffect.getBounding(getContainedBee().getGenome(), this); + List entities = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, boundingBox); + if (!entities.isEmpty()) { + Collections.shuffle(entities); + EntityLivingBase entity = entities.get(0); + attack(entity, 2); + } + beeLogic.doWork(); + setActive(true); + } else { + setActive(false); + } + } else { + calmTime--; + if (calmTime == 0) { + setActive(true); + } else { + setActive(false); + } + } + } + } + } + + public IBee getContainedBee() { + if (this.containedBee == null) { + IBeeGenome beeGenome = null; + ItemStack containedBee = contained.getStackInSlot(0); + if (containedBee != null) { + IBee bee = BeeManager.beeRoot.getMember(containedBee); + if (bee != null) { + beeGenome = bee.getGenome(); + } + } + if (beeGenome == null) { + beeGenome = getGenomeFromBlock(); + } + if (beeGenome == null) { + beeGenome = BeeDefinition.FOREST.getGenome(); + } + this.containedBee = BeeManager.beeRoot.getBee(worldObj, beeGenome); + } + return this.containedBee; + } + + private IBeeGenome getGenomeFromBlock() { + IBlockState blockState = worldObj.getBlockState(pos); + if (blockState != null) { + Block block = blockState.getBlock(); + if (block instanceof BlockBeeHives) { + IHiveRegistry.HiveType hiveType = BlockBeeHives.getHiveType(blockState); + if (hiveType != null) { + String speciesUid = hiveType.getSpeciesUid(); + IAllele[] template = BeeManager.beeRoot.getTemplate(speciesUid); + if (template != null) { + return BeeManager.beeRoot.templateAsGenome(template); + } + } + } + } + return null; + } + + public void setContained(@Nonnull List bees) { + for (ItemStack itemstack : bees) { + InventoryUtil.addStack(contained, itemstack, true); + } + } + + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + contained.readFromNBT(nbttagcompound); + beeLogic.readFromNBT(nbttagcompound); + } + + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + contained.writeToNBT(nbttagcompound); + beeLogic.writeToNBT(nbttagcompound); + } + + @Override + public void calmBees() { + calmTime = 5; + angry = false; + setActive(false); + } + + @Override + public void onAttack(World world, BlockPos pos, EntityPlayer player) { + if (calmTime == 0) { + angry = true; + } + } + + @Override + public void onBroken(World world, BlockPos pos, EntityPlayer player, boolean canHarvest) { + if (calmTime == 0) { + attack(player, 10); + } + + if (canHarvest) { + for (ItemStack beeStack : InventoryUtil.getStacks(contained)) { + if (beeStack != null) { + ItemStackUtil.dropItemStackAsEntity(beeStack, worldObj, pos); + } + } + } + } + + private static void attack(EntityLivingBase entity, int maxDamage) { + double attackAmount = entity.worldObj.rand.nextDouble() / 2.0 + 0.5; + int damage = (int) (attackAmount * maxDamage); + if (damage > 0) { + // Entities are not attacked if they wear a full set of apiarist's armor. + int count = BeeManager.armorApiaristHelper.wearsItems(entity, damageSourceBeeHive.damageType, true); + damage -= (damage / 4.0f) * count; + if (damage > 0) { + entity.attackEntityFrom(damageSourceBeeHive, damage); + } + } + } + + @Override + public boolean isActive() { + return active; + } + + @Override + public void setActive(boolean active) { + if (this.active == active) { + return; + } + this.active = active; + + if (!worldObj.isRemote) { + Proxies.net.sendNetworkPacket(new PacketActiveUpdate(this), worldObj); + } + } + + @Override + public Packet getDescriptionPacket() { + beeLogic.syncToClient(); + return super.getDescriptionPacket(); + } + + @Override + public Iterable getBeeModifiers() { + return Collections.emptyList(); + } + + @Override + public Iterable getBeeListeners() { + return Collections.emptyList(); + } + + @Override + public IBeeHousingInventory getBeeInventory() { + return inventory; + } + + @Override + public IBeekeepingLogic getBeekeepingLogic() { + return beeLogic; + } + + @Override + public EnumTemperature getTemperature() { + return EnumTemperature.getFromBiome(getBiome(), getWorld(), getPos()); + } + + @Override + public EnumHumidity getHumidity() { + float humidity = ForestryAPI.climateManager.getHumidity(getWorld(), getPos()); + return EnumHumidity.getFromValue(humidity); + } + + @Override + public int getBlockLightValue() { + return getWorld().isDaytime() ? 15 : 0; // hives may have the sky obstructed but should still be active + } + + @Override + public boolean canBlockSeeTheSky() { + return true; // hives may have the sky obstructed but should still be active + } + + @Override + public BiomeGenBase getBiome() { + return getWorld().getBiomeGenForCoords(getPos()); + } + + @Override + public GameProfile getOwner() { + return null; + } + + @Override + public Vec3 getBeeFXCoordinates() { + BlockPos pos = getPos(); + return new Vec3(pos.getX() + 0.5, pos.getY() + 0.25, pos.getZ() + 0.5); + } + + @Nonnull + @Override + public IErrorLogic getErrorLogic() { + return errorLogic; + } + + @Override + public BlockPos getCoordinates() { + return getPos(); + } + +} diff --git a/src/main/java/forestry/apiculture/tiles/TileSwarm.java b/src/main/java/forestry/apiculture/tiles/TileSwarm.java deleted file mode 100644 index a5c35e42d..000000000 --- a/src/main/java/forestry/apiculture/tiles/TileSwarm.java +++ /dev/null @@ -1,68 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.apiculture.tiles; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ITickable; -import net.minecraft.world.EnumSkyBlock; - -import forestry.core.inventory.InventoryAdapter; -import forestry.core.utils.InventoryUtil; - -public class TileSwarm extends TileEntity implements ITickable { - - public final InventoryAdapter contained = new InventoryAdapter(2, "Contained"); - - // Hack to make sure that hives glow. - // TODO: remove when Mojang fixes this bug: https://bugs.mojang.com/browse/MC-3329 - // Hives should not need to tick normally. - private boolean updatedLight; - - @Override - public void update() { - if (worldObj.isRemote && !updatedLight && worldObj.getWorldTime() % 20 == 0) { - updatedLight = worldObj.checkLightFor(EnumSkyBlock.BLOCK, getPos()); - } - } - - public TileSwarm setContained(ItemStack[] bees) { - for (ItemStack itemstack : bees) { - InventoryUtil.addStack(contained, itemstack, true); - } - - return this; - } - - public boolean containsBees() { - for (int i = 0; i < contained.getSizeInventory(); i++) { - if (contained.getStackInSlot(i) != null) { - return true; - } - } - - return false; - } - - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - contained.readFromNBT(nbttagcompound); - } - - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - contained.writeToNBT(nbttagcompound); - } - -} diff --git a/src/main/java/forestry/apiculture/worldgen/HiveDescription.java b/src/main/java/forestry/apiculture/worldgen/HiveDescription.java index 40470a9e8..f210d23ef 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveDescription.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveDescription.java @@ -10,13 +10,20 @@ ******************************************************************************/ package forestry.apiculture.worldgen; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.BiomeDictionary; +import net.minecraftforge.common.IPlantable; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.hives.HiveManager; @@ -32,11 +39,29 @@ import forestry.apiculture.genetics.BeeDefinition; public enum HiveDescription implements IHiveDescription { - FOREST(0, 3.0f, BeeDefinition.FOREST, HiveManager.genHelper.tree()), - MEADOWS(1, 1.0f, BeeDefinition.MEADOWS, HiveManager.genHelper.ground(Blocks.dirt, Blocks.grass)), - DESERT(2, 1.0f, BeeDefinition.MODEST, HiveManager.genHelper.ground(Blocks.dirt, Blocks.grass, Blocks.sand, Blocks.sandstone)), - JUNGLE(3, 4.0f, BeeDefinition.TROPICAL, HiveManager.genHelper.tree()), - END(4, 4.0f, BeeDefinition.ENDED, HiveManager.genHelper.ground(Blocks.end_stone)) { + FOREST(0, 3.0f, BeeDefinition.FOREST, HiveManager.genHelper.tree()) { + @Override + public void postGen(World world, BlockPos pos) { + super.postGen(world, pos); + postGenFlowers(world, pos, flowerStates); + } + }, + MEADOWS(1, 1.0f, BeeDefinition.MEADOWS, HiveManager.genHelper.ground(Blocks.dirt, Blocks.grass)) { + @Override + public void postGen(World world, BlockPos pos) { + super.postGen(world, pos); + postGenFlowers(world, pos, flowerStates); + } + }, + DESERT(2, 1.0f, BeeDefinition.MODEST, HiveManager.genHelper.ground(Blocks.dirt, Blocks.grass, Blocks.sand, Blocks.sandstone)) { + @Override + public void postGen(World world, BlockPos pos) { + super.postGen(world, pos); + postGenFlowers(world, pos, cactusStates); + } + }, + JUNGLE(3, 6.0f, BeeDefinition.TROPICAL, HiveManager.genHelper.tree()), + END(4, 6.0f, BeeDefinition.ENDED, HiveManager.genHelper.ground(Blocks.end_stone)) { @Override public boolean isGoodBiome(BiomeGenBase biome) { return BiomeDictionary.isBiomeOfType(biome, BiomeDictionary.Type.END); @@ -48,9 +73,30 @@ public enum HiveDescription implements IHiveDescription { if (world.isAirBlock(pos.add(0, 1, 0))) { world.setBlockState(pos.add(0, 1, 0), Blocks.snow_layer.getStateFromMeta(0), 0); } + + postGenFlowers(world, pos, flowerStates); } }, - SWAMP(6, 2.0f, BeeDefinition.MARSHY, HiveManager.genHelper.ground(Blocks.dirt, Blocks.grass)),; + SWAMP(6, 2.0f, BeeDefinition.MARSHY, HiveManager.genHelper.ground(Blocks.dirt, Blocks.grass)) { + @Override + public void postGen(World world, BlockPos pos) { + super.postGen(world, pos); + + postGenFlowers(world, pos, mushroomStates); + } + }; + + private static final IHiveGen groundGen = HiveManager.genHelper.ground(Blocks.dirt, Blocks.grass, Blocks.snow, Blocks.sand, Blocks.sandstone); + private static final List flowerStates = new ArrayList<>(); + private static final List mushroomStates = new ArrayList<>(); + private static final List cactusStates = Collections.singletonList(Blocks.cactus.getDefaultState()); + + static { + flowerStates.addAll(Blocks.red_flower.getBlockState().getValidStates()); + flowerStates.addAll(Blocks.yellow_flower.getBlockState().getValidStates()); + mushroomStates.add(Blocks.red_mushroom.getDefaultState()); + mushroomStates.add(Blocks.brown_mushroom.getDefaultState()); + } private final int meta; private final float genChance; @@ -107,4 +153,46 @@ public enum HiveDescription implements IHiveDescription { public void postGen(World world, BlockPos pos) { } + + protected static void postGenFlowers(World world, BlockPos hivePos, List flowerStates) { + int plantedCount = 0; + for (int i = 0; i < 10; i++) { + int xOffset = world.rand.nextInt(8) - 4; + int zOffset = world.rand.nextInt(8) - 4; + BlockPos blockPos = hivePos.add(xOffset, 0, zOffset); + if (!world.isBlockLoaded(blockPos) || (xOffset == 0 && zOffset == 0)) { + continue; + } + + int y = groundGen.getYForHive(world, blockPos.getX(), blockPos.getZ()); + if (y <= 0) { + continue; + } + + blockPos = new BlockPos(blockPos.getX(), y, blockPos.getZ()); + IBlockState state = flowerStates.get(world.rand.nextInt(flowerStates.size())); + Block block = state.getBlock(); + if (!block.canPlaceBlockAt(world, blockPos)) { + continue; + } + + world.setBlockState(blockPos, state); + plantedCount++; + + if (block instanceof IPlantable) { + IPlantable plantable = (IPlantable) block; + + BlockPos groundPos = blockPos.down(); + Block ground = world.getBlockState(groundPos).getBlock(); + if (!ground.canSustainPlant(world, groundPos, EnumFacing.UP, plantable)) { + world.setBlockToAir(blockPos); + plantedCount--; + } + } + + if (plantedCount >= 3) { + break; + } + } + } } diff --git a/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java b/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java index 1c46da788..edaf57fba 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java @@ -10,6 +10,9 @@ ******************************************************************************/ package forestry.apiculture.worldgen; +import java.util.Arrays; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -23,14 +26,14 @@ import forestry.api.apiculture.hives.IHiveGen; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.apiculture.PluginApiculture; -import forestry.apiculture.tiles.TileSwarm; +import forestry.apiculture.tiles.TileHive; public class HiveDescriptionSwarmer implements IHiveDescription { - private final ItemStack[] bees; + private final List bees; public HiveDescriptionSwarmer(ItemStack... bees) { - this.bees = bees; + this.bees = Arrays.asList(bees); } @Override @@ -45,7 +48,7 @@ public class HiveDescriptionSwarmer implements IHiveDescription { @Override public int getMeta() { - return 8; + return 7; } @Override @@ -71,8 +74,8 @@ public class HiveDescriptionSwarmer implements IHiveDescription { @Override public void postGen(World world, BlockPos pos) { TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileSwarm) { - ((TileSwarm) tile).setContained(bees); + if (tile instanceof TileHive) { + ((TileHive) tile).setContained(bees); } } } diff --git a/src/main/java/forestry/core/config/Config.java b/src/main/java/forestry/core/config/Config.java index 6112a61af..5ad4d0efc 100755 --- a/src/main/java/forestry/core/config/Config.java +++ b/src/main/java/forestry/core/config/Config.java @@ -68,7 +68,7 @@ public class Config { public static boolean generateApatiteOre = true; public static boolean generateCopperOre = true; public static boolean generateTinOre = true; - private static float generateBeehivesAmount = 1.0f; + private static float generateBeehivesAmount = 1.5f; public static boolean generateBeehivesDebug = false; public static boolean enableVillagers = true; diff --git a/src/main/java/forestry/core/entities/EntityFXSmoke.java b/src/main/java/forestry/core/entities/EntityFXSmoke.java new file mode 100644 index 000000000..d774b7e9b --- /dev/null +++ b/src/main/java/forestry/core/entities/EntityFXSmoke.java @@ -0,0 +1,92 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.entities; + +import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.entity.Entity; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.world.World; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class EntityFXSmoke extends EntityFX { + private final float ignitionParticleScale; + + public EntityFXSmoke(World world, double x, double y, double z) { + super(world, x, y, z, 0, 0, 0); + this.motionX *= 0.8; + this.motionY *= 0.8; + this.motionZ *= 0.8; + this.motionY = this.rand.nextFloat() * 0.2F + 0.05F; + this.particleRed = this.particleGreen = this.particleBlue = 1.0F; + this.particleScale *= this.rand.nextFloat() / 4; + this.ignitionParticleScale = this.particleScale; + this.particleMaxAge = (int) (16.0 / (Math.random() * 0.8 + 0.2)); + this.noClip = false; + this.setParticleTextureIndex(49); + } + + @Override + public int getBrightnessForRender(float p_70070_1_) { + int i = super.getBrightnessForRender(p_70070_1_); + int j = i >> 16 & 255; + return 240 | j << 16; + } + + /** + * Gets how bright this entity is. + */ + @Override + public float getBrightness(float p_70013_1_) { + return 1.0F; + } + + @Override + public void renderParticle(WorldRenderer worldRendererIn, Entity entityIn, float partialTicks, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_) { + float f6 = (this.particleAge + partialTicks) / this.particleMaxAge; + this.particleScale = this.ignitionParticleScale * (1.0F - f6 * f6); + super.renderParticle(worldRendererIn, entityIn, partialTicks, p_180434_4_, p_180434_5_, p_180434_6_, p_180434_7_, p_180434_8_); + } + + /** + * Called to update the entity's position/logic. + */ + @Override + public void onUpdate() { + this.prevPosX = this.posX; + this.prevPosY = this.posY; + this.prevPosZ = this.posZ; + + if (this.particleAge++ >= this.particleMaxAge) { + this.setDead(); + } + + float f = (float) this.particleAge / (float) this.particleMaxAge; + + if (this.rand.nextFloat() > f * 2) { + this.worldObj.spawnParticle(EnumParticleTypes.SMOKE_LARGE, this.posX, this.posY, this.posZ, this.motionX, this.motionY, this.motionZ); + } + + this.motionY -= 0.03D; + this.moveEntity(this.motionX, this.motionY, this.motionZ); + this.motionX *= 0.999D; + this.motionY *= 0.999D; + this.motionZ *= 0.999D; + + if (this.onGround) { + this.motionX *= 0.7; + this.motionZ *= 0.7; + } + } +} \ No newline at end of file diff --git a/src/main/java/forestry/core/errors/ErrorLogic.java b/src/main/java/forestry/core/errors/ErrorLogic.java index 233ece8c0..8dde26678 100644 --- a/src/main/java/forestry/core/errors/ErrorLogic.java +++ b/src/main/java/forestry/core/errors/ErrorLogic.java @@ -42,7 +42,7 @@ public class ErrorLogic implements IErrorLogic { @Override public final boolean hasErrors() { - return errorStates.size() > 0; + return !errorStates.isEmpty(); } @Override diff --git a/src/main/java/forestry/core/items/ItemScoop.java b/src/main/java/forestry/core/items/ItemScoop.java index a958d2e21..092eeae60 100755 --- a/src/main/java/forestry/core/items/ItemScoop.java +++ b/src/main/java/forestry/core/items/ItemScoop.java @@ -16,7 +16,7 @@ import forestry.api.core.Tabs; public class ItemScoop extends ItemForestryTool implements IToolScoop { public ItemScoop() { super(null); - setEfficiencyOnProperMaterial(4.0f); + setEfficiencyOnProperMaterial(2.0f); setMaxDamage(10); setCreativeTab(Tabs.tabApiculture); setMaxStackSize(1); diff --git a/src/main/java/forestry/core/proxy/ProxyRender.java b/src/main/java/forestry/core/proxy/ProxyRender.java index 72575937e..f1a2a4b5b 100644 --- a/src/main/java/forestry/core/proxy/ProxyRender.java +++ b/src/main/java/forestry/core/proxy/ProxyRender.java @@ -10,10 +10,10 @@ ******************************************************************************/ package forestry.core.proxy; -import javax.annotation.Nullable; - import com.google.common.collect.ImmutableMap; +import javax.annotation.Nullable; + import net.minecraft.block.Block; import net.minecraft.client.renderer.block.statemap.IStateMapper; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -22,8 +22,10 @@ import net.minecraft.entity.Entity; import net.minecraft.util.BlockPos; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; + import net.minecraftforge.client.model.animation.ITimeValue; import net.minecraftforge.common.model.animation.IAnimationStateMachine; + import forestry.core.fluids.Fluids; import forestry.core.items.ItemCrated; import forestry.core.models.BlockModelIndex; @@ -122,6 +124,9 @@ public class ProxyRender { public void addEntityIgnitionFX(World world, double x, double y, double z) { } + public void addEntitySmokeFX(World world, double x, double y, double z) { + } + public void addEntityPotionFX(World world, double x, double y, double z, int color) { } } diff --git a/src/main/java/forestry/core/proxy/ProxyRenderClient.java b/src/main/java/forestry/core/proxy/ProxyRenderClient.java index 701e75492..7cb0727da 100644 --- a/src/main/java/forestry/core/proxy/ProxyRenderClient.java +++ b/src/main/java/forestry/core/proxy/ProxyRenderClient.java @@ -10,10 +10,10 @@ ******************************************************************************/ package forestry.core.proxy; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableMap; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -39,6 +39,7 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.animation.Animation; import net.minecraftforge.client.model.animation.ITimeValue; import net.minecraftforge.common.model.animation.IAnimationStateMachine; + import forestry.apiculture.entities.EntityFXBee; import forestry.apiculture.render.ParticleRenderer; import forestry.apiculture.render.TextureHabitatLocator; @@ -46,6 +47,7 @@ import forestry.core.config.Config; import forestry.core.config.Constants; import forestry.core.entities.EntityFXHoneydust; import forestry.core.entities.EntityFXIgnition; +import forestry.core.entities.EntityFXSmoke; import forestry.core.entities.EntityFXSnow; import forestry.core.fluids.Fluids; import forestry.core.items.ItemCrated; @@ -244,6 +246,16 @@ public class ProxyRenderClient extends ProxyRender { effectRenderer.addEffect(new EntityFXIgnition(world, x, y, z)); } + @Override + public void addEntitySmokeFX(World world, double x, double y, double z) { + if (!shouldSpawnParticle(world)) { + return; + } + + EffectRenderer effectRenderer = Minecraft.getMinecraft().effectRenderer; + effectRenderer.addEffect(new EntityFXSmoke(world, x, y, z)); + } + @Override public void addEntityPotionFX(World world, double x, double y, double z, int color) { if (!shouldSpawnParticle(world)) { diff --git a/src/main/resources/assets/forestry/blockstates/beehives.json b/src/main/resources/assets/forestry/blockstates/beehives.json index 54a507217..fcca0bad9 100644 --- a/src/main/resources/assets/forestry/blockstates/beehives.json +++ b/src/main/resources/assets/forestry/blockstates/beehives.json @@ -6,6 +6,7 @@ "hive=jungle": { "model": "forestry:beehives/jungle" }, "hive=end": { "model": "forestry:beehives/end" }, "hive=snow": { "model": "forestry:beehives/snow" }, - "hive=swamp": { "model": "forestry:beehives/swamp" } + "hive=swamp": { "model": "forestry:beehives/swamp" }, + "hive=swarm": { "model": "forestry:beehives/swarm" } } } diff --git a/src/main/resources/assets/forestry/models/block/beehives/desert.json b/src/main/resources/assets/forestry/models/block/beehives/desert.json index 1ee5220b4..791528f26 100644 --- a/src/main/resources/assets/forestry/models/block/beehives/desert.json +++ b/src/main/resources/assets/forestry/models/block/beehives/desert.json @@ -1,12 +1,12 @@ { "parent": "block/cube", "textures": { - "particle": "forestry:blocks/beehives/beehive.3.side", - "down": "forestry:blocks/beehives/beehive.3.top", - "up": "forestry:blocks/beehives/beehive.3.top", - "north": "forestry:blocks/beehives/beehive.3.side", - "east": "forestry:blocks/beehives/beehive.3.side", - "south": "forestry:blocks/beehives/beehive.3.side", - "west": "forestry:blocks/beehives/beehive.3.side" + "particle": "forestry:blocks/beehives/desert.side", + "down": "forestry:blocks/beehives/desert.top", + "up": "forestry:blocks/beehives/desert.top", + "north": "forestry:blocks/beehives/desert.side", + "east": "forestry:blocks/beehives/desert.side", + "south": "forestry:blocks/beehives/desert.side", + "west": "forestry:blocks/beehives/desert.side" } } diff --git a/src/main/resources/assets/forestry/models/block/beehives/end.json b/src/main/resources/assets/forestry/models/block/beehives/end.json index 1ce011daf..b47870760 100644 --- a/src/main/resources/assets/forestry/models/block/beehives/end.json +++ b/src/main/resources/assets/forestry/models/block/beehives/end.json @@ -1,12 +1,12 @@ { "parent": "block/cube", "textures": { - "particle": "forestry:blocks/beehives/beehive.5.side", - "down": "forestry:blocks/beehives/beehive.5.top", - "up": "forestry:blocks/beehives/beehive.5.top", - "north": "forestry:blocks/beehives/beehive.5.side", - "east": "forestry:blocks/beehives/beehive.5.side", - "south": "forestry:blocks/beehives/beehive.5.side", - "west": "forestry:blocks/beehives/beehive.5.side" + "particle": "forestry:blocks/beehives/end.side", + "down": "forestry:blocks/beehives/end.top", + "up": "forestry:blocks/beehives/end.top", + "north": "forestry:blocks/beehives/end.side", + "east": "forestry:blocks/beehives/end.side", + "south": "forestry:blocks/beehives/end.side", + "west": "forestry:blocks/beehives/end.side" } } diff --git a/src/main/resources/assets/forestry/models/block/beehives/forest.json b/src/main/resources/assets/forestry/models/block/beehives/forest.json index fde0bdcf7..e5ae0d32a 100644 --- a/src/main/resources/assets/forestry/models/block/beehives/forest.json +++ b/src/main/resources/assets/forestry/models/block/beehives/forest.json @@ -1,12 +1,12 @@ { "parent": "block/cube", "textures": { - "particle": "forestry:blocks/beehives/beehive.1.side", - "down": "forestry:blocks/beehives/beehive.1.top", - "up": "forestry:blocks/beehives/beehive.1.top", - "north": "forestry:blocks/beehives/beehive.1.side", - "east": "forestry:blocks/beehives/beehive.1.side", - "south": "forestry:blocks/beehives/beehive.1.side", - "west": "forestry:blocks/beehives/beehive.1.side" + "particle": "forestry:blocks/beehives/forest.side", + "down": "forestry:blocks/beehives/forest.top", + "up": "forestry:blocks/beehives/forest.top", + "north": "forestry:blocks/beehives/forest.side", + "east": "forestry:blocks/beehives/forest.side", + "south": "forestry:blocks/beehives/forest.side", + "west": "forestry:blocks/beehives/forest.side" } } diff --git a/src/main/resources/assets/forestry/models/block/beehives/jungle.json b/src/main/resources/assets/forestry/models/block/beehives/jungle.json index 604485725..00123cd33 100644 --- a/src/main/resources/assets/forestry/models/block/beehives/jungle.json +++ b/src/main/resources/assets/forestry/models/block/beehives/jungle.json @@ -1,12 +1,12 @@ { "parent": "block/cube", "textures": { - "particle": "forestry:blocks/beehives/beehive.4.side", - "down": "forestry:blocks/beehives/beehive.4.top", - "up": "forestry:blocks/beehives/beehive.4.top", - "north": "forestry:blocks/beehives/beehive.4.side", - "east": "forestry:blocks/beehives/beehive.4.side", - "south": "forestry:blocks/beehives/beehive.4.side", - "west": "forestry:blocks/beehives/beehive.4.side" + "particle": "forestry:blocks/beehives/jungle.side", + "down": "forestry:blocks/beehives/jungle.top", + "up": "forestry:blocks/beehives/jungle.top", + "north": "forestry:blocks/beehives/jungle.side", + "east": "forestry:blocks/beehives/jungle.side", + "south": "forestry:blocks/beehives/jungle.side", + "west": "forestry:blocks/beehives/jungle.side" } } diff --git a/src/main/resources/assets/forestry/models/block/beehives/meadows.json b/src/main/resources/assets/forestry/models/block/beehives/meadows.json index ffb5ebd73..287287289 100644 --- a/src/main/resources/assets/forestry/models/block/beehives/meadows.json +++ b/src/main/resources/assets/forestry/models/block/beehives/meadows.json @@ -1,12 +1,12 @@ { "parent": "block/cube", "textures": { - "particle": "forestry:blocks/beehives/beehive.2.side", - "down": "forestry:blocks/beehives/beehive.2.top", - "up": "forestry:blocks/beehives/beehive.2.top", - "north": "forestry:blocks/beehives/beehive.2.side", - "east": "forestry:blocks/beehives/beehive.2.side", - "south": "forestry:blocks/beehives/beehive.2.side", - "west": "forestry:blocks/beehives/beehive.2.side" + "particle": "forestry:blocks/beehives/meadows.side", + "down": "forestry:blocks/beehives/meadows.top", + "up": "forestry:blocks/beehives/meadows.top", + "north": "forestry:blocks/beehives/meadows.side", + "east": "forestry:blocks/beehives/meadows.side", + "south": "forestry:blocks/beehives/meadows.side", + "west": "forestry:blocks/beehives/meadows.side" } } diff --git a/src/main/resources/assets/forestry/models/block/beehives/snow.json b/src/main/resources/assets/forestry/models/block/beehives/snow.json index 32e5a7e5c..d3abb53a6 100644 --- a/src/main/resources/assets/forestry/models/block/beehives/snow.json +++ b/src/main/resources/assets/forestry/models/block/beehives/snow.json @@ -1,12 +1,12 @@ { "parent": "block/cube", "textures": { - "particle": "forestry:blocks/beehives/beehive.6.side", - "down": "forestry:blocks/beehives/beehive.6.top", - "up": "forestry:blocks/beehives/beehive.6.top", - "north": "forestry:blocks/beehives/beehive.6.side", - "east": "forestry:blocks/beehives/beehive.6.side", - "south": "forestry:blocks/beehives/beehive.6.side", - "west": "forestry:blocks/beehives/beehive.6.side" + "particle": "forestry:blocks/beehives/snow.side", + "down": "forestry:blocks/beehives/snow.top", + "up": "forestry:blocks/beehives/snow.top", + "north": "forestry:blocks/beehives/snow.side", + "east": "forestry:blocks/beehives/snow.side", + "south": "forestry:blocks/beehives/snow.side", + "west": "forestry:blocks/beehives/snow.side" } } diff --git a/src/main/resources/assets/forestry/models/block/beehives/swamp.json b/src/main/resources/assets/forestry/models/block/beehives/swamp.json index dda2ede56..0d09947de 100644 --- a/src/main/resources/assets/forestry/models/block/beehives/swamp.json +++ b/src/main/resources/assets/forestry/models/block/beehives/swamp.json @@ -1,12 +1,12 @@ { "parent": "block/cube", "textures": { - "particle": "forestry:blocks/beehives/beehive.7.side", - "down": "forestry:blocks/beehives/beehive.7.top", - "up": "forestry:blocks/beehives/beehive.7.top", - "north": "forestry:blocks/beehives/beehive.7.side", - "east": "forestry:blocks/beehives/beehive.7.side", - "south": "forestry:blocks/beehives/beehive.7.side", - "west": "forestry:blocks/beehives/beehive.7.side" + "particle": "forestry:blocks/beehives/swamp.side", + "down": "forestry:blocks/beehives/swamp.top", + "up": "forestry:blocks/beehives/swamp.top", + "north": "forestry:blocks/beehives/swamp.side", + "east": "forestry:blocks/beehives/swamp.side", + "south": "forestry:blocks/beehives/swamp.side", + "west": "forestry:blocks/beehives/swamp.side" } } diff --git a/src/main/resources/assets/forestry/models/block/beehives/swarm.json b/src/main/resources/assets/forestry/models/block/beehives/swarm.json new file mode 100644 index 000000000..476b30e22 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/beehives/swarm.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "forestry:blocks/beehives/swarm.side", + "down": "forestry:blocks/beehives/swarm.top", + "up": "forestry:blocks/beehives/swarm.top", + "north": "forestry:blocks/beehives/swarm.side", + "east": "forestry:blocks/beehives/swarm.side", + "south": "forestry:blocks/beehives/swarm.side", + "west": "forestry:blocks/beehives/swarm.side" + } +} diff --git a/src/main/resources/assets/forestry/models/item/beehives/swarm.json b/src/main/resources/assets/forestry/models/item/beehives/swarm.json new file mode 100644 index 000000000..0acd08439 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beehives/swarm.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/beehives/swarm", + "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/smoker.json b/src/main/resources/assets/forestry/models/item/smoker.json new file mode 100644 index 000000000..b0c35d9bc --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/smoker.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/smoker" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, 35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, -0.85, 0.85 ] + }, + "firstperson": { + "rotation": [ 0, 25, -25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.3.side.png b/src/main/resources/assets/forestry/textures/blocks/beehives/desert.side.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/beehives/beehive.3.side.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/desert.side.png diff --git a/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.3.top.png b/src/main/resources/assets/forestry/textures/blocks/beehives/desert.top.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/beehives/beehive.3.top.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/desert.top.png diff --git a/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.5.side.png b/src/main/resources/assets/forestry/textures/blocks/beehives/end.side.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/beehives/beehive.5.side.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/end.side.png diff --git a/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.5.top.png b/src/main/resources/assets/forestry/textures/blocks/beehives/end.top.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/beehives/beehive.5.top.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/end.top.png diff --git a/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.1.side.png b/src/main/resources/assets/forestry/textures/blocks/beehives/forest.side.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/beehives/beehive.1.side.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/forest.side.png diff --git a/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.1.top.png b/src/main/resources/assets/forestry/textures/blocks/beehives/forest.top.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/beehives/beehive.1.top.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/forest.top.png diff --git a/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.4.side.png b/src/main/resources/assets/forestry/textures/blocks/beehives/jungle.side.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/beehives/beehive.4.side.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/jungle.side.png diff --git a/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.4.top.png b/src/main/resources/assets/forestry/textures/blocks/beehives/jungle.top.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/beehives/beehive.4.top.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/jungle.top.png diff --git a/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.2.side.png b/src/main/resources/assets/forestry/textures/blocks/beehives/meadows.side.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/beehives/beehive.2.side.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/meadows.side.png diff --git a/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.2.top.png b/src/main/resources/assets/forestry/textures/blocks/beehives/meadows.top.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/beehives/beehive.2.top.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/meadows.top.png diff --git a/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.6.side.png b/src/main/resources/assets/forestry/textures/blocks/beehives/snow.side.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/beehives/beehive.6.side.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/snow.side.png diff --git a/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.6.top.png b/src/main/resources/assets/forestry/textures/blocks/beehives/snow.top.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/beehives/beehive.6.top.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/snow.top.png diff --git a/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.7.side.png b/src/main/resources/assets/forestry/textures/blocks/beehives/swamp.side.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/beehives/beehive.7.side.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/swamp.side.png diff --git a/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.7.top.png b/src/main/resources/assets/forestry/textures/blocks/beehives/swamp.top.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/beehives/beehive.7.top.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/swamp.top.png diff --git a/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.8.side.png b/src/main/resources/assets/forestry/textures/blocks/beehives/swarm.side.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/beehives/beehive.8.side.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/swarm.side.png diff --git a/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.8.top.png b/src/main/resources/assets/forestry/textures/blocks/beehives/swarm.top.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/beehives/beehive.8.top.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/swarm.top.png diff --git a/src/main/resources/assets/forestry/textures/items/smoker.png b/src/main/resources/assets/forestry/textures/items/smoker.png new file mode 100644 index 0000000000000000000000000000000000000000..c1cbfe0172dcd840948ff36ea8ba7b5acde79491 GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}LV!<*>;M1%r%s*f;^Lwq$DQFP z*Vxq5+1cr7Cc1g^=7R?hcK3AG*3~8@C*|a1FJHOD$JeJbUH!(58-YQA^$iU)!<>jRnWd*fWrSs;^v9Y$CIJw8c!G6Mo3Fj|fY&rVI6=)Y@NswPKgTu2MX+Tbc zr;B4qMO^4PcfP|0Jg$x#SBQWAQuIICZA+@cuifSknpVj>%`dDf-?=R>@>*s_qUXZ; zyZd*DN1hhd+b(qX;u$6*_M&r-PkcGTGGXo{QwE7m_ZxRO9kV$9ks)>F%SJ2Jw|on@ zSj87_=X%>>m*ErPr%s%YEJE`9?suFnGH9xvX