Clean Up and Bug Fixes

This commit is contained in:
Nedelosk committed 2016-01-23 17:17:20 +01:00
1 parent 6390a0cd11
commit 02ec97b031
56 files changed
+538 -451

No files matched your search

@@ -520,14 +520,14 @@ public class PluginApiculture extends ForestryPlugin {
'#', PluginCore.items.beeswax);
// / ALVEARY
RecipeUtil.addRecipe(blocks.alveary.get(BlockAlveary.Type.PLAIN),
RecipeUtil.addRecipe(blocks.alveary.get(BlockAlveary.AlvearyType.PLAIN),
"###",
"#X#",
"###",
'X', PluginCore.items.impregnatedCasing,
'#', PluginCore.items.craftingMaterial.getScentedPaneling());
// SWARMER
RecipeUtil.addRecipe(blocks.alveary.get(BlockAlveary.Type.SWARMER),
RecipeUtil.addRecipe(blocks.alveary.get(BlockAlveary.AlvearyType.SWARMER),
"#G#",
" X ",
"#G#",
@@ -535,7 +535,7 @@ public class PluginApiculture extends ForestryPlugin {
'X', blocks.alveary,
'G', "ingotGold");
// FAN
RecipeUtil.addRecipe(blocks.alveary.get(BlockAlveary.Type.FAN),
RecipeUtil.addRecipe(blocks.alveary.get(BlockAlveary.AlvearyType.FAN),
"I I",
" X ",
"I#I",
@@ -543,7 +543,7 @@ public class PluginApiculture extends ForestryPlugin {
'X', blocks.alveary,
'I', "ingotIron");
// HEATER
RecipeUtil.addRecipe(blocks.alveary.get(BlockAlveary.Type.HEATER),
RecipeUtil.addRecipe(blocks.alveary.get(BlockAlveary.AlvearyType.HEATER),
"#I#",
" X ",
"YYY",
@@ -551,7 +551,7 @@ public class PluginApiculture extends ForestryPlugin {
'X', blocks.alveary,
'I', "ingotIron", 'Y', "stone");
// HYGROREGULATOR
RecipeUtil.addRecipe(blocks.alveary.get(BlockAlveary.Type.HYGRO),
RecipeUtil.addRecipe(blocks.alveary.get(BlockAlveary.AlvearyType.HYGRO),
"GIG",
"GXG",
"GIG",
@@ -559,14 +559,14 @@ public class PluginApiculture extends ForestryPlugin {
'I', "ingotIron",
'G', "blockGlass");
// STABILISER
RecipeUtil.addRecipe(blocks.alveary.get(BlockAlveary.Type.STABILISER),
RecipeUtil.addRecipe(blocks.alveary.get(BlockAlveary.AlvearyType.STABILISER),
"G G",
"GXG",
"G G",
'X', blocks.alveary,
'G', "gemQuartz");
// SIEVE
RecipeUtil.addRecipe(blocks.alveary.get(BlockAlveary.Type.SIEVE),
RecipeUtil.addRecipe(blocks.alveary.get(BlockAlveary.AlvearyType.SIEVE),
"III",
" X ",
"WWW",
@@ -52,11 +52,11 @@ import forestry.core.genetics.alleles.AlleleHelper;
import forestry.core.genetics.alleles.AlleleRegistry;
import forestry.core.items.EnumContainerType;
import forestry.core.items.ItemRegistryCore;
import forestry.core.models.RenderHandler;
import forestry.core.multiblock.MultiblockLogicFactory;
import forestry.core.network.IPacketRegistry;
import forestry.core.network.PacketRegistryCore;
import forestry.core.recipes.RecipeUtil;
import forestry.core.render.model.RenderHandler;
import forestry.core.tiles.MachineDefinition;
import forestry.core.utils.ClimateUtil;
import forestry.core.utils.ForestryModEnvWarningCallable;
@@ -43,7 +43,7 @@ import forestry.core.recipes.RecipeUtil;
import forestry.core.utils.ItemStackUtil;
import forestry.core.utils.Log;
import forestry.farming.blocks.BlockRegistryFarming;
import forestry.farming.blocks.EnumBlockFarmType;
import forestry.farming.blocks.EnumFarmBlockType;
import forestry.farming.circuits.CircuitFarmLogic;
import forestry.farming.logic.FarmLogicArboreal;
import forestry.farming.logic.FarmLogicCereal;
@@ -64,8 +64,8 @@ import forestry.farming.logic.FarmableGourd;
import forestry.farming.logic.FarmableStacked;
import forestry.farming.logic.FarmableVanillaMushroom;
import forestry.farming.logic.FarmableVanillaSapling;
import forestry.farming.models.EnumFarmBlockTexture;
import forestry.farming.proxy.ProxyFarming;
import forestry.farming.render.EnumFarmBlockTexture;
import forestry.farming.tiles.TileFarmControl;
import forestry.farming.tiles.TileFarmGearbox;
import forestry.farming.tiles.TileFarmHatch;
@@ -275,11 +275,11 @@ public class PluginFarming extends ForestryPlugin {
@Override
protected void registerRecipes() {
ItemStack basic = blocks.farm.get(EnumBlockFarmType.BASIC, 1);
ItemStack gearbox = blocks.farm.get(EnumBlockFarmType.GEARBOX, 1);
ItemStack hatch = blocks.farm.get(EnumBlockFarmType.HATCH, 1);
ItemStack valve = blocks.farm.get(EnumBlockFarmType.VALVE, 1);
ItemStack control = blocks.farm.get(EnumBlockFarmType.CONTROL, 1);
ItemStack basic = blocks.farm.get(EnumFarmBlockType.PLAIN, 1);
ItemStack gearbox = blocks.farm.get(EnumFarmBlockType.GEARBOX, 1);
ItemStack hatch = blocks.farm.get(EnumFarmBlockType.HATCH, 1);
ItemStack valve = blocks.farm.get(EnumFarmBlockType.VALVE, 1);
ItemStack control = blocks.farm.get(EnumFarmBlockType.CONTROL, 1);
for (EnumFarmBlockTexture block : EnumFarmBlockTexture.values()) {
NBTTagCompound compound = new NBTTagCompound();
@@ -352,6 +352,6 @@ public class PluginFarming extends ForestryPlugin {
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void handleTextureRemap(TextureStitchEvent.Pre event) {
EnumFarmBlockTexture.registerSprites();
EnumFarmBlockType.registerSprites();
}
}