Move mail blocks to PluginMail.blocks

src/main/java/forestry/core/circuits/ItemCircuitBoard.java

@@ -76,7 +76,7 @@ public class ItemCircuitBoard extends ItemForestryMultiPass {
 	}
 
 	public static ItemStack createCircuitboard(EnumCircuitBoardType type, ICircuitLayout layout, ICircuit[] circuits) {
-		ItemStack chipset = PluginCore.items.circuitboards.getCircuitboard(type);
+		ItemStack chipset = PluginCore.items.circuitboards.get(type);
 		saveChipset(chipset, new CircuitBoard(type, layout, circuits));
 		return chipset;
 	}
@@ -92,7 +92,7 @@ public class ItemCircuitBoard extends ItemForestryMultiPass {
 		itemstack.setTagCompound(nbttagcompound);
 	}
 
-	public ItemStack getCircuitboard(EnumCircuitBoardType type) {
+	public ItemStack get(EnumCircuitBoardType type) {
 		return new ItemStack(this, 1, type.ordinal());
 	}
 }

src/main/java/forestry/core/config/Constants.java

@@ -18,8 +18,6 @@ public class Constants implements IForestryConstants {
 	public static final String ID = "forestry";
 	public static final String URL = "http://forestry.sengir.net/";
 
-	public static final int WORLD_HEIGHT = 256;
-
 	public static final int FLAG_BLOCK_UPDATE = 1;
 	public static final int FLAG_BLOCK_SYNCH = 2;
 	public static final int FLAG_BLOCK_SYNCH_AND_UPDATE = FLAG_BLOCK_UPDATE + FLAG_BLOCK_SYNCH;
@@ -57,10 +55,6 @@ public class Constants implements IForestryConstants {
 	public static final int DEFINITION_GENERATOR_META = 3;
 	public static final int DEFINITION_ENGINE_CLOCKWORK_META = 4;
 
-	public static final int DEFINITION_MAILBOX_META = 0;
-	public static final int DEFINITION_TRADESTATION_META = 1;
-	public static final int DEFINITION_PHILATELIST_META = 2;
-
 	public static final int DEFINITION_BOTTLER_META = 0;
 	public static final int DEFINITION_CARPENTER_META = 1;
 	public static final int DEFINITION_CENTRIFUGE_META = 2;

src/main/java/forestry/core/config/ForestryBlock.java

@@ -34,7 +34,6 @@ import forestry.plugins.PluginManager.Stage;
  * @author SirSengir
  */
 public enum ForestryBlock {
-	mail,
 	engine,
 	factoryTESR,
 	factoryPlain,

src/main/java/forestry/core/network/GuiId.java

@@ -95,7 +95,7 @@ public enum GuiId {
 
 	PeatBogGUI,
 
-	PhilatelistGUI,
+	StampCollectorGUI,
 
 	PlantationGUI,
 

src/main/java/forestry/mail/GuiHandlerMail.java

@@ -26,18 +26,18 @@ import forestry.core.tiles.TileUtil;
 import forestry.mail.gui.ContainerCatalogue;
 import forestry.mail.gui.ContainerLetter;
 import forestry.mail.gui.ContainerMailbox;
-import forestry.mail.gui.ContainerPhilatelist;
+import forestry.mail.gui.ContainerStampCollector;
 import forestry.mail.gui.ContainerTradeName;
 import forestry.mail.gui.ContainerTrader;
 import forestry.mail.gui.GuiCatalogue;
 import forestry.mail.gui.GuiLetter;
 import forestry.mail.gui.GuiMailbox;
-import forestry.mail.gui.GuiPhilatelist;
+import forestry.mail.gui.GuiStampCollector;
 import forestry.mail.gui.GuiTradeName;
 import forestry.mail.gui.GuiTrader;
 import forestry.mail.inventory.ItemInventoryLetter;
 import forestry.mail.tiles.TileMailbox;
-import forestry.mail.tiles.TilePhilatelist;
+import forestry.mail.tiles.TileStampCollector;
 import forestry.mail.tiles.TileTrader;
 import forestry.plugins.PluginMail;
 
@@ -79,8 +79,8 @@ public class GuiHandlerMail extends GuiHandlerBase {
 
 			case MailboxGUI:
 				return new GuiMailbox(player.inventory, TileUtil.getTile(world, x, y, z, TileMailbox.class));
-			case PhilatelistGUI:
-				return new GuiPhilatelist(player.inventory, TileUtil.getTile(world, x, y, z, TilePhilatelist.class));
+			case StampCollectorGUI:
+				return new GuiStampCollector(player.inventory, TileUtil.getTile(world, x, y, z, TileStampCollector.class));
 			case TraderGUI:
 				return new GuiTrader(player.inventory, TileUtil.getTile(world, x, y, z, TileTrader.class));
 			case TraderNameGUI:
@@ -126,8 +126,8 @@ public class GuiHandlerMail extends GuiHandlerBase {
 
 			case MailboxGUI:
 				return new ContainerMailbox(player.inventory, TileUtil.getTile(world, x, y, z, TileMailbox.class));
-			case PhilatelistGUI:
-				return new ContainerPhilatelist(player.inventory, TileUtil.getTile(world, x, y, z, TilePhilatelist.class));
+			case StampCollectorGUI:
+				return new ContainerStampCollector(player.inventory, TileUtil.getTile(world, x, y, z, TileStampCollector.class));
 			case TraderGUI:
 				return new ContainerTrader(player.inventory, TileUtil.getTile(world, x, y, z, TileTrader.class));
 			case TraderNameGUI:

src/main/java/forestry/mail/blocks/BlockMail.java

@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2014 SirSengir.
+ * All rights reserved. This program and the accompanying materials
+ * 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
+ ******************************************************************************/
+package forestry.mail.blocks;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.item.ItemStack;
+
+import forestry.core.blocks.BlockBase;
+
+public class BlockMail extends BlockBase {
+	public BlockMail() {
+		super(Material.iron);
+	}
+
+	public ItemStack get(BlockMailType type) {
+		return new ItemStack(this, 1, type.ordinal());
+	}
+}

src/main/java/forestry/mail/blocks/BlockMailType.java

@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2014 SirSengir.
+ * All rights reserved. This program and the accompanying materials
+ * 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
+ ******************************************************************************/
+package forestry.mail.blocks;
+
+public enum BlockMailType {
+	MAILBOX,
+	TRADE_STATION,
+	STAMP_COLLECTOR;
+
+	public static final BlockMailType[] VALUES = values();
+}

src/main/java/forestry/mail/blocks/BlockRegistryMail.java

@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2014 SirSengir.
+ * All rights reserved. This program and the accompanying materials
+ * 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
+ ******************************************************************************/
+package forestry.mail.blocks;
+
+import forestry.core.blocks.BlockRegistry;
+import forestry.core.items.ItemBlockForestry;
+
+public class BlockRegistryMail extends BlockRegistry {
+	public final BlockMail mail;
+
+	public BlockRegistryMail() {
+		mail = registerBlock(new BlockMail(), ItemBlockForestry.class, "mail");
+	}
+}

src/main/java/forestry/mail/gui/ContainerStampCollector.java

@@ -15,21 +15,21 @@ import net.minecraft.entity.player.InventoryPlayer;
 import forestry.core.gui.ContainerTile;
 import forestry.core.gui.slots.SlotFiltered;
 import forestry.core.gui.slots.SlotOutput;
-import forestry.mail.inventory.InventoryPhilatelist;
-import forestry.mail.tiles.TilePhilatelist;
+import forestry.mail.inventory.InventoryStampCollector;
+import forestry.mail.tiles.TileStampCollector;
 
-public class ContainerPhilatelist extends ContainerTile<TilePhilatelist> {
+public class ContainerStampCollector extends ContainerTile<TileStampCollector> {
 
-	public ContainerPhilatelist(InventoryPlayer player, TilePhilatelist tile) {
+	public ContainerStampCollector(InventoryPlayer player, TileStampCollector tile) {
 		super(tile, player, 8, 111);
 
 		// Filter
-		addSlotToContainer(new SlotFiltered(tile, InventoryPhilatelist.SLOT_FILTER, 80, 19));
+		addSlotToContainer(new SlotFiltered(tile, InventoryStampCollector.SLOT_FILTER, 80, 19));
 
 		// Collected Stamps
 		for (int i = 0; i < 3; i++) {
 			for (int j = 0; j < 9; j++) {
-				addSlotToContainer(new SlotOutput(tile, j + i * 9 + InventoryPhilatelist.SLOT_BUFFER_1, 8 + j * 18, 46 + i * 18));
+				addSlotToContainer(new SlotOutput(tile, j + i * 9 + InventoryStampCollector.SLOT_BUFFER_1, 8 + j * 18, 46 + i * 18));
 			}
 		}
 	}

src/main/java/forestry/mail/gui/GuiStampCollector.java

@@ -14,14 +14,12 @@ import net.minecraft.entity.player.InventoryPlayer;
 
 import forestry.core.config.Constants;
 import forestry.core.gui.GuiForestry;
-import forestry.mail.tiles.TilePhilatelist;
+import forestry.mail.tiles.TileStampCollector;
 
-public class GuiPhilatelist extends GuiForestry<ContainerPhilatelist, TilePhilatelist> {
-
-	public GuiPhilatelist(InventoryPlayer player, TilePhilatelist tile) {
-		super(Constants.TEXTURE_PATH_GUI + "/philatelist.png", new ContainerPhilatelist(player, tile), tile);
+public class GuiStampCollector extends GuiForestry<ContainerStampCollector, TileStampCollector> {
+	public GuiStampCollector(InventoryPlayer player, TileStampCollector tile) {
+		super(Constants.TEXTURE_PATH_GUI + "/philatelist.png", new ContainerStampCollector(player, tile), tile);
 		this.xSize = 176;
 		this.ySize = 193;
 	}
-
 }

src/main/java/forestry/mail/inventory/InventoryStampCollector.java

@@ -14,14 +14,14 @@ import net.minecraft.item.ItemStack;
 
 import forestry.api.mail.IStamps;
 import forestry.core.inventory.InventoryAdapterTile;
-import forestry.mail.tiles.TilePhilatelist;
+import forestry.mail.tiles.TileStampCollector;
 
-public class InventoryPhilatelist extends InventoryAdapterTile<TilePhilatelist> {
+public class InventoryStampCollector extends InventoryAdapterTile<TileStampCollector> {
 	public static final short SLOT_FILTER = 0;
 	public static final short SLOT_BUFFER_1 = 1;
 	public static final short SLOT_BUFFER_COUNT = 27;
 
-	public InventoryPhilatelist(TilePhilatelist tile) {
+	public InventoryStampCollector(TileStampCollector tile) {
 		super(tile, 28, "INV");
 	}
 

src/main/java/forestry/mail/tiles/TileStampCollector.java

@@ -19,12 +19,12 @@ import forestry.core.inventory.IInventoryAdapter;
 import forestry.core.network.GuiId;
 import forestry.core.tiles.TileBase;
 import forestry.core.utils.InventoryUtil;
-import forestry.mail.inventory.InventoryPhilatelist;
+import forestry.mail.inventory.InventoryStampCollector;
 
-public class TilePhilatelist extends TileBase implements IInventory {
-	public TilePhilatelist() {
-		super(GuiId.PhilatelistGUI, "philatelist");
-		setInternalInventory(new InventoryPhilatelist(this));
+public class TileStampCollector extends TileBase implements IInventory {
+	public TileStampCollector() {
+		super(GuiId.StampCollectorGUI, "philatelist");
+		setInternalInventory(new InventoryStampCollector(this));
 	}
 
 	@Override
@@ -36,10 +36,10 @@ public class TilePhilatelist extends TileBase implements IInventory {
 		ItemStack stamp = null;
 
 		IInventoryAdapter inventory = getInternalInventory();
-		if (inventory.getStackInSlot(InventoryPhilatelist.SLOT_FILTER) == null) {
+		if (inventory.getStackInSlot(InventoryStampCollector.SLOT_FILTER) == null) {
 			stamp = PostManager.postRegistry.getPostOffice(worldObj).getAnyStamp(1);
 		} else {
-			ItemStack filter = inventory.getStackInSlot(InventoryPhilatelist.SLOT_FILTER);
+			ItemStack filter = inventory.getStackInSlot(InventoryStampCollector.SLOT_FILTER);
 			if (filter.getItem() instanceof IStamps) {
 				stamp = PostManager.postRegistry.getPostOffice(worldObj).getAnyStamp(((IStamps) filter.getItem()).getPostage(filter), 1);
 			}
@@ -50,6 +50,6 @@ public class TilePhilatelist extends TileBase implements IInventory {
 		}
 
 		// Store it.
-		InventoryUtil.stowInInventory(stamp, inventory, true, InventoryPhilatelist.SLOT_BUFFER_1, InventoryPhilatelist.SLOT_BUFFER_COUNT);
+		InventoryUtil.stowInInventory(stamp, inventory, true, InventoryStampCollector.SLOT_BUFFER_1, InventoryStampCollector.SLOT_BUFFER_COUNT);
 	}
 }

src/main/java/forestry/plugins/PluginFactory.java

@@ -429,13 +429,13 @@ public class PluginFactory extends ForestryPlugin {
 
 		// / CHIPSETS
 		ItemCircuitBoard circuitBoard = PluginCore.items.circuitboards;
-		RecipeManagers.carpenterManager.addRecipe(20, Fluids.WATER.getFluid(1000), null, circuitBoard.getCircuitboard(EnumCircuitBoardType.BASIC),
+		RecipeManagers.carpenterManager.addRecipe(20, Fluids.WATER.getFluid(1000), null, circuitBoard.get(EnumCircuitBoardType.BASIC),
 				"R R", "R#R", "R R", '#', "ingotTin", 'R', "dustRedstone");
-		RecipeManagers.carpenterManager.addRecipe(40, Fluids.WATER.getFluid(1000), null, circuitBoard.getCircuitboard(EnumCircuitBoardType.ENHANCED),
+		RecipeManagers.carpenterManager.addRecipe(40, Fluids.WATER.getFluid(1000), null, circuitBoard.get(EnumCircuitBoardType.ENHANCED),
 				"R#R", "R#R", "R#R", '#', "ingotBronze", 'R', "dustRedstone");
-		RecipeManagers.carpenterManager.addRecipe(80, Fluids.WATER.getFluid(1000), null, circuitBoard.getCircuitboard(EnumCircuitBoardType.REFINED),
+		RecipeManagers.carpenterManager.addRecipe(80, Fluids.WATER.getFluid(1000), null, circuitBoard.get(EnumCircuitBoardType.REFINED),
 				"R#R", "R#R", "R#R", '#', "ingotIron", 'R', "dustRedstone");
-		RecipeManagers.carpenterManager.addRecipe(80, Fluids.WATER.getFluid(1000), null, circuitBoard.getCircuitboard(EnumCircuitBoardType.INTRICATE),
+		RecipeManagers.carpenterManager.addRecipe(80, Fluids.WATER.getFluid(1000), null, circuitBoard.get(EnumCircuitBoardType.INTRICATE),
 				"R#R", "R#R", "R#R", '#', "ingotGold", 'R', "dustRedstone");
 		RecipeManagers.carpenterManager.addRecipe(40, Fluids.WATER.getFluid(1000), null, PluginCore.items.solderingIron.getItemStack(),
 				" # ", "# #", "  B", '#', "ingotIron", 'B', "ingotBronze");

src/main/java/forestry/plugins/PluginMail.java

@@ -10,12 +10,9 @@
  ******************************************************************************/
 package forestry.plugins;
 
-import net.minecraft.block.material.Material;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-import net.minecraftforge.oredict.OreDictionary;
-
 import cpw.mods.fml.common.FMLCommonHandler;
 
 import forestry.api.mail.EnumAddressee;
@@ -24,14 +21,11 @@ import forestry.api.recipes.RecipeManagers;
 import forestry.apiculture.items.ItemRegistryApiculture;
 import forestry.core.GuiHandlerBase;
 import forestry.core.ISaveEventHandler;
-import forestry.core.blocks.BlockBase;
 import forestry.core.circuits.EnumCircuitBoardType;
 import forestry.core.config.Config;
 import forestry.core.config.Constants;
-import forestry.core.config.ForestryBlock;
 import forestry.core.fluids.Fluids;
 import forestry.core.items.EnumElectronTube;
-import forestry.core.items.ItemBlockForestry;
 import forestry.core.network.IPacketRegistry;
 import forestry.core.recipes.RecipeUtil;
 import forestry.core.tiles.MachineDefinition;
@@ -40,12 +34,14 @@ import forestry.mail.PostRegistry;
 import forestry.mail.PostalCarrier;
 import forestry.mail.SaveEventHandlerMail;
 import forestry.mail.TickHandlerMailClient;
+import forestry.mail.blocks.BlockMailType;
+import forestry.mail.blocks.BlockRegistryMail;
 import forestry.mail.commands.CommandMail;
 import forestry.mail.items.EnumStampDefinition;
 import forestry.mail.items.ItemRegistryMail;
 import forestry.mail.network.PacketRegistryMail;
 import forestry.mail.tiles.TileMailbox;
-import forestry.mail.tiles.TilePhilatelist;
+import forestry.mail.tiles.TileStampCollector;
 import forestry.mail.tiles.TileTrader;
 import forestry.mail.triggers.MailTriggers;
 
@@ -54,9 +50,10 @@ public class PluginMail extends ForestryPlugin {
 
 	private static MachineDefinition definitionMailbox;
 	private static MachineDefinition definitionTradestation;
-	private static MachineDefinition definitionPhilatelist;
+	private static MachineDefinition definitionStampColletor;
 
 	public static ItemRegistryMail items;
+	public static BlockRegistryMail blocks;
 
 	@Override
 	protected void setupAPI() {
@@ -70,8 +67,7 @@ public class PluginMail extends ForestryPlugin {
 	@Override
 	protected void registerItemsAndBlocks() {
 		items = new ItemRegistryMail();
-
-		ForestryBlock.mail.registerBlock(new BlockBase(Material.iron), ItemBlockForestry.class, "mail");
+		blocks = new BlockRegistryMail();
 	}
 
 	@Override
@@ -84,19 +80,17 @@ public class PluginMail extends ForestryPlugin {
 			FMLCommonHandler.instance().bus().register(new TickHandlerMailClient());
 		}
 
-		BlockBase mail = ((BlockBase) ForestryBlock.mail.block());
-
-		definitionMailbox = new MachineDefinition(Constants.DEFINITION_MAILBOX_META, "forestry.Mailbox", TileMailbox.class)
+		definitionMailbox = new MachineDefinition(BlockMailType.MAILBOX.ordinal(), "forestry.Mailbox", TileMailbox.class)
 				.setFaces(0, 1, 2, 2, 2, 2, 0, 7);
-		mail.addDefinition(definitionMailbox);
+		blocks.mail.addDefinition(definitionMailbox);
 
-		definitionTradestation = new MachineDefinition(Constants.DEFINITION_TRADESTATION_META, "forestry.Tradestation", TileTrader.class)
+		definitionTradestation = new MachineDefinition(BlockMailType.TRADE_STATION.ordinal(), "forestry.Tradestation", TileTrader.class)
 				.setFaces(0, 1, 2, 3, 4, 4, 0, 7);
-		mail.addDefinition(definitionTradestation);
+		blocks.mail.addDefinition(definitionTradestation);
 
-		definitionPhilatelist = new MachineDefinition(Constants.DEFINITION_PHILATELIST_META, "forestry.Philatelist", TilePhilatelist.class)
+		definitionStampColletor = new MachineDefinition(BlockMailType.STAMP_COLLECTOR.ordinal(), "forestry.Philatelist", TileStampCollector.class)
 				.setFaces(0, 1, 2, 3, 2, 2, 0, 7);
-		mail.addDefinition(definitionPhilatelist);
+		blocks.mail.addDefinition(definitionStampColletor);
 	}
 
 	@Override
@@ -110,7 +104,7 @@ public class PluginMail extends ForestryPlugin {
 
 		definitionMailbox.register();
 		definitionTradestation.register();
-		definitionPhilatelist.register();
+		definitionStampColletor.register();
 	}
 
 	@Override
@@ -145,27 +139,32 @@ public class PluginMail extends ForestryPlugin {
 					continue;
 				}
 
-				RecipeUtil.addRecipe(items.stamps.get(stampDefinition, 9),
-						"XXX", "###", "ZZZ",
+				ItemStack stamps = items.stamps.get(stampDefinition, 9);
+
+				RecipeUtil.addRecipe(stamps,
+						"XXX",
+						"###",
+						"ZZZ",
 						'X', stampDefinition.getCraftingIngredient(),
 						'#', Items.paper,
 						'Z', stampGlue);
-				RecipeManagers.carpenterManager.addRecipe(10, Fluids.SEEDOIL.getFluid(300), null, items.stamps.get(stampDefinition, 9),
-						"XXX", "###",
+				RecipeManagers.carpenterManager.addRecipe(10, Fluids.SEEDOIL.getFluid(300), null, stamps,
+						"XXX",
+						"###",
 						'X', stampDefinition.getCraftingIngredient(),
 						'#', Items.paper);
 			}
 		}
 
 		// Recycling
-		RecipeUtil.addRecipe(new ItemStack(Items.paper), "###", '#', new ItemStack(items.letters, 1, OreDictionary.WILDCARD_VALUE));
+		RecipeUtil.addRecipe(new ItemStack(Items.paper), "###", '#', items.letters.getWildcard());
 
 		// Carpenter
 		RecipeManagers.carpenterManager.addRecipe(10, Fluids.WATER.getFluid(250), null, items.letters.getItemStack(), "###", "###", '#', PluginCore.items.woodPulp);
 
-		RecipeUtil.addShapelessRecipe(items.catalogue.getItemStack(), new ItemStack(items.stamps, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.book));
+		RecipeUtil.addShapelessRecipe(items.catalogue.getItemStack(), items.stamps.getWildcard(), new ItemStack(Items.book));
 
-		RecipeUtil.addRecipe(ForestryBlock.mail.getItemStack(1, Constants.DEFINITION_MAILBOX_META),
+		RecipeUtil.addRecipe(blocks.mail.get(BlockMailType.MAILBOX),
 				" # ",
 				"#Y#",
 				"XXX",
@@ -173,7 +172,7 @@ public class PluginMail extends ForestryPlugin {
 				'X', "chestWood",
 				'Y', PluginCore.items.sturdyCasing);
 
-		RecipeUtil.addRecipe(ForestryBlock.mail.getItemStack(1, Constants.DEFINITION_TRADESTATION_META),
+		RecipeUtil.addRecipe(blocks.mail.get(BlockMailType.TRADE_STATION),
 				"Z#Z",
 				"#Y#",
 				"XWX",
@@ -181,7 +180,7 @@ public class PluginMail extends ForestryPlugin {
 				'X', "chestWood",
 				'Y', PluginCore.items.sturdyCasing,
 				'Z', PluginCore.items.tubes.get(EnumElectronTube.IRON, 1),
-				'W', PluginCore.items.circuitboards.getCircuitboard(EnumCircuitBoardType.REFINED));
+				'W', PluginCore.items.circuitboards.get(EnumCircuitBoardType.REFINED));
 	}
 
 	@Override