diff --git a/src/main/java/forestry/core/config/ForestryBlock.java b/src/main/java/forestry/core/config/ForestryBlock.java index 29b248ba1..aa3cd673b 100755 --- a/src/main/java/forestry/core/config/ForestryBlock.java +++ b/src/main/java/forestry/core/config/ForestryBlock.java @@ -34,8 +34,6 @@ import forestry.plugins.PluginManager.Stage; * @author SirSengir */ public enum ForestryBlock { - mushroom, - farm, mail, engine, factoryTESR, diff --git a/src/main/java/forestry/core/items/ItemRegistryCore.java b/src/main/java/forestry/core/items/ItemRegistryCore.java index 0a4c19b99..084d5668b 100644 --- a/src/main/java/forestry/core/items/ItemRegistryCore.java +++ b/src/main/java/forestry/core/items/ItemRegistryCore.java @@ -15,7 +15,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import forestry.api.core.Tabs; -import forestry.core.CreativeTabForestry; import forestry.core.circuits.ItemCircuitBoard; import forestry.core.genetics.ItemResearchNote; import forestry.core.network.GuiId; @@ -23,7 +22,7 @@ import forestry.core.network.GuiId; public class ItemRegistryCore extends ItemRegistry { /* Fertilizer */ public final ItemForestry fertilizerBio; - public final ItemForestry fertilizerCompound; + public final ItemForestryBonemeal fertilizerCompound; /* Gems */ public final ItemForestry apatite; diff --git a/src/main/java/forestry/farming/EventHandlerFarming.java b/src/main/java/forestry/farming/EventHandlerFarming.java deleted file mode 100755 index d7935ef7c..000000000 --- a/src/main/java/forestry/farming/EventHandlerFarming.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * 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.farming; - -import net.minecraft.block.Block; - -import net.minecraftforge.event.entity.player.BonemealEvent; - -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; - -import forestry.core.config.ForestryBlock; -import forestry.farming.blocks.BlockMushroom; - -public class EventHandlerFarming { - - @SubscribeEvent - public void handleBonemeal(BonemealEvent event) { - - if (event.world.isRemote) { - return; - } - - Block block = event.world.getBlock(event.x, event.y, event.z); - if (!ForestryBlock.mushroom.isBlockEqual(block)) { - return; - } - - ((BlockMushroom) ForestryBlock.mushroom.block()).func_149878_d(event.world, event.x, event.y, event.z, event.world.rand); - event.setResult(Result.ALLOW); - } -} diff --git a/src/main/java/forestry/farming/blocks/BlockFarm.java b/src/main/java/forestry/farming/blocks/BlockFarm.java index 4e0ce4316..3c57fa686 100644 --- a/src/main/java/forestry/farming/blocks/BlockFarm.java +++ b/src/main/java/forestry/farming/blocks/BlockFarm.java @@ -51,6 +51,7 @@ public class BlockFarm extends BlockStructure { public BlockFarm() { super(Material.rock); setHardness(1.0f); + setHarvestLevel("pickaxe", 0); this.particleCallback = new ParticleHelper.DefaultCallback(this); } @@ -179,27 +180,8 @@ public class BlockFarm extends BlockStructure { @SideOnly(Side.CLIENT) public static IIcon getOverlayTextureForBlock(int side, int metadata) { - - if (metadata == 0 && side == 2) { - return EnumFarmBlockTexture.getIcon(TileFarm.TYPE_REVERSE); - } else if (metadata == 0 && (side == 0 || side == 1)) { - return EnumFarmBlockTexture.getIcon(TileFarm.TYPE_TOP); - } - - switch (metadata) { - case 1: - return EnumFarmBlockTexture.getIcon(TileFarm.TYPE_BAND); - case 2: - return EnumFarmBlockTexture.getIcon(TileFarm.TYPE_GEARS); - case 3: - return EnumFarmBlockTexture.getIcon(TileFarm.TYPE_HATCH); - case 4: - return EnumFarmBlockTexture.getIcon(TileFarm.TYPE_VALVE); - case 5: - return EnumFarmBlockTexture.getIcon(TileFarm.TYPE_CONTROL); - default: - return EnumFarmBlockTexture.getIcon(TileFarm.TYPE_PLAIN); - } + BlockFarmType type = BlockFarmType.VALUES[metadata]; + return EnumFarmBlockTexture.getIcon(type, side); } @Override @@ -238,4 +220,7 @@ public class BlockFarm extends BlockStructure { return world.getBlockMetadata(x, y, z) == 5; } + public ItemStack get(BlockFarmType type, int amount) { + return new ItemStack(this, amount, type.ordinal()); + } } diff --git a/src/main/java/forestry/farming/blocks/BlockFarmType.java b/src/main/java/forestry/farming/blocks/BlockFarmType.java new file mode 100644 index 000000000..9b01f5605 --- /dev/null +++ b/src/main/java/forestry/farming/blocks/BlockFarmType.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.farming.blocks; + +public enum BlockFarmType { + BASIC, + BAND, + GEARBOX, + HATCH, + VALVE, + CONTROL; + + public static final BlockFarmType[] VALUES = values(); +} diff --git a/src/main/java/forestry/farming/blocks/BlockRegistryFarming.java b/src/main/java/forestry/farming/blocks/BlockRegistryFarming.java new file mode 100644 index 000000000..7f8fcaa80 --- /dev/null +++ b/src/main/java/forestry/farming/blocks/BlockRegistryFarming.java @@ -0,0 +1,25 @@ +/******************************************************************************* + * 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.farming.blocks; + +import forestry.core.blocks.BlockRegistry; +import forestry.core.items.ItemBlockTyped; +import forestry.farming.items.ItemBlockFarm; + +public class BlockRegistryFarming extends BlockRegistry { + public final BlockMushroom mushroom; + public final BlockFarm farm; + + public BlockRegistryFarming() { + mushroom = registerBlock(new BlockMushroom(), ItemBlockTyped.class, "mushroom"); + farm = registerBlock(new BlockFarm(), ItemBlockFarm.class, "ffarm"); + } +} diff --git a/src/main/java/forestry/farming/logic/FarmableVanillaMushroom.java b/src/main/java/forestry/farming/logic/FarmableVanillaMushroom.java index e5e200f41..605b90d23 100644 --- a/src/main/java/forestry/farming/logic/FarmableVanillaMushroom.java +++ b/src/main/java/forestry/farming/logic/FarmableVanillaMushroom.java @@ -17,10 +17,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import forestry.api.farming.ICrop; -import forestry.core.config.ForestryBlock; +import forestry.core.config.Constants; import forestry.core.proxy.Proxies; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.vect.Vect; +import forestry.plugins.PluginFarming; public class FarmableVanillaMushroom extends FarmableGenericSapling { @@ -52,7 +53,6 @@ public class FarmableVanillaMushroom extends FarmableGenericSapling { } Proxies.common.addBlockPlaceEffects(world, x, y, z, Blocks.brown_mushroom, 0); - return ForestryBlock.mushroom.setBlock(world, x, y, z, meta); + return world.setBlock(x, y, z, PluginFarming.blocks.mushroom, meta, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); } - } diff --git a/src/main/java/forestry/farming/multiblock/InventoryFarm.java b/src/main/java/forestry/farming/multiblock/InventoryFarm.java index 8b96a834c..cfc5d4675 100644 --- a/src/main/java/forestry/farming/multiblock/InventoryFarm.java +++ b/src/main/java/forestry/farming/multiblock/InventoryFarm.java @@ -14,6 +14,7 @@ import java.util.Stack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; @@ -27,10 +28,9 @@ import forestry.core.fluids.TankManager; import forestry.core.inventory.InventoryAdapterRestricted; import forestry.core.inventory.wrappers.InventoryMapper; import forestry.core.utils.InventoryUtil; -import forestry.core.utils.ItemStackUtil; import forestry.core.utils.PlayerUtil; import forestry.core.utils.SlotUtil; -import forestry.plugins.PluginFarming; +import forestry.plugins.PluginCore; public class InventoryFarm extends InventoryAdapterRestricted implements IFarmInventory { public static final int SLOT_RESOURCES_1 = 0; @@ -133,7 +133,8 @@ public class InventoryFarm extends InventoryAdapterRestricted implements IFarmIn return false; } - return ItemStackUtil.isIdenticalItem(PluginFarming.farmFertilizer, itemstack); + Item item = itemstack.getItem(); + return PluginCore.items.fertilizerCompound == item; } @Override diff --git a/src/main/java/forestry/farming/proxy/ProxyFarmingClient.java b/src/main/java/forestry/farming/proxy/ProxyFarmingClient.java index 3b1f84152..4bb3b5a74 100644 --- a/src/main/java/forestry/farming/proxy/ProxyFarmingClient.java +++ b/src/main/java/forestry/farming/proxy/ProxyFarmingClient.java @@ -10,12 +10,12 @@ ******************************************************************************/ package forestry.farming.proxy; +import net.minecraft.item.Item; import net.minecraftforge.client.MinecraftForgeClient; import cpw.mods.fml.client.registry.RenderingRegistry; -import forestry.core.config.ForestryBlock; import forestry.farming.render.RenderFarmBlock; import forestry.farming.render.RenderFarmItem; import forestry.plugins.PluginFarming; @@ -27,6 +27,6 @@ public class ProxyFarmingClient extends ProxyFarming { PluginFarming.modelIdFarmBlock = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(new RenderFarmBlock()); - MinecraftForgeClient.registerItemRenderer(ForestryBlock.farm.item(), new RenderFarmItem()); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(PluginFarming.blocks.farm), new RenderFarmItem()); } } diff --git a/src/main/java/forestry/farming/render/EnumFarmBlockTexture.java b/src/main/java/forestry/farming/render/EnumFarmBlockTexture.java index 3b74d633f..e9630b71c 100644 --- a/src/main/java/forestry/farming/render/EnumFarmBlockTexture.java +++ b/src/main/java/forestry/farming/render/EnumFarmBlockTexture.java @@ -23,6 +23,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.core.render.TextureManager; +import forestry.farming.blocks.BlockFarmType; public enum EnumFarmBlockTexture { BRICK_STONE(new ItemStack(Blocks.stonebrick, 1, 0)), @@ -37,6 +38,15 @@ public enum EnumFarmBlockTexture { QUARTZ_CHISELED(new ItemStack(Blocks.quartz_block, 1, 1)), QUARTZ_LINES(new ItemStack(Blocks.quartz_block, 1, 2)); + private static final int TYPE_PLAIN = 0; + private static final int TYPE_REVERSE = 1; + private static final int TYPE_TOP = 2; + private static final int TYPE_BAND = 3; + private static final int TYPE_GEARS = 4; + private static final int TYPE_HATCH = 5; + private static final int TYPE_VALVE = 6; + private static final int TYPE_CONTROL = 7; + @SideOnly(Side.CLIENT) private static List icons; @@ -61,8 +71,30 @@ public enum EnumFarmBlockTexture { } @SideOnly(Side.CLIENT) - public static IIcon getIcon(int type) { - return icons.get(type); + public static IIcon getIcon(BlockFarmType type, int side) { + switch (type) { + case BASIC: { + if (side == 2) { + return icons.get(TYPE_REVERSE); + } else if (side == 0 || side == 1) { + return icons.get(TYPE_TOP); + } else { + return icons.get(TYPE_PLAIN); + } + } + case BAND: + return icons.get(TYPE_BAND); + case GEARBOX: + return icons.get(TYPE_GEARS); + case HATCH: + return icons.get(TYPE_HATCH); + case VALVE: + return icons.get(TYPE_VALVE); + case CONTROL: + return icons.get(TYPE_CONTROL); + default: + return icons.get(TYPE_PLAIN); + } } public void saveToCompound(NBTTagCompound compound) { @@ -78,7 +110,6 @@ public enum EnumFarmBlockTexture { } public static EnumFarmBlockTexture getFromCompound(NBTTagCompound compound) { - if (compound != null) { int farmBlockOrdinal = compound.getInteger("FarmBlock"); if (farmBlockOrdinal < EnumFarmBlockTexture.values().length) { diff --git a/src/main/java/forestry/farming/render/RenderFarmBlock.java b/src/main/java/forestry/farming/render/RenderFarmBlock.java index 3fe6c0e8d..67c65732f 100644 --- a/src/main/java/forestry/farming/render/RenderFarmBlock.java +++ b/src/main/java/forestry/farming/render/RenderFarmBlock.java @@ -14,7 +14,6 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; -import forestry.core.config.ForestryBlock; import forestry.core.render.RenderOverlayBlock; import forestry.farming.blocks.BlockFarm; import forestry.plugins.PluginFarming; @@ -30,7 +29,7 @@ public class RenderFarmBlock extends RenderOverlayBlock { // Render the plain block. renderer.renderStandardBlock(block, x, y, z); - renderFarmOverlay(world, (BlockFarm) ForestryBlock.farm.block(), x, y, z, renderer); + renderFarmOverlay(world, PluginFarming.blocks.farm, x, y, z, renderer); return true; } @@ -43,7 +42,6 @@ public class RenderFarmBlock extends RenderOverlayBlock { float adjG = 0.5f; float adjB = 0.5f; - // Bottom renderBottomFace(world, block, x, y, z, renderer, BlockFarm.getOverlayTextureForBlock(0, metadata), mixedBrightness, adjR, adjG, adjB); renderTopFace(world, block, x, y, z, renderer, BlockFarm.getOverlayTextureForBlock(1, metadata), mixedBrightness, adjR, adjG, adjB); renderEastFace(world, block, x, y, z, renderer, BlockFarm.getOverlayTextureForBlock(2, metadata), mixedBrightness, adjR, adjG, adjB); @@ -61,5 +59,4 @@ public class RenderFarmBlock extends RenderOverlayBlock { public int getRenderId() { return PluginFarming.modelIdFarmBlock; } - } diff --git a/src/main/java/forestry/farming/tiles/TileFarm.java b/src/main/java/forestry/farming/tiles/TileFarm.java index 4a97b7835..c99e1408c 100644 --- a/src/main/java/forestry/farming/tiles/TileFarm.java +++ b/src/main/java/forestry/farming/tiles/TileFarm.java @@ -42,15 +42,6 @@ import forestry.farming.render.EnumFarmBlockTexture; public abstract class TileFarm extends MultiblockTileEntityForestry implements IFarmComponent, IHintSource, ISocketable, IStreamableGui, IErrorLogicSource, IRestrictedAccess, ITitled { - public static final int TYPE_PLAIN = 0; - public static final int TYPE_REVERSE = 1; - public static final int TYPE_TOP = 2; - public static final int TYPE_BAND = 3; - public static final int TYPE_GEARS = 4; - public static final int TYPE_HATCH = 5; - public static final int TYPE_VALVE = 6; - public static final int TYPE_CONTROL = 7; - private EnumFarmBlockTexture farmBlockTexture = EnumFarmBlockTexture.BRICK_STONE; protected TileFarm() { diff --git a/src/main/java/forestry/plugins/PluginFarming.java b/src/main/java/forestry/plugins/PluginFarming.java index 9627b7d10..3bb684061 100644 --- a/src/main/java/forestry/plugins/PluginFarming.java +++ b/src/main/java/forestry/plugins/PluginFarming.java @@ -23,8 +23,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.MinecraftForge; - import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; import cpw.mods.fml.common.registry.GameData; @@ -39,17 +37,14 @@ import forestry.core.GuiHandlerBase; import forestry.core.circuits.Circuit; import forestry.core.circuits.CircuitLayout; import forestry.core.config.Constants; -import forestry.core.config.ForestryBlock; import forestry.core.items.EnumElectronTube; -import forestry.core.items.ItemBlockTyped; +import forestry.core.recipes.RecipeUtil; import forestry.core.recipes.ShapedRecipeCustom; import forestry.core.utils.Log; -import forestry.farming.EventHandlerFarming; import forestry.farming.GuiHandlerFarming; -import forestry.farming.blocks.BlockFarm; -import forestry.farming.blocks.BlockMushroom; +import forestry.farming.blocks.BlockFarmType; +import forestry.farming.blocks.BlockRegistryFarming; import forestry.farming.circuits.CircuitFarmLogic; -import forestry.farming.items.ItemBlockFarm; import forestry.farming.logic.FarmLogicArboreal; import forestry.farming.logic.FarmLogicCereal; import forestry.farming.logic.FarmLogicCocoa; @@ -84,16 +79,12 @@ public class PluginFarming extends ForestryPlugin { @SidedProxy(clientSide = "forestry.farming.proxy.ProxyFarmingClient", serverSide = "forestry.farming.proxy.ProxyFarming") public static ProxyFarming proxy; public static int modelIdFarmBlock; - public static ItemStack farmFertilizer; + + public static BlockRegistryFarming blocks; @Override protected void registerItemsAndBlocks() { - super.registerItemsAndBlocks(); - - ForestryBlock.mushroom.registerBlock(new BlockMushroom(), ItemBlockTyped.class, "mushroom"); - - ForestryBlock.farm.registerBlock(new BlockFarm(), ItemBlockFarm.class, "ffarm"); - ForestryBlock.farm.block().setHarvestLevel("pickaxe", 0); + blocks = new BlockRegistryFarming(); } @Override @@ -154,8 +145,6 @@ public class PluginFarming extends ForestryPlugin { public void doInit() { super.doInit(); - farmFertilizer = PluginCore.items.fertilizerCompound.getItemStack(); - GameRegistry.registerTileEntity(TileFarmPlain.class, "forestry.Farm"); GameRegistry.registerTileEntity(TileGearbox.class, "forestry.FarmGearbox"); GameRegistry.registerTileEntity(TileHatch.class, "forestry.FarmHatch"); @@ -179,8 +168,6 @@ public class PluginFarming extends ForestryPlugin { Circuit.farmCocoaManual = new CircuitFarmLogic("manualCocoa", FarmLogicCocoa.class).setManual(); Circuit.farmOrchardManual = new CircuitFarmLogic("manualOrchard", FarmLogicOrchard.class); - - MinecraftForge.EVENT_BUS.register(new EventHandlerFarming()); } @Override @@ -291,11 +278,11 @@ public class PluginFarming extends ForestryPlugin { @Override protected void registerRecipes() { - ItemStack basic = ForestryBlock.farm.getItemStack(1, 0); - ItemStack gearbox = ForestryBlock.farm.getItemStack(1, 2); - ItemStack hatch = ForestryBlock.farm.getItemStack(1, 3); - ItemStack valve = ForestryBlock.farm.getItemStack(1, 4); - ItemStack control = ForestryBlock.farm.getItemStack(1, 5); + ItemStack basic = blocks.farm.get(BlockFarmType.BASIC, 1); + ItemStack gearbox = blocks.farm.get(BlockFarmType.GEARBOX, 1); + ItemStack hatch = blocks.farm.get(BlockFarmType.HATCH, 1); + ItemStack valve = blocks.farm.get(BlockFarmType.VALVE, 1); + ItemStack control = blocks.farm.get(BlockFarmType.CONTROL, 1); for (EnumFarmBlockTexture block : EnumFarmBlockTexture.values()) { NBTTagCompound compound = new NBTTagCompound(); @@ -310,10 +297,10 @@ public class PluginFarming extends ForestryPlugin { 'C', PluginCore.items.tubes.get(EnumElectronTube.TIN, 1), 'I', "ingotCopper"); - ShapedRecipeCustom.buildRecipe(gearbox, " # ", "TTT", '#', basic, 'T', "gearTin"); - ShapedRecipeCustom.buildRecipe(hatch, " # ", "TDT", '#', basic, 'T', "gearTin", 'D', Blocks.trapdoor); - ShapedRecipeCustom.buildRecipe(valve, " # ", "XTX", '#', basic, 'T', "gearTin", 'X', "blockGlass"); - ShapedRecipeCustom.buildRecipe(control, " # ", "XTX", '#', basic, 'T', PluginCore.items.tubes.get(EnumElectronTube.GOLD, 1), 'X', "dustRedstone"); + RecipeUtil.addRecipe(gearbox, " # ", "TTT", '#', basic, 'T', "gearTin"); + RecipeUtil.addRecipe(hatch, " # ", "TDT", '#', basic, 'T', "gearTin", 'D', Blocks.trapdoor); + RecipeUtil.addRecipe(valve, " # ", "XTX", '#', basic, 'T', "gearTin", 'X', "blockGlass"); + RecipeUtil.addRecipe(control, " # ", "XTX", '#', basic, 'T', PluginCore.items.tubes.get(EnumElectronTube.GOLD, 1), 'X', "dustRedstone"); } // Circuits