Merge branch 'mc-1.10' of https://github.com/ForestryMC/ForestryMC into mc-1.10

This commit is contained in:
Nedelosk committed 2016-09-12 14:47:01 +02:00
commit 418f00abf2
25 files changed
+244 -257

No files matched your search

@@ -5,15 +5,10 @@
******************************************************************************/
package forestry.api.climate;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import forestry.api.core.ILocatable;
public interface IClimateControlProvider {
public interface IClimateControlProvider extends ILocatable {
IClimateControl getClimateControl();
World getWorld();
BlockPos getCoordinates();
}
@@ -9,13 +9,13 @@ package forestry.api.climate;
* A climate source is used to change the climate in a region.
*/
public interface IClimateSource {
/**
* @param tickCount The current tick count.
* @param region The climate region, in that the source stands.
*/
void changeClimate(int tickCount, IClimateRegion region);
/**
* @return The ticks that are required for one change.
*/
@@ -5,15 +5,9 @@
******************************************************************************/
package forestry.api.climate;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import forestry.api.core.ILocatable;
public interface IClimateSourceProvider {
public interface IClimateSourceProvider extends ILocatable {
IClimateSource getClimateSource();
World getWorld();
BlockPos getCoordinates();
}
@@ -6,21 +6,19 @@
package forestry.api.core;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public interface ICamouflageHandler{
public interface ICamouflageHandler extends ILocatable {
/**
* @return The item of the block that is the camouflage of this handler for the type.
*/
ItemStack getCamouflageBlock(String type);
/**
* @return The default camouflage block item for the type.
*/
ItemStack getDefaultCamouflageBlock(String type);
/**
* @return True if the handler can handle this type of camouflage.
*/
@@ -30,11 +28,4 @@ public interface ICamouflageHandler{
* Set the camouflage block item for the type.
*/
void setCamouflageBlock(String type, ItemStack camouflageBlock);
/**
* @return The coordinates of the handler as a BlockPos.
*/
BlockPos getCoordinates();
World getWorld();
}
@@ -0,0 +1,21 @@
/*******************************************************************************
* 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.api.core;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public interface ILocatable {
BlockPos getCoordinates();
/** Must not be named "getWorld" to avoid SpecialSource issue https://github.com/md-5/SpecialSource/issues/12 */
World getWorldObj();
}