Close #477 Auto-Format code with new formatting settings

This commit is contained in:
mezz committed 2015-01-26 22:26:21 -08:00
1 parent 8e92d16320
commit 5b8b0c78b0
763 files changed
+13174 -8868

No files matched your search

@@ -4,7 +4,7 @@
* are made available under the terms of the GNU Lesser Public License v3
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/lgpl-3.0.txt
*
*
* Various Contributors including, but not limited to:
* SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
******************************************************************************/
@@ -201,15 +201,17 @@ public class PluginFarming extends ForestryPlugin {
try {
Block sapling = GameData.getBlockRegistry().getRaw(items[0]);
if (sapling == null || sapling == Blocks.air)
if (sapling == null || sapling == Blocks.air) {
throw new RuntimeException("can't find block for " + items[0]);
}
if (items.length == 2)
if (items.length == 2) {
Farmables.farmables.get(tokens[0]).add(new FarmableGenericSapling(sapling, Integer.parseInt(items[1])));
else {
} else {
Item windfall = GameData.getItemRegistry().getRaw(items[2]);
if (windfall == null)
if (windfall == null) {
throw new RuntimeException("can't find item for " + items[2]);
}
Farmables.farmables.get(tokens[0]).add(
new FarmableGenericSapling(sapling, Integer.parseInt(items[1]),
@@ -242,11 +244,13 @@ public class PluginFarming extends ForestryPlugin {
try {
Item seed = GameData.getItemRegistry().getRaw(items[0]);
if (seed == null)
if (seed == null) {
throw new RuntimeException("can't find item for " + items[0]);
}
Block crop = GameData.getBlockRegistry().getRaw(items[2]);
if (crop == null || crop == Blocks.air)
if (crop == null || crop == Blocks.air) {
throw new RuntimeException("can't find block for " + items[2]);
}
Farmables.farmables.get(tokens[0]).add(
new FarmableGenericCrop(new ItemStack(seed, 1, Integer.parseInt(items[1])),
@@ -334,7 +338,8 @@ public class PluginFarming extends ForestryPlugin {
ChipsetManager.solderManager.addRecipe(layoutManual, ForestryItem.tubes.getItemStack(1, 10), Circuit.farmShroomManual);
ChipsetManager.solderManager.addRecipe(layoutManual, ForestryItem.tubes.getItemStack(1, 11), Circuit.farmCocoaManual);
if (PluginIC2.resin != null && PluginIC2.rubberwood != null)
if (PluginIC2.resin != null && PluginIC2.rubberwood != null) {
ChipsetManager.solderManager.addRecipe(layoutManual, ForestryItem.tubes.getItemStack(1, 8), Circuit.farmRubberManual);
}
}
}