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

Fix #517 NPE crash when disabling the storage module

Browse Source
This commit is contained in:
mezz committed 2015-02-18 00:03:56 -08:00
1 parent af59a2ad6a
commit 298795690e
1 file changed
+8 -10
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/forestry/plugins/PluginArboriculture.java
+8 -10
View File
@@ -338,16 +338,6 @@ public class PluginArboriculture extends ForestryPlugin {
Proxies.render.registerVillagerSkin(Defaults.ID_VILLAGER_LUMBERJACK, Defaults.TEXTURE_SKIN_LUMBERJACK);
VillagerRegistry.instance().registerVillageTradeHandler(Defaults.ID_VILLAGER_LUMBERJACK, new VillageHandlerArboriculture());
}
if (PluginManager.Module.FACTORY.isEnabled()) {
ICrateRegistry crateRegistry = StorageManager.crateRegistry;
crateRegistry.registerCrate(EnumFruit.CHERRY.getStack(), "cratedCherry");
crateRegistry.registerCrate(EnumFruit.WALNUT.getStack(), "cratedWalnut");
crateRegistry.registerCrate(EnumFruit.CHESTNUT.getStack(), "cratedChestnut");
crateRegistry.registerCrate(EnumFruit.LEMON.getStack(), "cratedLemon");
crateRegistry.registerCrate(EnumFruit.PLUM.getStack(), "cratedPlum");
crateRegistry.registerCrate(EnumFruit.PAPAYA.getStack(), "cratedPapaya");
crateRegistry.registerCrate(EnumFruit.DATES.getStack(), "cratedDates");
}
}
@Override
@@ -402,6 +392,14 @@ public class PluginArboriculture extends ForestryPlugin {
@Override
protected void registerCrates() {
ICrateRegistry crateRegistry = StorageManager.crateRegistry;
crateRegistry.registerCrate(EnumFruit.CHERRY.getStack(), "cratedCherry");
crateRegistry.registerCrate(EnumFruit.WALNUT.getStack(), "cratedWalnut");
crateRegistry.registerCrate(EnumFruit.CHESTNUT.getStack(), "cratedChestnut");
crateRegistry.registerCrate(EnumFruit.LEMON.getStack(), "cratedLemon");
crateRegistry.registerCrate(EnumFruit.PLUM.getStack(), "cratedPlum");
crateRegistry.registerCrate(EnumFruit.PAPAYA.getStack(), "cratedPapaya");
crateRegistry.registerCrate(EnumFruit.DATES.getStack(), "cratedDates");
}
@Override