Begin code cleanup for generics, types, warnings, nulls, and spelling

This commit is contained in:
mezz committed 2016-02-25 19:11:29 -08:00
1 parent c9b2f7bd3e
commit 406392e7f7
98 files changed
+472 -314

No files matched your search

@@ -20,7 +20,7 @@ import forestry.core.config.Constants;
import forestry.core.fluids.Fluids;
import forestry.core.fluids.LiquidRegistryHelper;
import forestry.core.recipes.RecipeUtil;
import forestry.food.BeverageEffect;
import forestry.food.BeverageEffects;
import forestry.food.InfuserIngredientManager;
import forestry.food.InfuserMixtureManager;
import forestry.food.items.EnumBeverage;
@@ -56,8 +56,8 @@ public class PluginFood extends BlankForestryPlugin {
BeverageManager.ingredientManager.addIngredient(normalPollenCluster, "Strong Curative");
BeverageManager.ingredientManager.addIngredient(crystallinePollenCluster, "Weak Curative");
BeverageManager.infuserManager.addMixture(1, normalPollenCluster, BeverageEffect.strongAntidote);
BeverageManager.infuserManager.addMixture(1, crystallinePollenCluster, BeverageEffect.weakAntidote);
BeverageManager.infuserManager.addMixture(1, normalPollenCluster, BeverageEffects.strongAntidote);
BeverageManager.infuserManager.addMixture(1, crystallinePollenCluster, BeverageEffects.weakAntidote);
}
}
@@ -13,7 +13,7 @@ package forestry.plugins;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.common.MinecraftForge;
import forestry.api.mail.EnumAddressee;
import forestry.api.mail.PostManager;
@@ -64,7 +64,7 @@ public class PluginMail extends BlankForestryPlugin {
PluginCore.rootCommand.addChildCommand(new CommandMail());
if (Config.mailAlertEnabled) {
FMLCommonHandler.instance().bus().register(new EventHandlerMailAlert());
MinecraftForge.EVENT_BUS.register(new EventHandlerMailAlert());
}
blocks.mail.addDefinitions(BlockTypeMail.VALUES);