diff --git a/api/forestry b/api/forestry index 1c9fb5e23..5cbc30fc7 160000 --- a/api/forestry +++ b/api/forestry @@ -1 +1 @@ -Subproject commit 1c9fb5e23ff45adc488f3db8436c5a862112e44d +Subproject commit 5cbc30fc7caf6d836a1c5a514fbb722b25f401aa diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlveary.java b/src/main/java/forestry/apiculture/multiblock/TileAlveary.java index 716f5097e..2e4103640 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlveary.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlveary.java @@ -10,14 +10,25 @@ ******************************************************************************/ package forestry.apiculture.multiblock; +import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; +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.core.EnumHumidity; +import forestry.api.core.EnumTemperature; +import forestry.api.core.IErrorLogic; import forestry.apiculture.blocks.BlockAlveary; import forestry.core.multiblock.MultiblockControllerBase; import forestry.core.multiblock.MultiblockValidationException; import forestry.core.multiblock.rectangular.RectangularMultiblockTileEntityBase; -public abstract class TileAlveary extends RectangularMultiblockTileEntityBase { +public abstract class TileAlveary extends RectangularMultiblockTileEntityBase implements IBeeHousing { public static final int PLAIN_META = 0; public static final int ENTRANCE_META = 1; @@ -95,4 +106,67 @@ public abstract class TileAlveary extends RectangularMultiblockTileEntityBase { } } + /* IHousing */ + @Override + public World getWorld() { + return getAlvearyController().getWorld(); + } + + @Override + public ChunkCoordinates getCoordinates() { + return getAlvearyController().getCoordinates(); + } + + @Override + public BiomeGenBase getBiome() { + return getAlvearyController().getBiome(); + } + + /* IBeeHousing */ + @Override + public Iterable getBeeModifiers() { + return getAlvearyController().getBeeModifiers(); + } + + @Override + public Iterable getBeeListeners() { + return getAlvearyController().getBeeListeners(); + } + + @Override + public IBeeHousingInventory getBeeInventory() { + return getAlvearyController().getBeeInventory(); + } + + @Override + public IBeekeepingLogic getBeekeepingLogic() { + return getAlvearyController().getBeekeepingLogic(); + } + + /* IClimatised */ + @Override + public EnumTemperature getTemperature() { + return getAlvearyController().getTemperature(); + } + + @Override + public EnumHumidity getHumidity() { + return getAlvearyController().getHumidity(); + } + + @Override + public int getBlockLightValue() { + return getAlvearyController().getBlockLightValue(); + } + + @Override + public boolean canBlockSeeTheSky() { + return getAlvearyController().canBlockSeeTheSky(); + } + + @Override + public IErrorLogic getErrorLogic() { + return getAlvearyController().getErrorLogic(); + } + } diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyPlain.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyPlain.java index d6042999f..903d8880e 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyPlain.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyPlain.java @@ -16,23 +16,12 @@ import java.util.Collection; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.Optional; -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.core.EnumHumidity; -import forestry.api.core.EnumTemperature; import forestry.api.core.ForestryAPI; -import forestry.api.core.IErrorLogic; import forestry.apiculture.trigger.ApicultureTriggers; import forestry.core.config.Config; import forestry.core.gui.IHintSource; @@ -53,7 +42,7 @@ import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.ITriggerProvider; @Optional.Interface(iface = "buildcraft.api.statements.ITriggerProvider", modid = "BuildCraftAPI|statements") -public class TileAlvearyPlain extends TileAlveary implements IBeeHousing, IClimatised, IHintSource, IStreamableGui, ITitled, ITriggerProvider { +public class TileAlvearyPlain extends TileAlveary implements IClimatised, IHintSource, IStreamableGui, ITitled, ITriggerProvider { @Override public void onMachineAssembled(MultiblockControllerBase controller) { @@ -139,64 +128,7 @@ public class TileAlvearyPlain extends TileAlveary implements IBeeHousing, IClima return res; } - /* IHousing */ - @Override - public World getWorld() { - return getAlvearyController().getWorld(); - } - - @Override - public ChunkCoordinates getCoordinates() { - return getAlvearyController().getCoordinates(); - } - - @Override - public BiomeGenBase getBiome() { - return getAlvearyController().getBiome(); - } - - /* IBeeHousing */ - @Override - public Iterable getBeeModifiers() { - return getAlvearyController().getBeeModifiers(); - } - - @Override - public Iterable getBeeListeners() { - return getAlvearyController().getBeeListeners(); - } - - @Override - public IBeeHousingInventory getBeeInventory() { - return getAlvearyController().getBeeInventory(); - } - - @Override - public IBeekeepingLogic getBeekeepingLogic() { - return getAlvearyController().getBeekeepingLogic(); - } - /* IClimatised */ - @Override - public EnumTemperature getTemperature() { - return getAlvearyController().getTemperature(); - } - - @Override - public EnumHumidity getHumidity() { - return getAlvearyController().getHumidity(); - } - - @Override - public int getBlockLightValue() { - return getAlvearyController().getBlockLightValue(); - } - - @Override - public boolean canBlockSeeTheSky() { - return getAlvearyController().canBlockSeeTheSky(); - } - @Override public float getExactTemperature() { return getAlvearyController().getExactTemperature(); @@ -206,10 +138,4 @@ public class TileAlvearyPlain extends TileAlveary implements IBeeHousing, IClima public float getExactHumidity() { return getAlvearyController().getExactHumidity(); } - - @Override - public IErrorLogic getErrorLogic() { - return getAlvearyController().getErrorLogic(); - } - } diff --git a/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatable.java b/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatable.java index 18de8309d..3054b7983 100644 --- a/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatable.java +++ b/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatable.java @@ -39,4 +39,9 @@ public class CheckPollinatable implements ICheckPollinatable { public boolean canMateWith(IIndividual pollen) { return pollinatable.canMateWith(pollen); } + + @Override + public boolean isPollinated() { + return pollinatable.isPollinated(); + } } diff --git a/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatableTree.java b/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatableTree.java index 36f8fa90f..c9f541b8f 100644 --- a/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatableTree.java +++ b/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatableTree.java @@ -47,4 +47,8 @@ public class CheckPollinatableTree implements ICheckPollinatable { return !tree.isGeneticEqual(pollen); } + @Override + public boolean isPollinated() { + return tree.getMate() != null; + } } diff --git a/src/main/java/forestry/arboriculture/genetics/pollination/FakePollinatable.java b/src/main/java/forestry/arboriculture/genetics/pollination/FakePollinatable.java index 746588c60..b8dd0871c 100644 --- a/src/main/java/forestry/arboriculture/genetics/pollination/FakePollinatable.java +++ b/src/main/java/forestry/arboriculture/genetics/pollination/FakePollinatable.java @@ -34,4 +34,9 @@ public class FakePollinatable implements IPollinatable { public void mateWith(IIndividual pollen) { } + + @Override + public boolean isPollinated() { + return checkPollinatable.isPollinated(); + } } diff --git a/src/main/java/forestry/arboriculture/genetics/pollination/ICheckPollinatable.java b/src/main/java/forestry/arboriculture/genetics/pollination/ICheckPollinatable.java index d443d2fd6..c1aeaab6b 100644 --- a/src/main/java/forestry/arboriculture/genetics/pollination/ICheckPollinatable.java +++ b/src/main/java/forestry/arboriculture/genetics/pollination/ICheckPollinatable.java @@ -38,4 +38,6 @@ public interface ICheckPollinatable { * @return true if mating is possible, false otherwise. */ boolean canMateWith(IIndividual pollen); + + boolean isPollinated(); } diff --git a/src/main/java/forestry/arboriculture/tiles/TileLeaves.java b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java index f78dea7f0..e16e87f5c 100644 --- a/src/main/java/forestry/arboriculture/tiles/TileLeaves.java +++ b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java @@ -258,7 +258,8 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru return damage > tree.getResilience(); } - private boolean isPollinated() { + @Override + public boolean isPollinated() { ITree tree = getTree(); return tree != null && !isDestroyed(tree, damage) && tree.getMate() != null; } @@ -576,5 +577,4 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru ITree tree = getTree(); return !isDecorative && !isDestroyed(tree, damage) && caterpillar == null; } - } diff --git a/src/main/java/forestry/arboriculture/tiles/TileTreeContainer.java b/src/main/java/forestry/arboriculture/tiles/TileTreeContainer.java index 27ae76e16..62b63045b 100644 --- a/src/main/java/forestry/arboriculture/tiles/TileTreeContainer.java +++ b/src/main/java/forestry/arboriculture/tiles/TileTreeContainer.java @@ -13,6 +13,7 @@ package forestry.arboriculture.tiles; import java.io.IOException; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTUtil; import net.minecraft.network.Packet; @@ -25,17 +26,19 @@ import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IAllele; import forestry.arboriculture.genetics.Tree; +import forestry.core.access.IOwnable; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.IStreamable; import forestry.core.network.PacketTileStream; +import forestry.core.utils.PlayerUtil; /** * This is the base TE class for any block that needs to contain tree genome information. * * @author SirSengir */ -public abstract class TileTreeContainer extends TileEntity implements IStreamable { +public abstract class TileTreeContainer extends TileEntity implements IStreamable, IOwnable { private ITree containedTree; private GameProfile owner; @@ -108,15 +111,27 @@ public abstract class TileTreeContainer extends TileEntity implements IStreamabl return this.containedTree; } - /* Owner */ + /* IOwnable */ + @Override public GameProfile getOwner() { return owner; } + @Override public void setOwner(GameProfile owner) { this.owner = owner; } + @Override + public boolean isOwned() { + return owner != null; + } + + @Override + public boolean isOwner(EntityPlayer player) { + return player != null && PlayerUtil.isSameGameProfile(player.getGameProfile(), owner); + } + /* UPDATING */ /**