diff --git a/src/main/java/forestry/api/greenhouse/IGreenhouseState.java b/src/main/java/forestry/api/greenhouse/IGreenhouseState.java index a0e06c613..402868ed6 100644 --- a/src/main/java/forestry/api/greenhouse/IGreenhouseState.java +++ b/src/main/java/forestry/api/greenhouse/IGreenhouseState.java @@ -6,7 +6,7 @@ package forestry.api.greenhouse; import java.util.Collection; -import java.util.List; +import java.util.Set; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; @@ -22,7 +22,7 @@ public interface IGreenhouseState { float getExactHumidity(); - List getInternalBlocks(); + Set getInternalBlocks(); Collection getGreenhouseComponents(); diff --git a/src/main/java/forestry/greenhouse/FakeGreenhouseState.java b/src/main/java/forestry/greenhouse/FakeGreenhouseState.java index 18b45cdb4..83a962d06 100644 --- a/src/main/java/forestry/greenhouse/FakeGreenhouseState.java +++ b/src/main/java/forestry/greenhouse/FakeGreenhouseState.java @@ -12,7 +12,7 @@ package forestry.greenhouse; import java.util.Collection; import java.util.Collections; -import java.util.List; +import java.util.Set; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; @@ -45,8 +45,8 @@ public class FakeGreenhouseState implements IGreenhouseState { } @Override - public List getInternalBlocks() { - return Collections.emptyList(); + public Set getInternalBlocks() { + return Collections.emptySet(); } @Override diff --git a/src/main/java/forestry/greenhouse/GreenhouseState.java b/src/main/java/forestry/greenhouse/GreenhouseState.java index 85c889766..9b481a77d 100644 --- a/src/main/java/forestry/greenhouse/GreenhouseState.java +++ b/src/main/java/forestry/greenhouse/GreenhouseState.java @@ -11,7 +11,7 @@ package forestry.greenhouse; import java.util.Collection; -import java.util.List; +import java.util.Set; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; @@ -24,10 +24,10 @@ public final class GreenhouseState implements IGreenhouseState { private final float humidity; private final float temperature; - private final List internalBlocks; + private final Set internalBlocks; private final Collection greenhouseComponents; - public GreenhouseState(float humidity, float temperature, List internalBlocks, Collection greenhouseComponents) { + public GreenhouseState(float humidity, float temperature, Set internalBlocks, Collection greenhouseComponents) { this.humidity = humidity; this.temperature = temperature; this.internalBlocks = internalBlocks; @@ -59,7 +59,7 @@ public final class GreenhouseState implements IGreenhouseState { } @Override - public List getInternalBlocks() { + public Set getInternalBlocks() { return internalBlocks; } diff --git a/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java b/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java index a068e9668..2b072468a 100644 --- a/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java +++ b/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java @@ -13,6 +13,7 @@ package forestry.greenhouse.multiblock; import javax.annotation.Nonnull; import java.util.Collections; import java.util.List; +import java.util.Set; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -97,8 +98,8 @@ public class FakeGreenhouseController extends FakeMultiblockController implement } @Override - public List getInternalBlocks() { - return Collections.emptyList(); + public Set getInternalBlocks() { + return Collections.emptySet(); } @Override diff --git a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java index 39cd54df0..95883ef8a 100644 --- a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java +++ b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java @@ -19,7 +19,6 @@ import java.util.List; import java.util.Set; import java.util.Stack; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -78,7 +77,7 @@ import forestry.greenhouse.tiles.TileGreenhouseSprinkler; public class GreenhouseController extends RectangularMultiblockControllerBase implements IGreenhouseControllerInternal, ILiquidTankTile { - private final List internalBlocks = new ArrayList<>(); + private final Set internalBlocks = new HashSet<>(); private final Set listenerComponents = new HashSet<>(); private final Set climatiserComponents = new HashSet<>(); private final Set activeComponents = new HashSet<>(); @@ -745,7 +744,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im } @Override - public List getInternalBlocks() { + public Set getInternalBlocks() { return internalBlocks; } diff --git a/src/main/java/forestry/greenhouse/multiblock/IGreenhouseControllerInternal.java b/src/main/java/forestry/greenhouse/multiblock/IGreenhouseControllerInternal.java index 4aba839e7..65cb117b9 100644 --- a/src/main/java/forestry/greenhouse/multiblock/IGreenhouseControllerInternal.java +++ b/src/main/java/forestry/greenhouse/multiblock/IGreenhouseControllerInternal.java @@ -12,7 +12,7 @@ package forestry.greenhouse.multiblock; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.List; +import java.util.Set; import forestry.api.greenhouse.IGreenhouseState; import forestry.api.greenhouse.IInternalBlock; @@ -53,7 +53,7 @@ public interface IGreenhouseControllerInternal extends IGreenhouseController, IM IGreenhouseState createState(); /** - * @return A list with all internal block's of the greenhouse. + * @return All internal blocks of the greenhouse. */ - List getInternalBlocks(); + Set getInternalBlocks(); } diff --git a/src/main/java/forestry/greenhouse/multiblock/InternalBlock.java b/src/main/java/forestry/greenhouse/multiblock/InternalBlock.java index 798326d9a..0c21a034f 100644 --- a/src/main/java/forestry/greenhouse/multiblock/InternalBlock.java +++ b/src/main/java/forestry/greenhouse/multiblock/InternalBlock.java @@ -74,4 +74,9 @@ public class InternalBlock implements IInternalBlock { IInternalBlock internalBlock = (IInternalBlock) obj; return internalBlock.getPos().equals(getPos()); } + + @Override + public int hashCode() { + return pos.hashCode(); + } }