Fix #1362 Crash on Startup when disabling Lepidopterology module

This commit is contained in:
mezz committed 2016-07-23 03:43:42 -07:00
1 parent 84af238d82
commit 2cc2540bdc
4 files changed
+37 -31

No files matched your search

@@ -10,6 +10,7 @@
******************************************************************************/
package forestry.greenhouse;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
@@ -71,23 +72,23 @@ public class PluginGreenhouse extends BlankForestryPlugin {
@Override
public void registerRecipes() {
ItemStack greenhousePlainBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN);
Block greenhousePlainBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN);
RecipeUtil.addRecipe(greenhousePlainBlock,
"###",
"#X#",
"###",
'X', Blocks.BRICK_BLOCK,
'#', PluginCore.items.craftingMaterial.getCamouflagedPaneling());
ItemStack greenhouseGlassBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.GLASS);
Block greenhouseGlassBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.GLASS);
RecipeUtil.addRecipe(greenhouseGlassBlock,
"###",
"#X#",
"###",
'X', "blockGlass",
'#', PluginCore.items.craftingMaterial.getCamouflagedPaneling());
ItemStack greenhouseHatchInputBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.HATCH_INPUT);
Block greenhouseHatchInputBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.HATCH_INPUT);
RecipeUtil.addRecipe(greenhouseHatchInputBlock,
"TXT",
"#H#",
@@ -95,8 +96,8 @@ public class PluginGreenhouse extends BlankForestryPlugin {
'H', OreDictUtil.TRAPDOOR_WOOD,
'#', "gearTin",
'T', PluginCore.items.tubes.get(EnumElectronTube.BRONZE, 1));
ItemStack greenhouseHatchOutputBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.HATCH_OUTPUT);
Block greenhouseHatchOutputBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.HATCH_OUTPUT);
RecipeUtil.addRecipe(greenhouseHatchOutputBlock,
"#H#",
"TXT",
@@ -104,31 +105,31 @@ public class PluginGreenhouse extends BlankForestryPlugin {
'H', OreDictUtil.TRAPDOOR_WOOD,
'#', "gearTin",
'T', PluginCore.items.tubes.get(EnumElectronTube.BRONZE, 1));
ItemStack greenhouseControlBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.CONTROL);
Block greenhouseControlBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.CONTROL);
RecipeUtil.addRecipe(greenhouseControlBlock,
" X ",
"#T#",
'X', blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN),
'#', "dustRedstone",
'T', PluginCore.items.tubes.get(EnumElectronTube.GOLD, 1));
ItemStack greenhouseGearBoxBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.GEARBOX);
Block greenhouseGearBoxBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.GEARBOX);
RecipeUtil.addRecipe(greenhouseGearBoxBlock,
" X ",
"###",
'X', blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN),
'#', "gearTin");
ItemStack greenhouseValveBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.VALVE);
Block greenhouseValveBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.VALVE);
RecipeUtil.addRecipe(greenhouseValveBlock,
" X ",
"#G#",
'X', blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN),
'#', "blockGlass",
'G', "gearTin");
ItemStack greenhouseHeaterBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.HEATER);
Block greenhouseHeaterBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.HEATER);
RecipeUtil.addRecipe(greenhouseHeaterBlock,
"T#T",
"#X#",
@@ -136,8 +137,8 @@ public class PluginGreenhouse extends BlankForestryPlugin {
'X', blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN),
'#', "ingotGold",
'T', PluginCore.items.tubes.get(EnumElectronTube.GOLD, 1));
ItemStack greenhouseFanlock = blocks.getGreenhouseBlock(BlockGreenhouseType.FAN);
Block greenhouseFanlock = blocks.getGreenhouseBlock(BlockGreenhouseType.FAN);
RecipeUtil.addRecipe(greenhouseFanlock,
"T#T",
"#X#",
@@ -145,8 +146,8 @@ public class PluginGreenhouse extends BlankForestryPlugin {
'X', blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN),
'#', "ingotTin",
'T', PluginCore.items.tubes.get(EnumElectronTube.TIN, 1));
ItemStack greenhouseDryerBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.DRYER);
Block greenhouseDryerBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.DRYER);
RecipeUtil.addRecipe(greenhouseDryerBlock,
"T#T",
"#X#",
@@ -154,8 +155,8 @@ public class PluginGreenhouse extends BlankForestryPlugin {
'X', blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN),
'#', "ingotBronze",
'T', PluginCore.items.tubes.get(EnumElectronTube.BLAZE, 1));
ItemStack greenhouseSprinklerBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.SPRINKLER);
Block greenhouseSprinklerBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.SPRINKLER);
RecipeUtil.addRecipe(greenhouseSprinklerBlock,
"TXT",
" I ",
@@ -163,14 +164,15 @@ public class PluginGreenhouse extends BlankForestryPlugin {
'X', blocks.getGreenhouseBlock(BlockGreenhouseType.GLASS),
'I', "ingotIron",
'T', PluginCore.items.tubes.get(EnumElectronTube.LAPIS, 1));
ItemStack greenhouseDoorBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.DOOR);
Block greenhouseDoorBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.DOOR);
RecipeUtil.addRecipe(greenhouseDoorBlock,
true,
"GG ",
"GG ",
"GG ",
'G', blocks.getGreenhouseBlock(BlockGreenhouseType.GLASS));
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)) {
RecipeManagers.carpenterManager.addRecipe(50, Fluids.BIOMASS.getFluid(500), null, PluginCore.items.craftingMaterial.getCamouflagedPaneling(),
" A ", "###", "RPR",
@@ -1,9 +1,9 @@
package forestry.greenhouse.blocks;
import javax.annotation.Nullable;
import java.util.Map;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import forestry.core.blocks.BlockRegistry;
import forestry.core.items.ItemBlockForestry;
@@ -24,9 +24,8 @@ public class BlockRegistryGreenhouse extends BlockRegistry {
}
}
public ItemStack getGreenhouseBlock(BlockGreenhouseType type) {
BlockGreenhouse greenhouseBlock = greenhouseBlockMap.get(type);
return new ItemStack(greenhouseBlock);
public BlockGreenhouse getGreenhouseBlock(BlockGreenhouseType type) {
return greenhouseBlockMap.get(type);
}
}
@@ -34,9 +34,14 @@ public class ProxyGreenhouseClient extends ProxyGreenhouse {
ClientRegistry.bindTileEntitySpecialRenderer(TileGreenhouseSprinkler.class, new AnimationTESR<>());
continue;
}
Proxies.render.registerBlockModel(new BlockModelIndex(new ModelResourceLocation("forestry:greenhouse." + greenhouseType),
new ModelResourceLocation("forestry:greenhouse", "inventory"), new ModelGreenhouse(),
Block.getBlockFromItem(PluginGreenhouse.blocks.getGreenhouseBlock(greenhouseType).getItem())));
Block greenhouseBlock = PluginGreenhouse.blocks.getGreenhouseBlock(greenhouseType);
if (greenhouseBlock != null) {
ModelResourceLocation blockModelLocation = new ModelResourceLocation("forestry:greenhouse." + greenhouseType);
ModelResourceLocation itemModelLocation = new ModelResourceLocation("forestry:greenhouse", "inventory");
BlockModelIndex blockModelIndex = new BlockModelIndex(blockModelLocation, itemModelLocation, new ModelGreenhouse(), greenhouseBlock);
Proxies.render.registerBlockModel(blockModelIndex);
}
}
}
}