From c5798af241435458c94a6ec2c50a607aae26ee7e Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sat, 24 Dec 2016 02:57:15 +0100 Subject: [PATCH] Clean Up --- src/main/java/forestry/api/greenhouse/IGreenhouseHelper.java | 4 ++-- .../java/forestry/core/multiblock/MultiblockRegistry.java | 3 +-- src/main/java/forestry/greenhouse/GreenhouseHelper.java | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/forestry/api/greenhouse/IGreenhouseHelper.java b/src/main/java/forestry/api/greenhouse/IGreenhouseHelper.java index 99a9ac992..b80623e9e 100644 --- a/src/main/java/forestry/api/greenhouse/IGreenhouseHelper.java +++ b/src/main/java/forestry/api/greenhouse/IGreenhouseHelper.java @@ -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 logic); diff --git a/src/main/java/forestry/core/multiblock/MultiblockRegistry.java b/src/main/java/forestry/core/multiblock/MultiblockRegistry.java index 7edf3a7a3..89059b1a7 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockRegistry.java +++ b/src/main/java/forestry/core/multiblock/MultiblockRegistry.java @@ -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 getControllersFromWorld(IBlockAccess world) { + public static Set getControllersFromWorld(World world) { if (registries.containsKey(world)) { return registries.get(world).getControllers(); } diff --git a/src/main/java/forestry/greenhouse/GreenhouseHelper.java b/src/main/java/forestry/greenhouse/GreenhouseHelper.java index 60a9854ac..056d6efd6 100644 --- a/src/main/java/forestry/greenhouse/GreenhouseHelper.java +++ b/src/main/java/forestry/greenhouse/GreenhouseHelper.java @@ -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() &&