From 94bd65ee8effbacfd90a5223550ab3c61c7d30b5 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 2 Jun 2016 16:24:00 -0700 Subject: [PATCH] Improve greenhouse error messages. --- lang | 2 +- .../greenhouse/multiblock/GreenhouseController.java | 8 ++++---- .../multiblock/GreenhouseMultiblockSizeLimits.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lang b/lang index 53d7c93f9..0e7f1e47f 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 53d7c93f905f9d02c8ccd17976d4f927daa39653 +Subproject commit 0e7f1e47f1b7b26ae58a8dc08c24e9f296bfec74 diff --git a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java index e7acff568..7522f1318 100644 --- a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java +++ b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java @@ -515,10 +515,6 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im int minX = getSizeLimits().getMinimumXSize(); int minY = getSizeLimits().getMinimumYSize(); int minZ = getSizeLimits().getMinimumZSize(); - - if (connectedParts.size() < getSizeLimits().getMinimumNumberOfBlocksForAssembledMachine()) { - throw new MultiblockValidationException(Translator.translateToLocalFormatted("for.multiblock.error.small", minX, minY, minZ)); - } BlockPos maximumCoord = getMaximumCoord(); BlockPos minimumCoord = getMinimumCoord(); @@ -551,6 +547,10 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im throw new MultiblockValidationException(Translator.translateToLocalFormatted("for.multiblock.error.small.z", minZ)); } + if (connectedParts.size() < getSizeLimits().getMinimumNumberOfBlocksForAssembledMachine()) { + throw new MultiblockValidationException(Translator.translateToLocalFormatted("for.multiblock.greenhouse.error.space.closed", minX, minY, minZ)); + } + // Now we run a simple check on each block within that volume. // Any block deviating = NO DEAL SIR TileEntity te; diff --git a/src/main/java/forestry/greenhouse/multiblock/GreenhouseMultiblockSizeLimits.java b/src/main/java/forestry/greenhouse/multiblock/GreenhouseMultiblockSizeLimits.java index 22629a967..dca4f9194 100644 --- a/src/main/java/forestry/greenhouse/multiblock/GreenhouseMultiblockSizeLimits.java +++ b/src/main/java/forestry/greenhouse/multiblock/GreenhouseMultiblockSizeLimits.java @@ -21,7 +21,7 @@ class GreenhouseMultiblockSizeLimits implements IMultiblockSizeLimits { @Override public int getMinimumNumberOfBlocksForAssembledMachine() { - return 5 * 5 * 5 - 36; + return (5 * 5 * 5) - (3 * 3 * 3); } @Override