This commit is contained in:
Nedelosk committed 2016-12-24 02:57:15 +01:00
1 parent e0bff8ec64
commit c5798af241
3 files changed
+5 -6

No files matched your search

@@ -10,7 +10,7 @@ import java.util.List;
import forestry.api.multiblock.IGreenhouseController;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
public interface IGreenhouseHelper {
@@ -18,7 +18,7 @@ public interface IGreenhouseHelper {
* @return A {@link IGreenhouseController} of a greenhouse, when the pos is a greenhouse
*/
@Nullable
IGreenhouseController getGreenhouseController(IBlockAccess world, BlockPos pos);
IGreenhouseController getGreenhouseController(World world, BlockPos pos);
void addGreenhouseLogic(Class<? extends IGreenhouseLogic> logic);
@@ -7,7 +7,6 @@ import java.util.Set;
import com.google.common.collect.ImmutableSet;
import forestry.api.multiblock.IMultiblockComponent;
import forestry.core.utils.Log;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
/**
@@ -117,7 +116,7 @@ public class MultiblockRegistry {
* @param world The world whose controllers you wish to retrieve.
* @return An unmodifiable set of controllers active in the given world.
*/
public static Set<IMultiblockControllerInternal> getControllersFromWorld(IBlockAccess world) {
public static Set<IMultiblockControllerInternal> getControllersFromWorld(World world) {
if (registries.containsKey(world)) {
return registries.get(world).getControllers();
}
@@ -23,7 +23,7 @@ import forestry.core.multiblock.MultiblockRegistry;
import forestry.greenhouse.multiblock.IGreenhouseControllerInternal;
import forestry.greenhouse.multiblock.InternalBlockCheck;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
public class GreenhouseHelper implements IGreenhouseHelper {
@@ -31,7 +31,7 @@ public class GreenhouseHelper implements IGreenhouseHelper {
@Override
@Nullable
public IGreenhouseController getGreenhouseController(IBlockAccess world, BlockPos pos) {
public IGreenhouseController getGreenhouseController(World world, BlockPos pos) {
for (IMultiblockControllerInternal controllerInternal : MultiblockRegistry.getControllersFromWorld(world)) {
if (controllerInternal instanceof IGreenhouseControllerInternal &&
controllerInternal.isAssembled() &&