From 358e7853c2b8645265cf0820f5c970206f3245f9 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 2 Jun 2016 11:39:58 -0700 Subject: [PATCH] Fix #1268 NoSuchMethodError on Server Startup --- gradle.properties | 2 +- .../forestry/apiculture/PluginApiculture.java | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 556d6d658..6037b002a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,4 +6,4 @@ jei_version=3.4.0.+ version_major=5 version_minor=0 -version_patch=2 +version_patch=3 diff --git a/src/main/java/forestry/apiculture/PluginApiculture.java b/src/main/java/forestry/apiculture/PluginApiculture.java index 0dc745ec8..9930e742b 100644 --- a/src/main/java/forestry/apiculture/PluginApiculture.java +++ b/src/main/java/forestry/apiculture/PluginApiculture.java @@ -14,6 +14,7 @@ import com.google.common.collect.ImmutableMap; import java.io.File; import java.util.ArrayList; +import java.util.EnumSet; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -328,14 +329,21 @@ public class PluginApiculture extends BlankForestryPlugin { flowerRegistry.registerAcceptableFlower(Blocks.CACTUS, FlowerManager.FlowerTypeCacti); // Register plantable plants - BlockRedFlower blockRedFlower = (BlockRedFlower) Blocks.RED_FLOWER; - IBlockState defaultState = blockRedFlower.getDefaultState(); - for (BlockFlower.EnumFlowerType flowerType : BlockFlower.EnumFlowerType.getTypes(BlockFlower.EnumFlowerColor.RED)) { - IBlockState blockState = defaultState.withProperty(blockRedFlower.getTypeProperty(), flowerType); + for (BlockFlower.EnumFlowerType flowerType : BlockFlower.EnumFlowerType.values()) { + IBlockState blockState; + switch (flowerType.getBlockType()) { + case RED: + blockState = Blocks.RED_FLOWER.getDefaultState().withProperty(Blocks.RED_FLOWER.getTypeProperty(), flowerType); + break; + case YELLOW: + blockState = Blocks.YELLOW_FLOWER.getDefaultState().withProperty(Blocks.YELLOW_FLOWER.getTypeProperty(), flowerType); + break; + default: + continue; + } flowerRegistry.registerPlantableFlower(blockState, 1.0, FlowerManager.FlowerTypeVanilla, FlowerManager.FlowerTypeSnow); } - flowerRegistry.registerPlantableFlower(Blocks.YELLOW_FLOWER.getDefaultState(), 1.0, FlowerManager.FlowerTypeVanilla, FlowerManager.FlowerTypeSnow); flowerRegistry.registerPlantableFlower(Blocks.BROWN_MUSHROOM.getDefaultState(), 1.0, FlowerManager.FlowerTypeMushrooms); flowerRegistry.registerPlantableFlower(Blocks.RED_MUSHROOM.getDefaultState(), 1.0, FlowerManager.FlowerTypeMushrooms); flowerRegistry.registerPlantableFlower(Blocks.CACTUS.getDefaultState(), 1.0, FlowerManager.FlowerTypeCacti);