#1091 begin clean up for Alveary

Still needs to visually update when slabs are added or removed to the top
ForestryMC · Mar 12, 2016 · dd65d08 · dd65d08
1 parent e703536
commit dd65d08
Show file tree

Hide file tree

Showing 26 changed files with 192 additions and 187 deletions.
diff --git a/lang b/lang
diff --git a/src/main/java/forestry/apiculture/PluginApiculture.java b/src/main/java/forestry/apiculture/PluginApiculture.java
@@ -60,7 +60,7 @@
 import forestry.api.recipes.RecipeManagers;
 import forestry.api.storage.ICrateRegistry;
 import forestry.api.storage.StorageManager;
-import forestry.apiculture.blocks.BlockAlveary;
+import forestry.apiculture.blocks.BlockAlvearyType;
 import forestry.apiculture.blocks.BlockCandle;
 import forestry.apiculture.blocks.BlockRegistryApiculture;
 import forestry.apiculture.blocks.BlockTypeApiculture;
@@ -527,57 +527,58 @@ public void registerRecipes() {
 				'#', PluginCore.items.beeswax);
 
 		// / ALVEARY
-		RecipeUtil.addRecipe(blocks.alveary.get(BlockAlveary.AlvearyType.PLAIN),
+		ItemStack alvearyPlainBlock = blocks.getAlvearyBlock(BlockAlvearyType.PLAIN);
+		RecipeUtil.addRecipe(alvearyPlainBlock,
 				"###",
 				"#X#",
 				"###",
 				'X', PluginCore.items.impregnatedCasing,
 				'#', PluginCore.items.craftingMaterial.getScentedPaneling());
 		// SWARMER
-		RecipeUtil.addRecipe(blocks.alveary.get(BlockAlveary.AlvearyType.SWARMER),
+		RecipeUtil.addRecipe(blocks.getAlvearyBlock(BlockAlvearyType.SWARMER),
 				"#G#",
 				" X ",
 				"#G#",
 				'#', PluginCore.items.tubes.get(EnumElectronTube.DIAMOND, 1),
-				'X', blocks.alveary,
+				'X', alvearyPlainBlock,
 				'G', "ingotGold");
 		// FAN
-		RecipeUtil.addRecipe(blocks.alveary.get(BlockAlveary.AlvearyType.FAN),
+		RecipeUtil.addRecipe(blocks.getAlvearyBlock(BlockAlvearyType.FAN),
 				"I I",
 				" X ",
 				"I#I",
 				'#', PluginCore.items.tubes.get(EnumElectronTube.GOLD, 1),
-				'X', blocks.alveary,
+				'X', alvearyPlainBlock,
 				'I', "ingotIron");
 		// HEATER
-		RecipeUtil.addRecipe(blocks.alveary.get(BlockAlveary.AlvearyType.HEATER),
+		RecipeUtil.addRecipe(blocks.getAlvearyBlock(BlockAlvearyType.HEATER),
 				"#I#",
 				" X ",
 				"YYY",
 				'#', PluginCore.items.tubes.get(EnumElectronTube.GOLD, 1),
-				'X', blocks.alveary,
+				'X', alvearyPlainBlock,
 				'I', "ingotIron", 'Y', "stone");
 		// HYGROREGULATOR
-		RecipeUtil.addRecipe(blocks.alveary.get(BlockAlveary.AlvearyType.HYGRO),
+		RecipeUtil.addRecipe(blocks.getAlvearyBlock(BlockAlvearyType.HYGRO),
 				"GIG",
 				"GXG",
 				"GIG",
-				'X', blocks.alveary,
+				'X', alvearyPlainBlock,
 				'I', "ingotIron",
 				'G', "blockGlass");
 		// STABILISER
-		RecipeUtil.addRecipe(blocks.alveary.get(BlockAlveary.AlvearyType.STABILISER),
+		RecipeUtil.addRecipe(blocks.getAlvearyBlock(BlockAlvearyType.STABILISER),
 				"G G",
 				"GXG",
 				"G G",
-				'X', blocks.alveary,
+				'X', alvearyPlainBlock,
 				'G', "gemQuartz");
 		// SIEVE
-		RecipeUtil.addRecipe(blocks.alveary.get(BlockAlveary.AlvearyType.SIEVE),
+		RecipeUtil.addRecipe(blocks.getAlvearyBlock(BlockAlvearyType.SIEVE),
 				"III",
 				" X ",
 				"WWW",
-				'X', blocks.alveary,
+				'X', alvearyPlainBlock,
 				'I', "ingotIron",
 				'W', PluginCore.items.craftingMaterial.getWovenSilk());