Reformed Forestry!

* Updated for BC 6.0.x compatibility * Re-implemented the Pipes plugin * Converted to vanilla assets lang system * Converted to standard gradle file structure * General warnings cleanup
2026-10-26 14:23:57 +00:00 · 2014-08-11 16:56:09 -04:00
1 parent 36248c02f1
commit 8f2d802f11
@@ -1,9 +1,28 @@
-.classpath
-.gradle/
-.nb-gradle/
-.settings/
-build/
-eclipse/
-.project
+# ForgeGradle
+/.gradle
+/.nb-gradle
+/build
+/eclipse
+/libs
+/run
 gradle.properties
+
+# Eclipse
+.classpath
+.project
+/.settings
+/bin
+
+# IntelliJ
+/.idea
+*.iml
+*.ipr
+*.iws
+/out
+
+# Mac Stuff
+.DS_Store
+*.command
+
+# Other
 *~
@@ -35,7 +35,7 @@ ext.CraftGuideTmp = "build/tmp/CraftGuide"

 minecraft {
 	version = mcversion + "-" + forgeversion
-	assetDir = "eclipse/assets"
+	runDir = "run"

 	replace '@VERSION@', project.version
 	replace '@BUILD_NUMBER@', getBuildNumber()
@@ -51,13 +51,9 @@ sourceSets {
 	
 	main {
 		java {
-			srcDirs file('forestry_common').listFiles()
-			include 'forestry/**'
-
 			srcDir project.dirApi
 		}
 		resources {
-			srcDir 'forestry_resources'
 			srcDir project.dirLang
 		}
 	}
@@ -76,11 +72,16 @@ configurations {
 }

 dependencies {
-	compile 'net.industrial-craft:industrialcraft-2:2.2.508-experimental:api'
-	buildcraft 'com.mod-buildcraft:buildcraft:5.0.4.2942:dev'
+	compile 'net.industrial-craft:industrialcraft-2:2.2.575-experimental:api'
+	buildcraft 'com.mod-buildcraft:buildcraft:6.0.17:dev'
 }

 processResources {
+
+    // this will ensure that this task is redone when the versions change.
+    inputs.property "version", project.version
+    inputs.property "mcversion", project.minecraft.version
+
 	// replace stuff in mcmod.info, nothing else
 	from(sourceSets.main.resources.srcDirs) {
 		include 'mcmod.info'
@@ -172,7 +173,7 @@ jar {
 	destinationDir = file("build/tmp")
 	archiveName = "main.jar"

-	from {
+    from {
 		configurations.buildcraft.collect {
 			it.isDirectory() ? it : zipTree(it).matching {
 				include '**/api/**'
@@ -1,163 +0,0 @@
-
-apiculture.effect.aggressive=Aggress.
-apiculture.effect.beatific=Beatific
-apiculture.effect.creeper=Creeper
-apiculture.effect.exploration=Explorer
-apiculture.effect.glacial=Freezing
-apiculture.effect.heroic=Heroic
-apiculture.effect.ignition=Flammable
-apiculture.effect.misasmic=Poison
-apiculture.effect.misanthrope=Ends
-apiculture.effect.radioactive=Radioact.
-apiculture.effect.drunkard=Drunkard
-apiculture.effect.snowing=Snow
-apiculture.effect.resurrection=Resurrection
-apiculture.effect.reanimation=Reanimation
-apiculture.effect.repulsion=Repulsion
-bees.hybrid.adj.add=
-bees.hyphen.adj.add=
-bees.drone=Drone
-bees.drone.adj.add=
-bees.larvae=Larvae
-bees.larvae.adj.add=
-bees.princess=Princess
-bees.princess.adj.add=
-bees.queen=Queen
-bees.queen.adj.add=
-bees.stock.pristine=Pristine Stock
-bees.stock.ignoble=Ignoble Stock
-death.bee.end=%1$s was ended by an unfriendly sting.
-death.bee.end.player=%1$s was ended by an unfriendly sting while fighting %2$s.
-death.bee.radioactive=%1$s walked into Chernobyl without his helmet on.
-death.bee.radioactive.player=%1$s walked into Chernobyl without his helmet on. %2$s watched and cackled.
-death.bee.aggressive=%1$s encountered a swarm of bees. That had to sting.
-death.bee.aggressive.player=%1$s encountered a swarm of bees. %2$s stole his apiarist's suit.
-genus.bees.common=Common
-genus.bees.noble=Noble
-genus.bees.industrious=Industrious
-genus.bees.heroic=Heroic
-genus.bees.infernal=Infernal
-genus.bees.austere=Austere
-genus.bees.end=End
-genus.bees.vengeful=Vengeful
-genus.bees.tropical=Tropical
-genus.bees.frozen=Frozen
-genus.bees.reddened=Reddened
-genus.bees.festive=Festive
-genus.bees.agrarian=Agrarian
-genus.bees.boggy=Boggy
-genus.bees.monastic=Monastic
-bees.species.forest=Forest
-bees.species.meadows=Meadows
-bees.species.common=Common
-bees.species.cultivated=Cultivated
-bees.species.noble=Noble
-bees.species.majestic=Majestic
-bees.species.imperial=Imperial
-bees.species.diligent=Diligent
-bees.species.unweary=Unweary
-bees.species.industrious=Industrious
-bees.species.steadfast=Steadfast
-bees.species.valiant=Valiant
-bees.species.heroic=Heroic
-bees.species.sinister=Sinister
-bees.species.fiendish=Fiendish
-bees.species.demonic=Demonic
-bees.species.modest=Modest
-bees.species.frugal=Frugal
-bees.species.austere=Austere
-bees.species.tropical=Tropical
-bees.species.exotic=Exotic
-bees.species.edenic=Edenic
-bees.species.ender=Ender
-bees.species.wintry=Wintry
-bees.species.icy=Icy
-bees.species.glacial=Glacial
-bees.species.vindictive=Vindictive
-bees.species.vengeful=Vengeful
-bees.species.avenging=Avenging
-bees.species.darkened=Darkened
-bees.species.reddened=Reddened
-bees.species.omega=Omega
-bees.species.leporine=Leporine
-bees.species.tricky=Tricky
-bees.species.rural=Rural
-bees.species.marshy=Marshy
-bees.species.merry=Merry
-bees.species.tipsy=Tipsy
-bees.species.monastic=Monastic
-bees.species.secluded=Secluded
-bees.species.hermitic=Hermitic
-bees.species.spectral=Spectral
-bees.species.phantasmal=Phantasmal
-beemode.easy.desc=Simplifies beebreeding by drastically increasing mutation rate and removing the chance for genetic fatigue.
-beemode.normal.desc=Recommended mode for the normal player.
-beemode.hard.desc=Reducing mutation rate slightly while increasing lifespan of individual queens by 50 %.
-beemode.hardcore.desc=Halves mutation rate, increases lifespan of individual queens by 500 % and reduces fertility by 20 %.
-beemode.insane.desc=Cuts mutation rate to 20 %, increases lifespan tenfold and reduces fertility by 40 %.
-description.speciesForest=One of the most common pests in forests; Mostly docile.|Beekeeping 101
-description.speciesMeadows=Infests mostly plains in temperate climates; Mostly docile.|Beekeeping 101
-description.speciesCommon=Considered the beginner apiarist's badge of participation.|Beekeeping 101
-description.speciesCultivated=Fast working bee; Thinks anything but opera is beneath it.|Beekeeping 101
-description.speciesNoble="There is no more noble occupation in the world than to breed another bee."|Binnie, Apiarist
-description.speciesMajestic="Off with their heads!"|Queen of Hearts
-description.speciesImperial=Highly sought after bee; Specialises in the production of precious royal jelly.|Beekeeping 101
-description.speciesDiligent=Mostly noted as a stepping stone for the industrious line of bees.|Beekeeping 101
-description.speciesUnweary=Unweary. Then they die.|Beekeeping 101
-description.speciesIndustrious=Highly sought after bee; Specialises in the production of exquisite pollen.|Beekeeping 101
-description.speciesSteadfast=Considered extinct until some were found by adventurers in a deep dungeon.|Apiarist's Grimoire
-description.speciesValiant=A rare subspecies rarely seen cohabiting in mundane hives.|Apiarist's Grimoire
-description.speciesHeroic=Elaborate legends have surrounded this species. Will defend its hive to its death against any hostiles.|Apiarist's Grimoire
-description.speciesSinister=Not many bee species are able to survive in the nether. And even those are severly affected by their hellish environment.|Beekeeping 101
-description.speciesFiendish=Experienced nether apiarist's have been reporting severe attacks by their bees. Caution is advised.|Beekeeping 101
-description.speciesDemonic=Born in the fires of the nether and being a descendant of generations of nether bees has caused this species to turn into a true demon.|Beekeeping 101
-description.speciesModest=Hot and arid climates have forced this species to adapt to a degree which will not allow it to survive in significantly friendlier climates.|Beekeeping 101
-description.speciesFrugal=Generations of bees baked in the sun to produce this species.|Beekeeping 101
-description.speciesAustere=Dangerous and volatile; Beekeepers are advised to stay in full suit whenever near.|Beekeeping 101
-description.speciesTropical="My travels along the jungle river allowed me to catch many of these poisonous specimen. Unfortunately I had lost my only austere branch to crocodiles a while back."|Beekeeping 101
-description.speciesExotic="The fever shook me and my apiarist's suit was drenched with cold sweat, but with trembling hands I finally managed to pull one of these from my apiary."|Beekeeping 101
-description.speciesEdenic="I furiously scribbled in my notebook, drawing sketches of the images I felt seeping into my brain while I was watching the insects perform their strange little dance."|Beekeeping 101
-description.speciesWintry=Common, but winter-hardened bee tribe; Cultivation in warmer climates is a challenge.|Beekeeping 101
-description.speciesIcy=Temperatures inside hives inhabited by this species will drop until ice shards form.|Beekeeping 101
-description.speciesGlacial="Winter is coming!"|E. Stark, beekeeper
-description.speciesVindictive="It ate my face! It ate my face!"|K.M.
-description.speciesVengeful="Veni, vidi, vici!"|Apinus Julius Caesar
-description.speciesAvenging="The walls of my house began to crumble and I heard the roof creaking over my head, but I cared not! I felt the stabs of a thousand little insects on my glove as I grabbed the new queen."|Anonymous
-description.speciesDarkened=Attracted by the power of alchemically bound matter, this species was a powerful source of energy.|Beekeeper's Lexicon
-description.speciesReddened=Requiring massive amounts of alchemically bound matter, these little fellows could flood a world in energy.|Beekeeper's Lexicon
-description.speciesOmega="I am Alpha and Omega, the beginning and the end, the first and the last."|Pahimar, beekeeper
-description.speciesLeporine="I swear! It was tiny, had wings and I definitely saw fluffy little rabbit ears! ... No! I am not drunk!"|"Sir" Sengir, madman
-description.speciesMerry="Hohoho!"|Merry bee
-description.speciesTipsy="Dance my pretties! Dance!"|Tipsy Witch of the East
-description.speciesTricky="Trick or Tricky Treat!"|Tricky Bee
-description.speciesRural="Rain in May promises much hay."|M. Ages, Rural Beekeeper
-description.speciesMarshy="Seriously? Mushrooms? Get out of here!"|Beekeeping 101
-description.speciesMonastic="I remained austere and said to him: 'Not only a princess, but also a whole pile of emeralds for a measly drone? That's extortion!'|Beekeeping 101
-description.speciesSecluded="Crossbreeding with the desert kind was a mistake. My bees withdrew more and more from the outside world."|Beekeeping 101
-description.speciesHermitic="My dear colleague! I noticed the bees you sent me refuse to wash and are growing full beards. Care to explain?"|Binnie, Apiarist
-description.speciesEnded="I found one of these seemingly hermitical insects in a villager's apiary. It was torpid, obviously ripped from its world and longing for a fragment from it."|Beekeeping 101
-description.speciesSpectral="I was unsure whether it was alive as it lay there in the palm of my hand, glimmering and pulsating, oozing a coldness I never felt before. Then I heard the pile of bones behind me rattle..."|Beekeeping 101
-description.speciesPhantasmal="Whatever you do, do not, I repeat, DO NOT drop the dragon e..."|"Sir" Sengir, Last Words
-tile.alveary.0=Alveary
-tile.alveary.2=Swarmer
-tile.alveary.3=Alveary Fan
-tile.alveary.4=Alveary Heater
-tile.alveary.5=Alveary Hygroregulator
-tile.alveary.6=Alveary Stabiliser
-tile.alveary.7=Alveary Sieve
-tile.beehives.1=Forest Hive
-tile.beehives.2=Meadows Hive
-tile.beehives.3=Modest Hive
-tile.beehives.4=Tropical Hive
-tile.beehives.5=Ender Hive
-tile.beehives.6=Wintry Hive
-tile.beehives.7=Marshy Hive
-tile.candle.stump=Unlit Candle
-tile.candle.dyed.stump=Unlit Dyed Candle
-tile.candle.lit=Lit Candle
-tile.candle.dyed.lit=Lit Dyed Candle
-tile.stump.0=Candle Stump
-tile.for.apiculture.0=Apiary
-tile.for.apiculture.1=Apiarist's Chest
-tile.for.apiculture.2=Bee House
-
@@ -1,69 +0,0 @@
-gui.maturity=Matures
-gui.treealyzer=Treealyzer
-gui.treealyzer.help=Supply sapling and provide honey or honeydew as catalyst.
-gui.treealyzer.overview=Analytics available
-gui.saplings=Saplings
-gui.yield=Yield
-gui.sappiness=Sappiness
-gui.height=Height
-gui.fruits=Fruits
-gui.supports=Supports
-gui.family=Family
-gui.girth=Girth
-gui.native=Soil
-gui.tolerated=Tolerates
-gui.growth=Growth
-description.treeOak=Common tree species whose apple-bearing properties are the subject of much song and dance.|Codex Lignum
-description.treeBirch=Widespread birch tree, which on average is of smaller height.|Codex Lignum
-description.treeLime=Tall, deciduous tree. It has been reclassified recently as being in the Malvaceae family.|Codex Lignum
-description.treeWalnut=Tall, deciduous tree with large trunk. Naturally occuring walnut trees carry fruits which require some time to ripe.|Codex Lignum
-description.treeChestnut=Tall, deciduous tree with large trunk. Naturally occuring chestnut trees carry fruits which require some time to ripe.|Codex Lignum
-description.treeSipiri=Tall, evergreen trees with valuable timber. Wood and bark are pleasantly scented. Will only thrive in tropical climes.|Codex Lignum
-description.treeWillow=Large, deciduous tree. White willows are fast-growing. Have only been observed to occur in damp climates.|Codex Lignum
-description.treeCherry=Small tree. In its natural form it will bear cherries which will need to undergo a ripening period.|Codex Lignum
-family.pomes=Pomes
-family.prunes=Prunes
-family.nuts=Nuts
-family.jungle=Jungle
-fruits.apple=Apple
-fruits.cherry=Cherry
-fruits.chestnut=Chestnut
-fruits.walnut=Walnut
-fruits.cocoa=Cocoa
-fruits.none=None
-fruits.plum=Plum
-fruits.lemon=Lemon
-fruits.dates=Dates
-fruits.papaya=Papaya
-item.grafter=Grafter
-item.grafterProven=Proven Grafter
-tile.log=Wood
-tile.planks=Wood Planks
-tile.slab=Wood Slab
-tile.fences=Fence
-tile.for.stairs=Stairs
-wood.0=Larch
-wood.1=Teak
-wood.2=Acacia
-wood.3=Lime
-wood.4=Chestnut
-wood.5=Wenge
-wood.6=Baobab
-wood.7=Sequoia
-wood.8=Kapok
-wood.9=Ebony
-wood.10=Mahogany
-wood.11=Balsa
-wood.12=Willow
-wood.13=Walnut
-wood.14=Greenheart
-wood.15=Cherry
-wood.16=Mahoe
-wood.17=Poplar
-wood.18=Palm
-wood.19=Papaya
-wood.20=Pine
-wood.21=Plum
-wood.22=Maple
-wood.23=Citrus
-tile.for.arboriculture.0=Arborist's Chest
@@ -1,55 +0,0 @@
-circuit.managedArboreal=Arboretum
-circuit.managedPeat=Peat Bog
-circuit.managedCereal=Crop Farm
-circuit.managedVegetable=Vegetable Farm
-circuit.managedInfernal=Infernal Farm
-circuit.managedShroom=Shroom Farm
-circuit.manualOrchard=Orchard
-circuit.manualPeat=Peat Bog
-circuit.manualCereal=Crop Farm
-circuit.manualVegetable=Vegetable Farm
-circuit.manualSucculent=Succulent Farm
-circuit.manualPoales=Reed Farm
-circuit.manualRubber=Rubber Plantation
-circuit.manualGourd=Gourd Farm
-circuit.manualCocoa=Cocoa Plantation
-circuit.manualShroom=Shroom Farm
-errors.noFertilizer.desc=No Fertilizer
-errors.noFertilizer.help=Farms require fertilizer for function. Compost is insufficient.
-errors.noFarmland.desc=No Farmland
-errors.noFarmland.help=Smooth sandstone, bricks or stone bricks create a platform the farm will build on.
-errors.noLiquid.desc=No Water
-errors.noLiquid.help=Depending on rainfall, temperature and humidity farms need to be supplied with varying amounts of water.
-gui.hydration=Hydration Required
-gui.hydr.heat=By Heat
-gui.hydr.humid=By Humidity
-gui.hydr.rainfall=By Rainfall
-gui.hydr.overall=Overall
-hints.farmland.tag=Lay out your farmland!
-hints.farmland.desc=Smooth sandstone, bricks or stone bricks create a platform the farm will build on.
-hints.gearbox.tag=Supply power!
-hints.gearbox.desc=Use gearboxes to attach engines or power lines to your farm.
-hints.valve.tag=Supply water!
-hints.valve.desc=Almost all farms require water. Use valve blocks for automation.
-hints.fertilizer.tag=Fertilizer needed!
-hints.fertilizer.desc=All farms need fertilizer to work. Compost or mulch will not suffice.
-hints.hatch.tag=Batten down the hatches!
-hints.hatch.desc=Hatches are a pipe or tube's best friend. Use them to automate transport.
-hints.circuitboard.tag=Program your farms!
-hints.circuitboard.desc=Use a soldering iron to turn your tree farm into any kind of farm you like.
-hints.manualfarms.tag=Manual farms!
-hints.manualfarms.desc=Apart from the managed farms there are manual farms which will only maintain the farm, but not build it.
-hints.farmgui.tag=Soil goes left, seeds go right!
-hints.farmgui.desc=Soil goes into the left slots, seeds or saplings into the right slots of the reservoir on the top right part. 
-layout.farms.managed=Managed Farms
-layout.farms.manual=Manual Farms
-tile.ffarm.0=Farm Block
-tile.ffarm.2=Farm Gearbox
-tile.ffarm.3=Farm Hatch
-tile.ffarm.4=Farm Valve
-tile.ffarm.5=Farm Control
-trigger.lowSoil=Soil
-trigger.lowLiquid=Water Tank
-trigger.lowFertilizer=Fertilizer
-usage.farms.managed=Managed Farm
-usage.farms.manual=Manual Farm
@@ -1,8 +0,0 @@
-gui.flutterlyzer.help=Supply butterfly and provide honey or honeydew as a pacifier.
-gui.loot.butterfly=Possible Butterfly Loot
-gui.loot.caterpillar=Possible Caterpillar Loot
-item.butterfly=Butterfly
-item.moth=Moth
-item.flutterlyzer=Flutterlyzer
-storage.backpack.lepidopterist=Lepidopterist's Backpack
-tile.for.lepidopterology.0=Lepidopterist's Chest
@@ -1,23 +0,0 @@
-chat.mail.no_mailbox=Recipient has no mailbox.
-chat.mail.not_mailable=Letter is not sendable.
-chat.mail.not_postpaid=Letter is not sufficiently stamped.
-chat.mail.mailbox_full=Recipient's mailbox is full.
-chat.mail.already_mailed=Cannot resend letter.
-chat.mail.response_not_mailable=Trade station cannot send the response letter. You need to have a mailbox to deliver to.
-chat.mail.insufficient_offer=Trade station demands more.
-chat.mail.insufficient_trade_good=Trade station has run out of supplies.
-chat.mail.insufficient_buffer=Trade station is full.
-chat.mail.insufficient_paper=Trade station ran out of paper.
-chat.mail.insufficient_stamps=Trade station ran out of stamps.
-chat.mail.ok=Trade is available.
-chat.mail.wrongstacksize=Can only write one letter at a time.
-gui.mail.catalogue.close=Close
-gui.mail.catalogue.trade=Trade
-gui.mail.filter.all=All
-gui.mail.filter.online=Online
-gui.mail.filter.offline=Offline
-gui.mail.willtrade=%s will trade
-gui.mail.address.copy=Use
-gui.mail.tradefor=for
-gui.mail.notrades=No trades available.
-item.catalogue=Catalogue
@@ -1,2 +0,0 @@
-
-item.PipeItemsPropolis=Apiarist's Pipe
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 by SirSengir
- * 
- * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported License.
- * 
- * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/3.0/.
- ******************************************************************************/
-package forestry.pipes;
-
-import java.util.ArrayList;
-import java.util.LinkedList;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.ForgeDirection;
-import buildcraft.api.core.IIconProvider;
-import buildcraft.api.core.Position;
-import buildcraft.transport.BlockGenericPipe;
-import buildcraft.transport.IPipeTransportItemsHook;
-import buildcraft.transport.Pipe;
-import buildcraft.transport.PipeTransportItems;
-import buildcraft.transport.TransportConstants;
-import buildcraft.transport.TravelingItem;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import forestry.api.apiculture.IBee;
-import forestry.api.core.ForestryAPI;
-import forestry.api.genetics.IAllele;
-import forestry.core.network.GuiId;
-import forestry.core.proxy.Proxies;
-import forestry.plugins.PluginApiculture;
-
-public class PipeItemsPropolis extends Pipe<PipeTransportItems> implements IPipeTransportItemsHook {
-
-	public final PipeLogicPropolis pipeLogic;
-
-	public PipeItemsPropolis(int itemID) {
-		super(new PipeTransportItems(), itemID);
-		pipeLogic = new PipeLogicPropolis(this);
-		transport.allowBouncing = true;
-	}
-
-	@Override
-	public void readFromNBT(NBTTagCompound nbt) {
-		super.readFromNBT(nbt);
-		pipeLogic.readFromNBT(nbt);
-	}
-
-	@Override
-	public void writeToNBT(NBTTagCompound nbt) {
-		super.writeToNBT(nbt);
-		pipeLogic.writeToNBT(nbt);
-	}
-	IIconProvider provider;
-
-	@SideOnly(Side.CLIENT)
-	@Override
-	public IIconProvider getIconProvider() {
-		if (provider == null)
-			provider = new PipeIconProvider();
-
-		return provider;
-	}
-
-	@Override
-	public int getIconIndex(ForgeDirection direction) {
-		if (direction == ForgeDirection.UNKNOWN)
-			return 0;
-
-		return direction.ordinal() + 1;
-	}
-
-	@Override
-	public boolean blockActivated(EntityPlayer player) {
-		if (!Proxies.common.isSimulating(getWorld()))
-			return true;
-
-		if (player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().itemID < Block.blocksList.length)
-			if (Block.blocksList[player.getCurrentEquippedItem().itemID] instanceof BlockGenericPipe)
-				return false;
-
-		player.openGui(ForestryAPI.instance, GuiId.PropolisPipeGUI.ordinal(), player.worldObj, container.xCoord, container.yCoord, container.zCoord);
-
-		return true;
-	}
-
-	@Override
-	public LinkedList<ForgeDirection> filterPossibleMovements(LinkedList<ForgeDirection> possibleOrientations, Position pos, TravelingItem item) {
-
-		LinkedList<ForgeDirection> filteredOrientations = new LinkedList<ForgeDirection>();
-		LinkedList<ForgeDirection> typedOrientations = new LinkedList<ForgeDirection>();
-		LinkedList<ForgeDirection> defaultOrientations = new LinkedList<ForgeDirection>();
-
-		// We need a bee!
-		EnumFilterType type = EnumFilterType.getType(item.getItemStack());
-		IBee bee = null;
-
-		if (type != EnumFilterType.ITEM)
-			bee = PluginApiculture.beeInterface.getMember(item.getItemStack());
-
-		// Filtered outputs
-		for (ForgeDirection dir : possibleOrientations) {
-
-			// Continue if this direction is closed.
-			if (pipeLogic.isClosed(dir))
-				continue;
-
-			if (pipeLogic.isIndiscriminate(dir)) {
-				defaultOrientations.add(dir);
-				continue;
-			}
-
-			// We need to match the type for this orientation's filter
-			if (!pipeLogic.matchType(dir, type, bee))
-				continue;
-
-			// Passing the type filter is enough for non-bee items.
-			if (type == EnumFilterType.ITEM) {
-				filteredOrientations.add(dir);
-				continue;
-			}
-
-			ArrayList<IAllele[]> filters = pipeLogic.getGenomeFilters(dir);
-			// If we have no genome filters, this is only a typed route.
-			if (filters.size() <= 0) {
-				typedOrientations.add(dir);
-				continue;
-			}
-
-			// Bees need to match one of the genome filters
-			for (IAllele[] pattern : filters) {
-				if (pipeLogic.matchAllele(pattern[0], bee.getIdent()) && pipeLogic.matchAllele(pattern[1], bee.getGenome().getSecondary().getUID()))
-					filteredOrientations.add(dir);
-			}
-		}
-
-		if (filteredOrientations.size() > 0)
-			return filteredOrientations;
-		else if (typedOrientations.size() > 0)
-			return typedOrientations;
-		else
-			return defaultOrientations;
-
-	}
-
-	@Override
-	public void entityEntered(TravelingItem item, ForgeDirection orientation) {
-		// A bit of speed to perhaps prevent bees from popping out of the pipe.
-		try {
-			item.setSpeed(TransportConstants.PIPE_NORMAL_SPEED * 20F);
-		} catch (Throwable error) {
-		}
-	}
-
-	@Override
-	public void readjustSpeed(TravelingItem item) {
-		transport.defaultReajustSpeed(item);
-	}
-}
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 by SirSengir
- * 
- * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported License.
- * 
- * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/3.0/.
- ******************************************************************************/
-package forestry.pipes.proxy;
-
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.client.IItemRenderer;
-import buildcraft.BuildCraftTransport;
-import buildcraft.transport.BlockGenericPipe;
-import buildcraft.transport.Pipe;
-import cpw.mods.fml.common.registry.GameRegistry;
-import forestry.pipes.PipeItemsPropolis;
-import forestry.plugins.PluginPropolisPipe;
-
-public class ProxyPipes {
-
-	public void registerCustomItemRenderer(int itemID, IItemRenderer basemod) {
-	}
-
-	public void initPropolisPipe() {
-		PluginPropolisPipe.pipeItemsPropolis = createPipe(PluginPropolisPipe.propolisPipeItemId, PipeItemsPropolis.class, "Apiarist's Pipe");
-	}
-
-	public Item createPipe(int id, Class<? extends Pipe> clas, String description) {
-
-		Item pipe = BlockGenericPipe.registerPipe(id, clas);
-		pipe.setUnlocalizedName(clas.getSimpleName());
-
-		return pipe;
-	}
-
-	public void registerCraftingPropolis(ItemStack resource) {
-		GameRegistry.addRecipe(new ItemStack(PluginPropolisPipe.pipeItemsPropolis),
-				new Object[] { "#X#", Character.valueOf('#'), resource, Character.valueOf('X'), BuildCraftTransport.pipeItemsDiamond });
-
-	}
-
-	public void addLocalizations() {
-	}
-}
@@ -57,7 +57,7 @@ public class BlockBeehives extends BlockContainer {
 	}

 	@Override
-	public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) {
+	public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) {
 		if (canHarvestBlock(player, world.getBlockMetadata(x, y, z))) {
 			// Handle TE'd beehives
 			TileEntity tile = world.getTileEntity(x, y, z);
@@ -24,17 +24,13 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraftforge.common.util.ForgeDirection;
-import buildcraft.api.inventory.ISpecialInventory;
 import forestry.api.apiculture.IBee;
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.apiculture.IBeeListener;
 import forestry.api.apiculture.IBeeModifier;
 import forestry.api.apiculture.IBeekeepingLogic;
-import forestry.api.core.EnumHumidity;
-import forestry.api.core.EnumTemperature;
-import forestry.api.core.ForestryAPI;
-import forestry.api.core.ITileStructure;
+import forestry.api.core.*;
 import forestry.api.genetics.IIndividual;
 import forestry.apiculture.gui.ContainerAlveary;
 import forestry.core.EnumErrorCode;
@@ -21,14 +21,13 @@ import net.minecraft.nbt.NBTTagList;

 import net.minecraftforge.common.util.ForgeDirection;

-import buildcraft.api.inventory.ISpecialInventory;
-
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.EnumBeeType;
 import forestry.api.apiculture.IAlvearyComponent;
 import forestry.api.apiculture.IBee;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.core.ForestryAPI;
+import forestry.api.core.ISpecialInventory;
 import forestry.apiculture.worldgen.WorldGenHive;
 import forestry.apiculture.worldgen.WorldGenHiveSwamer;
 import forestry.core.network.GuiId;