Update for 1.11. Missing assets, unstable.

This commit is contained in:
mezz committed 2016-12-22 16:47:56 -08:00
1 parent 30d7365518
commit 9611ae08ae
1145 files changed
+15561 -18107

No files matched your search

+23 -13
View File
@@ -10,13 +10,9 @@
******************************************************************************/
package forestry.mail;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import javax.annotation.Nullable;
import com.google.common.base.Preconditions;
import forestry.api.circuits.ICircuit;
import forestry.api.mail.EnumAddressee;
import forestry.api.mail.PostManager;
@@ -31,6 +27,7 @@ import forestry.core.config.Config;
import forestry.core.config.Constants;
import forestry.core.fluids.Fluids;
import forestry.core.items.EnumElectronTube;
import forestry.core.items.ItemRegistryCore;
import forestry.core.network.IPacketRegistry;
import forestry.core.recipes.RecipeUtil;
import forestry.core.utils.OreDictUtil;
@@ -42,10 +39,17 @@ import forestry.mail.network.PacketRegistryMail;
import forestry.plugins.BlankForestryPlugin;
import forestry.plugins.ForestryPlugin;
import forestry.plugins.ForestryPluginUids;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
@ForestryPlugin(pluginID = ForestryPluginUids.MAIL, name = "Mail", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.mail.description")
public class PluginMail extends BlankForestryPlugin {
@Nullable
public static ItemRegistryMail items;
@Nullable
public static BlockRegistryMail blocks;
@Override
@@ -64,7 +68,7 @@ public class PluginMail extends BlankForestryPlugin {
@Override
public void preInit() {
super.preInit();
PluginCore.rootCommand.addChildCommand(new CommandMail());
if (Config.mailAlertEnabled) {
@@ -81,6 +85,7 @@ public class PluginMail extends BlankForestryPlugin {
@Override
public void doInit() {
super.doInit();
Preconditions.checkState(blocks != null);
blocks.mailbox.init();
blocks.tradeStation.init();
@@ -94,6 +99,11 @@ public class PluginMail extends BlankForestryPlugin {
@Override
public void registerRecipes() {
ItemRegistryCore coreItems = PluginCore.items;
Preconditions.checkState(coreItems != null);
Preconditions.checkState(blocks != null);
Preconditions.checkState(items != null);
Object stampGlue;
Object letterGlue;
@@ -123,7 +133,7 @@ public class PluginMail extends BlankForestryPlugin {
'X', stampDefinition.getCraftingIngredient(),
'#', Items.PAPER,
'Z', stampGlue);
RecipeManagers.carpenterManager.addRecipe(10, Fluids.SEED_OIL.getFluid(300), null, stamps,
RecipeManagers.carpenterManager.addRecipe(10, Fluids.SEED_OIL.getFluid(300), ItemStack.EMPTY, stamps,
"XXX",
"###",
'X', stampDefinition.getCraftingIngredient(),
@@ -135,7 +145,7 @@ public class PluginMail extends BlankForestryPlugin {
RecipeUtil.addRecipe(new ItemStack(Items.PAPER), "###", '#', OreDictUtil.EMPTIED_LETTER_ORE_DICT);
// Carpenter
RecipeManagers.carpenterManager.addRecipe(10, new FluidStack(FluidRegistry.WATER, 250), null, items.letters.getItemStack(), "###", "###", '#', PluginCore.items.woodPulp);
RecipeManagers.carpenterManager.addRecipe(10, new FluidStack(FluidRegistry.WATER, 250), ItemStack.EMPTY, items.letters.getItemStack(), "###", "###", '#', coreItems.woodPulp);
RecipeUtil.addShapelessRecipe(items.catalogue.getItemStack(), items.stamps.getWildcard(), new ItemStack(Items.BOOK));
@@ -145,16 +155,16 @@ public class PluginMail extends BlankForestryPlugin {
"XXX",
'#', "ingotTin",
'X', "chestWood",
'Y', PluginCore.items.sturdyCasing);
'Y', coreItems.sturdyCasing);
RecipeUtil.addRecipe(new ItemStack(blocks.tradeStation),
"Z#Z",
"#Y#",
"XWX",
'#', PluginCore.items.tubes.get(EnumElectronTube.BRONZE, 1),
'#', coreItems.tubes.get(EnumElectronTube.BRONZE, 1),
'X', "chestWood",
'Y', PluginCore.items.sturdyCasing,
'Z', PluginCore.items.tubes.get(EnumElectronTube.IRON, 1),
'Y', coreItems.sturdyCasing,
'Z', coreItems.tubes.get(EnumElectronTube.IRON, 1),
'W', ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.REFINED, null, new ICircuit[]{}));
}