Clean Up and Add Comments

A clean up and I add crates with the new blocks from 1.8.
This commit is contained in:
Nedelosk committed 2016-01-24 12:41:47 +01:00
1 parent 02ec97b031
commit 801c6dff92
12 files changed
+413 -38

No files matched your search

@@ -173,7 +173,13 @@ public class PluginCore extends ForestryPlugin {
crateRegistry.registerCrate(Blocks.cobblestone, "cratedCobblestone");
crateRegistry.registerCrate(new ItemStack(Blocks.dirt, 1, 0), "cratedDirt");
crateRegistry.registerCrate(new ItemStack(Blocks.dirt, 1, 2), "cratedPodzol");
crateRegistry.registerCrate(Blocks.stone, "cratedStone");
crateRegistry.registerCrate(new ItemStack(Blocks.stone, 1, 0), "cratedStone");
crateRegistry.registerCrate(new ItemStack(Blocks.stone, 1, 1), "cratedGranite");
crateRegistry.registerCrate(new ItemStack(Blocks.stone, 1, 3), "cratedDiorite");
crateRegistry.registerCrate(new ItemStack(Blocks.stone, 1, 5), "cratedAndesite");
crateRegistry.registerCrate(new ItemStack(Blocks.prismarine, 1, 0), "cratedPrismarine");
crateRegistry.registerCrate(new ItemStack(Blocks.prismarine, 1, 1), "cratedPrismarinebrick");
crateRegistry.registerCrate(new ItemStack(Blocks.prismarine, 1, 2), "cratedPrismarinedark");
crateRegistry.registerCrate(Blocks.brick_block, "cratedBrick");
crateRegistry.registerCrate(Blocks.cactus, "cratedCacti");
crateRegistry.registerCrate(new ItemStack(Blocks.sand, 1, 0), "cratedSand");
@@ -272,6 +272,8 @@ public class PluginFactory extends ForestryPlugin {
int appleJuiceAmount = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.apple");
RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Items.apple)}, Fluids.JUICE.getFluid(appleJuiceAmount),
PluginCore.items.mulch.getItemStack(), appleMulchAmount);
RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Items.carrot)}, Fluids.JUICE.getFluid(appleJuiceAmount),
PluginCore.items.mulch.getItemStack(), appleMulchAmount);
int seedOilAmount = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.seed");
FluidStack seedOil = Fluids.SEEDOIL.getFluid(seedOilAmount);
@@ -303,6 +305,7 @@ public class PluginFactory extends ForestryPlugin {
RecipeUtil.addFermenterRecipes(new ItemStack(Blocks.cactus), ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.cactus"), Fluids.BIOMASS);
RecipeUtil.addFermenterRecipes(new ItemStack(Items.wheat), ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS);
RecipeUtil.addFermenterRecipes(new ItemStack(Items.potato), (2 * ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.wheat")), Fluids.BIOMASS);
RecipeUtil.addFermenterRecipes(new ItemStack(Items.reeds), ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.cane"), Fluids.BIOMASS);
RecipeUtil.addFermenterRecipes(new ItemStack(Blocks.brown_mushroom), ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.mushroom"), Fluids.BIOMASS);
RecipeUtil.addFermenterRecipes(new ItemStack(Blocks.red_mushroom), ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.mushroom"), Fluids.BIOMASS);
@@ -37,6 +37,7 @@ import forestry.farming.logic.FarmableGenericSapling;
import forestry.plugins.ForestryPlugin;
import forestry.plugins.Plugin;
import forestry.plugins.PluginCore;
import forestry.plugins.PluginManager;
@Plugin(pluginID = "BiomesOPlenty", name = "BiomesOPlenty", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.biomesoplenty.description")
public class PluginBiomesOPlenty extends ForestryPlugin {
@@ -97,12 +98,12 @@ public class PluginBiomesOPlenty extends ForestryPlugin {
FMLInterModComms.sendMessage(Constants.MOD, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingName));
}
if (saplings != null && persimmon != null) {
if (PluginManager.Module.FARMING.isEnabled() && saplings != null && persimmon != null) {
Farmables.farmables.get("farmArboreal").add(new FarmableGenericSapling(saplings, 15, persimmon));
}
Block boPTurnip = GameRegistry.findBlock(BoP, "turnip");
if (boPTurnip != null) {
if (PluginManager.Module.FARMING.isEnabled() && boPTurnip != null) {
Item boPTurnipSeeds = GameRegistry.findItem(BoP, "turnipSeeds");
if (boPTurnipSeeds != null) {
Farmables.farmables.get("farmVegetables").add(new FarmableGenericCrop(new ItemStack(boPTurnipSeeds, 1, 0), boPTurnip, 7));
@@ -37,6 +37,7 @@ import forestry.farming.logic.FarmableGenericCrop;
import forestry.plugins.ForestryPlugin;
import forestry.plugins.Plugin;
import forestry.plugins.PluginCore;
import forestry.plugins.PluginManager;
@Plugin(pluginID = "Natura", name = "Natura", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.natura.description")
public class PluginNatura extends ForestryPlugin {
@@ -220,9 +221,11 @@ public class PluginNatura extends ForestryPlugin {
RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{aSeedList}, Fluids.SEEDOIL.getFluid(amount));
}
Block cropBlock = GameRegistry.findBlock(NATURA, "N Crops");
Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(seedBarley, cropBlock, 3));
Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(seedCotton, cropBlock, 8));
if(PluginManager.Module.FARMING.isEnabled()){
Block cropBlock = GameRegistry.findBlock(NATURA, "N Crops");
Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(seedBarley, cropBlock, 3));
Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(seedCotton, cropBlock, 8));
}
List<ItemStack> berries = new ArrayList<>();
if (berryBlight != null) {