upstream/ForestryMC
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/ForestryMC.git synced 2026-11-14 01:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

#773 try to catch the cause of the apiculture config crash

Browse Source
This commit is contained in:
mezz committed 2015-08-08 15:51:43 -07:00
1 parent 44538c1e03
commit b1db58b8a4
3 files changed
+22 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/forestry/plugins/PluginApiculture.java
+9 -4
View File
@@ -319,7 +319,7 @@ public class PluginApiculture extends ForestryPlugin {
}
Property property = config.get("beekeeping.flowers." + flowerType, "accepted", defaultAccepted);
property.comment = acceptedFlowerMessage;
parseAcceptedFlowers(property, flowerType);
parseAcceptedFlowers(property.getStringList(), flowerType);
String[] defaultPlantable = defaultPlantableFlowers.get(flowerType);
if (defaultPlantable == null) {
@@ -429,6 +429,11 @@ public class PluginApiculture extends ForestryPlugin {
if (flowers != null) {
for (IFlower flower : flowers) {
String name = flower.getBlock().delegate.name();
if (name == null) {
Proxies.log.warning("Could not find name for flower: " + flower + " with type: " + flowerType);
continue;
}
int meta = flower.getMeta();
if (flower.getMeta() != OreDictionary.WILDCARD_VALUE) {
name = name + ':' + meta;
@@ -1007,15 +1012,15 @@ public class PluginApiculture extends ForestryPlugin {
}
}
private static void parseAcceptedFlowers(Property property, String flowerType) {
List<StackUtils.Stack> acceptedFlowerItemStacks = StackUtils.parseStackStrings(property.getStringList(), OreDictionary.WILDCARD_VALUE);
private static void parseAcceptedFlowers(String[] acceptedFlowers, String flowerType) {
List<StackUtils.Stack> acceptedFlowerItemStacks = StackUtils.parseStackStrings(acceptedFlowers, OreDictionary.WILDCARD_VALUE);
for (StackUtils.Stack acceptedFlower : acceptedFlowerItemStacks) {
Block acceptedFlowerBlock = acceptedFlower.getBlock();
int meta = acceptedFlower.getMeta();
if (acceptedFlowerBlock != null) {
FlowerManager.flowerRegistry.registerAcceptableFlower(acceptedFlowerBlock, meta, flowerType);
} else {
Proxies.log.warning("No block found for '" + acceptedFlower + "' in config '" + property.getName() + "'.");
Proxies.log.warning("No block found for '" + acceptedFlower + "' in apiculture config for '" + flowerType + "'.");
}
}
}