From ce2a2ec8ed0cd39d6d090b46dcce4f3ce720591e Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 18 Nov 2015 23:46:27 -0800 Subject: [PATCH] Move engine blocks to PluginEnergy.blocks --- .../apiculture/blocks/BlockApiculture.java | 14 +---- .../blocks/BlockApicultureType.java | 5 -- .../blocks/BlockRegistryApiculture.java | 6 +- .../blocks/BlockArboriculture.java | 15 +---- .../blocks/BlockArboricultureType.java | 54 ++++++++++++++++ .../java/forestry/core/blocks/BlockBase.java | 21 ++++--- .../java/forestry/core/blocks/BlockCore.java | 14 +---- .../forestry/core/blocks/BlockCoreType.java | 51 ++++++++++++++- .../core/blocks/BlockRegistryCore.java | 3 +- .../core/blocks/IMachineProperties.java | 5 -- .../core/blocks/IMachinePropertiesTESR.java | 17 +++++ .../java/forestry/core/config/Constants.java | 7 --- .../forestry/core/config/ForestryBlock.java | 1 - .../core/tiles/MachineDefinition.java | 7 ++- .../forestry/energy/blocks/BlockEngine.java | 7 +-- .../energy/blocks/BlockEngineType.java | 62 +++++++++++++++++++ .../energy/blocks/BlockRegistryEnergy.java | 22 +++++++ .../energy/tiles/EngineDefinition.java | 5 ++ .../factory/blocks/BlockFactoryPlain.java | 11 +--- .../factory/blocks/BlockFactoryPlainType.java | 5 -- .../factory/blocks/BlockFactoryTESR.java | 11 +--- .../factory/blocks/BlockFactoryTesrType.java | 14 +++-- .../java/forestry/mail/blocks/BlockMail.java | 11 +--- .../forestry/mail/blocks/BlockMailType.java | 5 -- .../forestry/plugins/PluginApiculture.java | 4 +- .../forestry/plugins/PluginArboriculture.java | 8 +-- .../java/forestry/plugins/PluginCore.java | 9 +-- .../java/forestry/plugins/PluginEnergy.java | 41 +++++------- .../java/forestry/plugins/PluginFactory.java | 4 +- .../plugins/PluginLepidopterology.java | 5 +- .../java/forestry/plugins/PluginMail.java | 2 +- .../forestry/plugins/compat/PluginIC2.java | 58 ++++++++--------- 32 files changed, 313 insertions(+), 191 deletions(-) create mode 100644 src/main/java/forestry/arboriculture/blocks/BlockArboricultureType.java create mode 100644 src/main/java/forestry/core/blocks/IMachinePropertiesTESR.java create mode 100644 src/main/java/forestry/energy/blocks/BlockEngineType.java create mode 100644 src/main/java/forestry/energy/blocks/BlockRegistryEnergy.java diff --git a/src/main/java/forestry/apiculture/blocks/BlockApiculture.java b/src/main/java/forestry/apiculture/blocks/BlockApiculture.java index 7505cc22f..c77ed4c77 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockApiculture.java +++ b/src/main/java/forestry/apiculture/blocks/BlockApiculture.java @@ -10,21 +10,13 @@ ******************************************************************************/ package forestry.apiculture.blocks; -import net.minecraft.block.material.Material; -import net.minecraft.item.ItemStack; - import forestry.api.core.Tabs; import forestry.core.blocks.BlockBase; -public class BlockApiculture extends BlockBase { - - public BlockApiculture(Material material) { - super(material); +public class BlockApiculture extends BlockBase { + public BlockApiculture() { + super(); setCreativeTab(Tabs.tabApiculture); setHarvestLevel("axe", 0); } - - public ItemStack get(BlockApicultureType type, int amount) { - return new ItemStack(this, amount, type.ordinal()); - } } diff --git a/src/main/java/forestry/apiculture/blocks/BlockApicultureType.java b/src/main/java/forestry/apiculture/blocks/BlockApicultureType.java index 6cefa34f5..69de30b0a 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockApicultureType.java +++ b/src/main/java/forestry/apiculture/blocks/BlockApicultureType.java @@ -55,9 +55,4 @@ public enum BlockApicultureType implements IMachineProperties { public Class getTeClass() { return teClass; } - - @Override - public String getGfxBase() { - return null; - } } diff --git a/src/main/java/forestry/apiculture/blocks/BlockRegistryApiculture.java b/src/main/java/forestry/apiculture/blocks/BlockRegistryApiculture.java index 3238e2256..bfac863c9 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockRegistryApiculture.java +++ b/src/main/java/forestry/apiculture/blocks/BlockRegistryApiculture.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.apiculture.blocks; -import net.minecraft.block.material.Material; - import forestry.api.core.Tabs; import forestry.apiculture.items.ItemBlockCandle; import forestry.core.blocks.BlockBase; @@ -27,9 +25,9 @@ public class BlockRegistryApiculture extends BlockRegistry { public final BlockAlveary alveary; public BlockRegistryApiculture() { - apiculture = registerBlock(new BlockApiculture(Material.iron), ItemBlockForestry.class, "apiculture"); + apiculture = registerBlock(new BlockApiculture(), ItemBlockForestry.class, "apiculture"); - apicultureChest = registerBlock(new BlockBase(Material.iron, true), ItemBlockForestry.class, "apicultureChest"); + apicultureChest = registerBlock(new BlockBase(true), ItemBlockForestry.class, "apicultureChest"); apicultureChest.setCreativeTab(Tabs.tabApiculture); apicultureChest.setHarvestLevel("axe", 0); diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArboriculture.java b/src/main/java/forestry/arboriculture/blocks/BlockArboriculture.java index 466331c05..7ff4af2ad 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArboriculture.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArboriculture.java @@ -10,23 +10,12 @@ ******************************************************************************/ package forestry.arboriculture.blocks; -import net.minecraft.block.material.Material; -import net.minecraft.item.ItemStack; - import forestry.api.core.Tabs; import forestry.core.blocks.BlockBase; -public class BlockArboriculture extends BlockBase { - public enum Type { - ARBCHEST; - } - +public class BlockArboriculture extends BlockBase { public BlockArboriculture() { - super(Material.iron, true); + super(true); setCreativeTab(Tabs.tabArboriculture); } - - public ItemStack get(Type type, int amount) { - return new ItemStack(this, amount, type.ordinal()); - } } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArboricultureType.java b/src/main/java/forestry/arboriculture/blocks/BlockArboricultureType.java new file mode 100644 index 000000000..e215a6a5d --- /dev/null +++ b/src/main/java/forestry/arboriculture/blocks/BlockArboricultureType.java @@ -0,0 +1,54 @@ +/******************************************************************************* + * 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.arboriculture.blocks; + +import javax.annotation.Nullable; + +import forestry.arboriculture.tiles.TileArboristChest; +import forestry.core.blocks.IMachinePropertiesTESR; +import forestry.core.proxy.Proxies; +import forestry.core.render.IBlockRenderer; +import forestry.core.tiles.TileForestry; + +public enum BlockArboricultureType implements IMachinePropertiesTESR { + ARBCHEST(TileArboristChest.class, "ArbChest") { + @Nullable + @Override + public IBlockRenderer getRenderer() { + return Proxies.render.getRenderChest("arbchest"); + } + }; + + public static final BlockArboricultureType[] VALUES = values(); + + private final String teIdent; + private final Class teClass; + + BlockArboricultureType(Class teClass, String teName) { + this.teIdent = "forestry." + teName; + this.teClass = teClass; + } + + @Override + public int getMeta() { + return ordinal(); + } + + @Override + public String getTeIdent() { + return teIdent; + } + + @Override + public Class getTeClass() { + return teClass; + } +} diff --git a/src/main/java/forestry/core/blocks/BlockBase.java b/src/main/java/forestry/core/blocks/BlockBase.java index e09e71b33..6f33fda34 100644 --- a/src/main/java/forestry/core/blocks/BlockBase.java +++ b/src/main/java/forestry/core/blocks/BlockBase.java @@ -48,17 +48,16 @@ import forestry.core.tiles.TileUtil; import forestry.core.utils.InventoryUtil; import forestry.core.utils.PlayerUtil; -public class BlockBase extends BlockForestry { - +public class BlockBase extends BlockForestry { private final List definitions = new ArrayList<>(); private final boolean hasTESR; - public BlockBase(Material material) { - this(material, false); + public BlockBase() { + this(false); } - public BlockBase(Material material, boolean hasTESR) { - super(material); + public BlockBase(boolean hasTESR) { + super(Material.iron); this.hasTESR = hasTESR; this.opaque = this.isOpaqueCube(); @@ -247,7 +246,7 @@ public class BlockBase extends BlockForestry { return metadata; } - public void registerDefinitions() { + public void init() { for (MachineDefinition def : definitions) { def.register(); } @@ -288,4 +287,12 @@ public class BlockBase extends BlockForestry { public boolean getUseNeighborBrightness() { return hasTESR; } + + public final ItemStack get(T type) { + return get(type, 1); + } + + public final ItemStack get(T type, int amount) { + return new ItemStack(this, amount, type.getMeta()); + } } diff --git a/src/main/java/forestry/core/blocks/BlockCore.java b/src/main/java/forestry/core/blocks/BlockCore.java index 6a3e63e12..61d4b23fa 100644 --- a/src/main/java/forestry/core/blocks/BlockCore.java +++ b/src/main/java/forestry/core/blocks/BlockCore.java @@ -10,16 +10,8 @@ ******************************************************************************/ package forestry.core.blocks; -import net.minecraft.block.material.Material; -import net.minecraft.item.ItemStack; - -public class BlockCore extends BlockBase { - - public BlockCore(Material material, boolean hasTESR) { - super(material, hasTESR); - } - - public ItemStack get(BlockCoreType type, int amount) { - return new ItemStack(this, amount, type.ordinal()); +public class BlockCore extends BlockBase { + public BlockCore() { + super(true); } } diff --git a/src/main/java/forestry/core/blocks/BlockCoreType.java b/src/main/java/forestry/core/blocks/BlockCoreType.java index 03479fd81..0aaff8751 100644 --- a/src/main/java/forestry/core/blocks/BlockCoreType.java +++ b/src/main/java/forestry/core/blocks/BlockCoreType.java @@ -10,9 +10,54 @@ ******************************************************************************/ package forestry.core.blocks; -public enum BlockCoreType { - ANALYZER, - ESCRITOIRE; +import javax.annotation.Nullable; + +import forestry.core.config.Constants; +import forestry.core.proxy.Proxies; +import forestry.core.render.IBlockRenderer; +import forestry.core.tiles.TileAnalyzer; +import forestry.core.tiles.TileEscritoire; +import forestry.core.tiles.TileForestry; +import forestry.plugins.PluginApiculture; + +public enum BlockCoreType implements IMachinePropertiesTESR { + ANALYZER(TileAnalyzer.class, "Analyzer") { + @Nullable + @Override + public IBlockRenderer getRenderer() { + return PluginApiculture.proxy.getRendererAnalyzer(Constants.TEXTURE_PATH_BLOCKS + "/analyzer_"); + } + }, + ESCRITOIRE(TileEscritoire.class, "Escritoire") { + @Nullable + @Override + public IBlockRenderer getRenderer() { + return Proxies.render.getRenderEscritoire(); + } + }; public static final BlockCoreType[] VALUES = values(); + + private final String teIdent; + private final Class teClass; + + BlockCoreType(Class teClass, String teName) { + this.teIdent = "forestry." + teName; + this.teClass = teClass; + } + + @Override + public int getMeta() { + return ordinal(); + } + + @Override + public String getTeIdent() { + return teIdent; + } + + @Override + public Class getTeClass() { + return teClass; + } } diff --git a/src/main/java/forestry/core/blocks/BlockRegistryCore.java b/src/main/java/forestry/core/blocks/BlockRegistryCore.java index 9464e5c53..fab994b03 100644 --- a/src/main/java/forestry/core/blocks/BlockRegistryCore.java +++ b/src/main/java/forestry/core/blocks/BlockRegistryCore.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.core.blocks; -import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraftforge.oredict.OreDictionary; @@ -25,7 +24,7 @@ public class BlockRegistryCore extends BlockRegistry { public final BlockResourceStorage resourceStorage; public BlockRegistryCore() { - core = registerBlock(new BlockCore(Material.iron, true), ItemBlockForestry.class, "core"); + core = registerBlock(new BlockCore(), ItemBlockForestry.class, "core"); soil = registerBlock(new BlockSoil(), ItemBlockTyped.class, "soil"); soil.setHarvestLevel("shovel", 0, 0); diff --git a/src/main/java/forestry/core/blocks/IMachineProperties.java b/src/main/java/forestry/core/blocks/IMachineProperties.java index dda89b04b..cf433c41b 100644 --- a/src/main/java/forestry/core/blocks/IMachineProperties.java +++ b/src/main/java/forestry/core/blocks/IMachineProperties.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.core.blocks; -import javax.annotation.Nullable; - import forestry.core.tiles.TileForestry; public interface IMachineProperties { @@ -20,7 +18,4 @@ public interface IMachineProperties { String getTeIdent(); Class getTeClass(); - - @Nullable - String getGfxBase(); } diff --git a/src/main/java/forestry/core/blocks/IMachinePropertiesTESR.java b/src/main/java/forestry/core/blocks/IMachinePropertiesTESR.java new file mode 100644 index 000000000..677e997ba --- /dev/null +++ b/src/main/java/forestry/core/blocks/IMachinePropertiesTESR.java @@ -0,0 +1,17 @@ +/******************************************************************************* + * 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.core.blocks; + +import forestry.core.render.IBlockRenderer; + +public interface IMachinePropertiesTESR extends IMachineProperties { + IBlockRenderer getRenderer(); +} diff --git a/src/main/java/forestry/core/config/Constants.java b/src/main/java/forestry/core/config/Constants.java index cbb28d6c3..0254c2b67 100644 --- a/src/main/java/forestry/core/config/Constants.java +++ b/src/main/java/forestry/core/config/Constants.java @@ -48,13 +48,6 @@ public class Constants implements IForestryConstants { // Village Chest Gen hook public static final String CHEST_GEN_HOOK_NATURALIST_CHEST = "naturalistChest"; - // Definition IDs - public static final int DEFINITION_ENGINE_ELECTRIC_META = 0; - public static final int DEFINITION_ENGINE_PEAT_META = 1; - public static final int DEFINITION_ENGINE_BIOGAS_META = 2; - public static final int DEFINITION_GENERATOR_META = 3; - public static final int DEFINITION_ENGINE_CLOCKWORK_META = 4; - public static final int DEFINITION_LEPICHEST_META = 0; // Item Ids diff --git a/src/main/java/forestry/core/config/ForestryBlock.java b/src/main/java/forestry/core/config/ForestryBlock.java index 89232be86..966abf9e8 100755 --- a/src/main/java/forestry/core/config/ForestryBlock.java +++ b/src/main/java/forestry/core/config/ForestryBlock.java @@ -34,7 +34,6 @@ import forestry.plugins.PluginManager.Stage; * @author SirSengir */ public enum ForestryBlock { - engine, lepidopterology; private Block block; diff --git a/src/main/java/forestry/core/tiles/MachineDefinition.java b/src/main/java/forestry/core/tiles/MachineDefinition.java index 0495e070a..63c4ca3b4 100644 --- a/src/main/java/forestry/core/tiles/MachineDefinition.java +++ b/src/main/java/forestry/core/tiles/MachineDefinition.java @@ -33,6 +33,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.core.blocks.IMachineProperties; +import forestry.core.blocks.IMachinePropertiesTESR; import forestry.core.proxy.Proxies; import forestry.core.render.IBlockRenderer; import forestry.core.render.TextureManager; @@ -56,7 +57,11 @@ public class MachineDefinition { } public MachineDefinition(IMachineProperties properties) { - this(properties.getMeta(), properties.getTeIdent(), properties.getTeClass(), Proxies.render.getRenderDefaultMachine(properties.getGfxBase())); + this(properties.getMeta(), properties.getTeIdent(), properties.getTeClass(), null); + } + + public MachineDefinition(IMachinePropertiesTESR properties) { + this(properties.getMeta(), properties.getTeIdent(), properties.getTeClass(), properties.getRenderer()); } public MachineDefinition(int meta, String teIdent, Class teClass, IBlockRenderer renderer) { diff --git a/src/main/java/forestry/energy/blocks/BlockEngine.java b/src/main/java/forestry/energy/blocks/BlockEngine.java index 750906968..2741cede3 100644 --- a/src/main/java/forestry/energy/blocks/BlockEngine.java +++ b/src/main/java/forestry/energy/blocks/BlockEngine.java @@ -15,7 +15,6 @@ import com.google.common.collect.ImmutableList; import java.util.EnumMap; import java.util.List; -import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MovingObjectPosition; @@ -28,7 +27,7 @@ import forestry.core.blocks.BlockBase; import forestry.core.tiles.TileEngine; import forestry.core.tiles.TileUtil; -public class BlockEngine extends BlockBase { +public class BlockEngine extends BlockBase { private static final EnumMap> boundingBoxesForDirections = new EnumMap<>(ForgeDirection.class); static { @@ -52,8 +51,8 @@ public class BlockEngine extends BlockBase { )); } - public BlockEngine(Material material) { - super(material, true); + public BlockEngine() { + super(true); } @Override diff --git a/src/main/java/forestry/energy/blocks/BlockEngineType.java b/src/main/java/forestry/energy/blocks/BlockEngineType.java new file mode 100644 index 000000000..4b0045385 --- /dev/null +++ b/src/main/java/forestry/energy/blocks/BlockEngineType.java @@ -0,0 +1,62 @@ +/******************************************************************************* + * 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.energy.blocks; + +import forestry.core.blocks.IMachinePropertiesTESR; +import forestry.core.config.Constants; +import forestry.core.render.IBlockRenderer; +import forestry.core.tiles.TileForestry; +import forestry.energy.tiles.TileEngineBiogas; +import forestry.energy.tiles.TileEngineClockwork; +import forestry.energy.tiles.TileEngineElectric; +import forestry.energy.tiles.TileEnginePeat; +import forestry.energy.tiles.TileGenerator; +import forestry.plugins.PluginEnergy; + +public enum BlockEngineType implements IMachinePropertiesTESR { + ELECTRIC(TileEngineElectric.class, "EngineTin", "/engine_tin_"), + PEAT(TileEnginePeat.class, "EngineCopper", "/engine_copper_"), + BIOGAS(TileEngineBiogas.class, "EngineBronze", "/engine_bronze_"), + GENERATOR(TileGenerator.class, "Generator", "/generator_"), + CLOCKWORK(TileEngineClockwork.class, "EngineClockwork", "/engine_clock_"); + + public static final BlockEngineType[] VALUES = values(); + + private final String teIdent; + private final Class teClass; + private final IBlockRenderer renderer; + + BlockEngineType(Class teClass, String teName, String textureName) { + this.teIdent = "forestry." + teName; + this.teClass = teClass; + this.renderer = PluginEnergy.proxy.getRenderDefaultEngine(Constants.TEXTURE_PATH_BLOCKS + textureName); + } + + @Override + public int getMeta() { + return ordinal(); + } + + @Override + public String getTeIdent() { + return teIdent; + } + + @Override + public Class getTeClass() { + return teClass; + } + + @Override + public IBlockRenderer getRenderer() { + return renderer; + } +} diff --git a/src/main/java/forestry/energy/blocks/BlockRegistryEnergy.java b/src/main/java/forestry/energy/blocks/BlockRegistryEnergy.java new file mode 100644 index 000000000..816fa4295 --- /dev/null +++ b/src/main/java/forestry/energy/blocks/BlockRegistryEnergy.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.energy.blocks; + +import forestry.core.blocks.BlockRegistry; +import forestry.core.items.ItemBlockForestry; + +public class BlockRegistryEnergy extends BlockRegistry { + public final BlockEngine engine; + + public BlockRegistryEnergy() { + engine = registerBlock(new BlockEngine(), ItemBlockForestry.class, "engine"); + } +} diff --git a/src/main/java/forestry/energy/tiles/EngineDefinition.java b/src/main/java/forestry/energy/tiles/EngineDefinition.java index e22f9e802..ea972b5a1 100644 --- a/src/main/java/forestry/energy/tiles/EngineDefinition.java +++ b/src/main/java/forestry/energy/tiles/EngineDefinition.java @@ -12,6 +12,7 @@ package forestry.energy.tiles; import net.minecraft.world.IBlockAccess; +import forestry.core.blocks.IMachineProperties; import forestry.core.render.IBlockRenderer; import forestry.core.tiles.MachineDefinition; import forestry.core.tiles.TileEngine; @@ -20,6 +21,10 @@ import forestry.core.tiles.TileUtil; public class EngineDefinition extends MachineDefinition { + public EngineDefinition(IMachineProperties properties) { + super(properties); + } + public EngineDefinition(int meta, String teIdent, Class teClass, IBlockRenderer renderer) { super(meta, teIdent, teClass, renderer); } diff --git a/src/main/java/forestry/factory/blocks/BlockFactoryPlain.java b/src/main/java/forestry/factory/blocks/BlockFactoryPlain.java index caf710b09..344a60426 100644 --- a/src/main/java/forestry/factory/blocks/BlockFactoryPlain.java +++ b/src/main/java/forestry/factory/blocks/BlockFactoryPlain.java @@ -10,17 +10,10 @@ ******************************************************************************/ package forestry.factory.blocks; -import net.minecraft.block.material.Material; -import net.minecraft.item.ItemStack; - import forestry.core.blocks.BlockBase; -public class BlockFactoryPlain extends BlockBase { +public class BlockFactoryPlain extends BlockBase { public BlockFactoryPlain() { - super(Material.iron); - } - - public ItemStack get(BlockFactoryPlainType type) { - return new ItemStack(this, 1, type.ordinal()); + super(); } } diff --git a/src/main/java/forestry/factory/blocks/BlockFactoryPlainType.java b/src/main/java/forestry/factory/blocks/BlockFactoryPlainType.java index b2152c1de..14b52f4cd 100644 --- a/src/main/java/forestry/factory/blocks/BlockFactoryPlainType.java +++ b/src/main/java/forestry/factory/blocks/BlockFactoryPlainType.java @@ -50,9 +50,4 @@ public enum BlockFactoryPlainType implements IMachineProperties { public Class getTeClass() { return teClass; } - - @Override - public String getGfxBase() { - return null; - } } diff --git a/src/main/java/forestry/factory/blocks/BlockFactoryTESR.java b/src/main/java/forestry/factory/blocks/BlockFactoryTESR.java index dd927c850..01568da3b 100644 --- a/src/main/java/forestry/factory/blocks/BlockFactoryTESR.java +++ b/src/main/java/forestry/factory/blocks/BlockFactoryTESR.java @@ -10,17 +10,10 @@ ******************************************************************************/ package forestry.factory.blocks; -import net.minecraft.block.material.Material; -import net.minecraft.item.ItemStack; - import forestry.core.blocks.BlockBase; -public class BlockFactoryTesr extends BlockBase { +public class BlockFactoryTesr extends BlockBase { public BlockFactoryTesr() { - super(Material.iron, true); - } - - public ItemStack get(BlockFactoryTesrType type) { - return new ItemStack(this, 1, type.ordinal()); + super(true); } } diff --git a/src/main/java/forestry/factory/blocks/BlockFactoryTesrType.java b/src/main/java/forestry/factory/blocks/BlockFactoryTesrType.java index 0312cc77f..e97a13ecb 100644 --- a/src/main/java/forestry/factory/blocks/BlockFactoryTesrType.java +++ b/src/main/java/forestry/factory/blocks/BlockFactoryTesrType.java @@ -14,8 +14,10 @@ import java.util.Locale; import org.apache.commons.lang3.text.WordUtils; -import forestry.core.blocks.IMachineProperties; +import forestry.core.blocks.IMachinePropertiesTESR; import forestry.core.config.Constants; +import forestry.core.proxy.Proxies; +import forestry.core.render.IBlockRenderer; import forestry.core.tiles.TileForestry; import forestry.factory.tiles.TileBottler; import forestry.factory.tiles.TileCarpenter; @@ -26,7 +28,7 @@ import forestry.factory.tiles.TileMoistener; import forestry.factory.tiles.TileSqueezer; import forestry.factory.tiles.TileStill; -public enum BlockFactoryTesrType implements IMachineProperties { +public enum BlockFactoryTesrType implements IMachinePropertiesTESR { BOTTLER(TileBottler.class), CARPENTER(TileCarpenter.class), CENTRIFUGE(TileCentrifuge.class), @@ -40,13 +42,13 @@ public enum BlockFactoryTesrType implements IMachineProperties { private final String teIdent; private final Class teClass; - private final String gfxBase; + private final IBlockRenderer renderer; BlockFactoryTesrType(Class teClass) { String name = toString().toLowerCase(Locale.ENGLISH); this.teIdent = "forestry." + WordUtils.capitalize(name); this.teClass = teClass; - this.gfxBase = Constants.TEXTURE_PATH_BLOCKS + "/" + name + "_"; + this.renderer = Proxies.render.getRenderDefaultMachine(Constants.TEXTURE_PATH_BLOCKS + "/" + name + "_"); } @Override @@ -65,7 +67,7 @@ public enum BlockFactoryTesrType implements IMachineProperties { } @Override - public String getGfxBase() { - return gfxBase; + public IBlockRenderer getRenderer() { + return renderer; } } diff --git a/src/main/java/forestry/mail/blocks/BlockMail.java b/src/main/java/forestry/mail/blocks/BlockMail.java index fe97921c9..412a048e7 100644 --- a/src/main/java/forestry/mail/blocks/BlockMail.java +++ b/src/main/java/forestry/mail/blocks/BlockMail.java @@ -10,17 +10,10 @@ ******************************************************************************/ 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 class BlockMail extends BlockBase { public BlockMail() { - super(Material.iron); - } - - public ItemStack get(BlockMailType type) { - return new ItemStack(this, 1, type.ordinal()); + super(); } } diff --git a/src/main/java/forestry/mail/blocks/BlockMailType.java b/src/main/java/forestry/mail/blocks/BlockMailType.java index 8bbb361d6..d7c92d342 100644 --- a/src/main/java/forestry/mail/blocks/BlockMailType.java +++ b/src/main/java/forestry/mail/blocks/BlockMailType.java @@ -50,9 +50,4 @@ public enum BlockMailType implements IMachineProperties { public Class getTeClass() { return teClass; } - - @Override - public String getGfxBase() { - return null; - } } diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index 8a83285c8..a98d83f74 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -313,8 +313,8 @@ public class PluginApiculture extends ForestryPlugin { proxy.initializeRendering(); - blocks.apiculture.registerDefinitions(); - blocks.apicultureChest.registerDefinitions(); + blocks.apiculture.init(); + blocks.apicultureChest.init(); } @Override diff --git a/src/main/java/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/plugins/PluginArboriculture.java index b3f84472a..369a0b4c8 100644 --- a/src/main/java/forestry/plugins/PluginArboriculture.java +++ b/src/main/java/forestry/plugins/PluginArboriculture.java @@ -41,7 +41,7 @@ import forestry.api.storage.StorageManager; import forestry.arboriculture.GuiHandlerArboriculture; import forestry.arboriculture.VillageHandlerArboriculture; import forestry.arboriculture.WoodItemAccess; -import forestry.arboriculture.blocks.BlockArboriculture; +import forestry.arboriculture.blocks.BlockArboricultureType; import forestry.arboriculture.blocks.BlockRegistryArboriculture; import forestry.arboriculture.commands.CommandTree; import forestry.arboriculture.genetics.TreeBranchDefinition; @@ -137,7 +137,7 @@ public class PluginArboriculture extends ForestryPlugin { WoodItemAccess.registerStairs(blocks.stairsFireproof, woodType, true); } - MachineDefinition definitionChest = new MachineDefinition(BlockArboriculture.Type.ARBCHEST.ordinal(), + MachineDefinition definitionChest = new MachineDefinition(BlockArboricultureType.ARBCHEST.ordinal(), "forestry.ArbChest", TileArboristChest.class, Proxies.render.getRenderChest("arbchest")) .setBoundingBox(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.875F, 0.9375F); blocks.arboriculture.addDefinition(definitionChest); @@ -170,7 +170,7 @@ public class PluginArboriculture extends ForestryPlugin { GameRegistry.registerTileEntity(TileWood.class, "forestry.Wood"); GameRegistry.registerTileEntity(TileFruitPod.class, "forestry.Pods"); - blocks.arboriculture.registerDefinitions(); + blocks.arboriculture.init(); if (Config.enableVillagers) { VillagerRegistry.instance().registerVillagerId(Constants.ID_VILLAGER_LUMBERJACK); @@ -328,7 +328,7 @@ public class PluginArboriculture extends ForestryPlugin { 'T', items.treealyzer, 'X', "ingotBronze"); - RecipeUtil.addRecipe(blocks.arboriculture.get(BlockArboriculture.Type.ARBCHEST, 1), + RecipeUtil.addRecipe(blocks.arboriculture.get(BlockArboricultureType.ARBCHEST, 1), " # ", "XYX", "XXX", diff --git a/src/main/java/forestry/plugins/PluginCore.java b/src/main/java/forestry/plugins/PluginCore.java index 497fe672d..eb15ba1a2 100644 --- a/src/main/java/forestry/plugins/PluginCore.java +++ b/src/main/java/forestry/plugins/PluginCore.java @@ -59,8 +59,6 @@ import forestry.core.recipes.RecipeUtil; import forestry.core.recipes.ShapedRecipeCustom; import forestry.core.recipes.ShapelessRecipeCustom; import forestry.core.tiles.MachineDefinition; -import forestry.core.tiles.TileAnalyzer; -import forestry.core.tiles.TileEscritoire; import forestry.core.utils.ClimateUtil; import forestry.core.utils.ForestryModEnvWarningCallable; @@ -103,9 +101,8 @@ public class PluginCore extends ForestryPlugin { rootCommand.addChildCommand(new CommandPlugins()); blocks.core.addDefinitions( - new MachineDefinition(BlockCoreType.ESCRITOIRE.ordinal(), "forestry.Escritoire", TileEscritoire.class, Proxies.render.getRenderEscritoire()), - new MachineDefinition(BlockCoreType.ANALYZER.ordinal(), "forestry.Analyzer", TileAnalyzer.class, - PluginApiculture.proxy.getRendererAnalyzer(Constants.TEXTURE_PATH_BLOCKS + "/analyzer_")) + new MachineDefinition(BlockCoreType.ESCRITOIRE), + new MachineDefinition(BlockCoreType.ANALYZER) ); } @@ -115,7 +112,7 @@ public class PluginCore extends ForestryPlugin { Proxies.render.init(); - blocks.core.registerDefinitions(); + blocks.core.init(); ForestryModEnvWarningCallable.register(); diff --git a/src/main/java/forestry/plugins/PluginEnergy.java b/src/main/java/forestry/plugins/PluginEnergy.java index 0b50c98be..a2c75892f 100755 --- a/src/main/java/forestry/plugins/PluginEnergy.java +++ b/src/main/java/forestry/plugins/PluginEnergy.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.plugins; -import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -18,18 +17,13 @@ import cpw.mods.fml.common.SidedProxy; import forestry.api.core.ForestryAPI; import forestry.core.GuiHandlerBase; -import forestry.core.blocks.BlockBase; import forestry.core.config.Constants; -import forestry.core.config.ForestryBlock; -import forestry.core.items.ItemBlockForestry; import forestry.core.recipes.RecipeUtil; import forestry.energy.GuiHandlerEnergy; -import forestry.energy.blocks.BlockEngine; +import forestry.energy.blocks.BlockEngineType; +import forestry.energy.blocks.BlockRegistryEnergy; import forestry.energy.proxy.ProxyEnergy; import forestry.energy.tiles.EngineDefinition; -import forestry.energy.tiles.TileEngineBiogas; -import forestry.energy.tiles.TileEngineClockwork; -import forestry.energy.tiles.TileEnginePeat; @Plugin(pluginID = "Energy", name = "Energy", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.energy.description") public class PluginEnergy extends ForestryPlugin { @@ -37,38 +31,35 @@ public class PluginEnergy extends ForestryPlugin { @SidedProxy(clientSide = "forestry.energy.proxy.ProxyEnergyClient", serverSide = "forestry.energy.proxy.ProxyEnergy") public static ProxyEnergy proxy; + public static BlockRegistryEnergy blocks; + @Override protected void registerItemsAndBlocks() { - super.registerItemsAndBlocks(); - - ForestryBlock.engine.registerBlock(new BlockEngine(Material.iron), ItemBlockForestry.class, "engine"); + blocks = new BlockRegistryEnergy(); } @Override public void preInit() { - EngineDefinition definitionEnginePeat = new EngineDefinition(Constants.DEFINITION_ENGINE_PEAT_META, "forestry.EngineCopper", TileEnginePeat.class, - PluginEnergy.proxy.getRenderDefaultEngine(Constants.TEXTURE_PATH_BLOCKS + "/engine_copper_")); - ((BlockBase) ForestryBlock.engine.block()).addDefinition(definitionEnginePeat); + blocks.engine.addDefinitions( + new EngineDefinition(BlockEngineType.PEAT), + new EngineDefinition(BlockEngineType.BIOGAS) + ); - EngineDefinition definitionEngineBiogas = new EngineDefinition(Constants.DEFINITION_ENGINE_BIOGAS_META, "forestry.EngineBronze", TileEngineBiogas.class, - PluginEnergy.proxy.getRenderDefaultEngine(Constants.TEXTURE_PATH_BLOCKS + "/engine_bronze_")); - ((BlockBase) ForestryBlock.engine.block()).addDefinition(definitionEngineBiogas); - - EngineDefinition definitionEngineClockwork = new EngineDefinition(Constants.DEFINITION_ENGINE_CLOCKWORK_META, "forestry.EngineClockwork", TileEngineClockwork.class, - PluginEnergy.proxy.getRenderDefaultEngine(Constants.TEXTURE_PATH_BLOCKS + "/engine_clock_")); - ((BlockBase) ForestryBlock.engine.block()).addDefinition(definitionEngineClockwork); + if (ForestryAPI.activeMode.getBooleanSetting("energy.engine.clockwork")) { + blocks.engine.addDefinition(new EngineDefinition(BlockEngineType.CLOCKWORK)); + } } @Override public void doInit() { - ((BlockBase) ForestryBlock.engine.block()).registerDefinitions(); + blocks.engine.init(); } @Override protected void registerRecipes() { super.registerRecipes(); - RecipeUtil.addRecipe(ForestryBlock.engine.getItemStack(1, Constants.DEFINITION_ENGINE_PEAT_META), + RecipeUtil.addRecipe(blocks.engine.get(BlockEngineType.PEAT), "###", " X ", "YVY", @@ -77,7 +68,7 @@ public class PluginEnergy extends ForestryPlugin { 'Y', "gearCopper", 'V', Blocks.piston); - RecipeUtil.addRecipe(ForestryBlock.engine.getItemStack(1, Constants.DEFINITION_ENGINE_BIOGAS_META), + RecipeUtil.addRecipe(blocks.engine.get(BlockEngineType.BIOGAS), "###", " X ", "YVY", @@ -87,7 +78,7 @@ public class PluginEnergy extends ForestryPlugin { 'V', Blocks.piston); if (ForestryAPI.activeMode.getBooleanSetting("energy.engine.clockwork")) { - RecipeUtil.addRecipe(ForestryBlock.engine.getItemStack(1, Constants.DEFINITION_ENGINE_CLOCKWORK_META), + RecipeUtil.addRecipe(blocks.engine.get(BlockEngineType.CLOCKWORK), "###", " X ", "ZVY", diff --git a/src/main/java/forestry/plugins/PluginFactory.java b/src/main/java/forestry/plugins/PluginFactory.java index ffab24c43..8695d0015 100644 --- a/src/main/java/forestry/plugins/PluginFactory.java +++ b/src/main/java/forestry/plugins/PluginFactory.java @@ -218,8 +218,8 @@ public class PluginFactory extends ForestryPlugin { public void doInit() { super.doInit(); - blocks.factoryTESR.registerDefinitions(); - blocks.factoryPlain.registerDefinitions(); + blocks.factoryTESR.init(); + blocks.factoryPlain.init(); Circuit.machineSpeedUpgrade1 = new CircuitSpeedUpgrade("machine.speed.boost.1", 0.125f, 0.05f, 4); Circuit.machineSpeedUpgrade2 = new CircuitSpeedUpgrade("machine.speed.boost.2", 0.250f, 0.10f, 4); diff --git a/src/main/java/forestry/plugins/PluginLepidopterology.java b/src/main/java/forestry/plugins/PluginLepidopterology.java index bd35892ec..4245f7fe2 100755 --- a/src/main/java/forestry/plugins/PluginLepidopterology.java +++ b/src/main/java/forestry/plugins/PluginLepidopterology.java @@ -13,7 +13,6 @@ package forestry.plugins; import java.io.File; import java.util.EnumSet; -import net.minecraft.block.material.Material; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; @@ -80,7 +79,7 @@ public class PluginLepidopterology extends ForestryPlugin { protected void registerItemsAndBlocks() { items = new ItemRegistryLepidopterology(); - ForestryBlock.lepidopterology.registerBlock(new BlockBase(Material.iron, true), ItemBlockForestry.class, "lepidopterology"); + ForestryBlock.lepidopterology.registerBlock(new BlockBase(true), ItemBlockForestry.class, "lepidopterology"); ForestryBlock.lepidopterology.block().setCreativeTab(Tabs.tabLepidopterology); } @@ -115,7 +114,7 @@ public class PluginLepidopterology extends ForestryPlugin { MothDefinition.initMoths(); ButterflyDefinition.initButterflies(); - ((BlockBase) ForestryBlock.lepidopterology.block()).registerDefinitions(); + ((BlockBase) ForestryBlock.lepidopterology.block()).init(); TreeManager.treeRoot.registerLeafTickHandler(new ButterflySpawner()); diff --git a/src/main/java/forestry/plugins/PluginMail.java b/src/main/java/forestry/plugins/PluginMail.java index a2db54c89..6f6ab36f9 100755 --- a/src/main/java/forestry/plugins/PluginMail.java +++ b/src/main/java/forestry/plugins/PluginMail.java @@ -88,7 +88,7 @@ public class PluginMail extends ForestryPlugin { public void doInit() { super.doInit(); - blocks.mail.registerDefinitions(); + blocks.mail.init(); } @Override diff --git a/src/main/java/forestry/plugins/compat/PluginIC2.java b/src/main/java/forestry/plugins/compat/PluginIC2.java index 95f74dd88..2a0cc6351 100644 --- a/src/main/java/forestry/plugins/compat/PluginIC2.java +++ b/src/main/java/forestry/plugins/compat/PluginIC2.java @@ -37,25 +37,21 @@ import forestry.api.storage.ICrateRegistry; import forestry.api.storage.StorageManager; import forestry.apiculture.items.EnumPropolis; import forestry.apiculture.items.ItemRegistryApiculture; -import forestry.core.blocks.BlockBase; import forestry.core.circuits.Circuit; import forestry.core.circuits.CircuitLayout; import forestry.core.config.Constants; -import forestry.core.config.ForestryBlock; import forestry.core.fluids.Fluids; import forestry.core.items.EnumElectronTube; -import forestry.core.proxy.Proxies; import forestry.core.recipes.RecipeUtil; -import forestry.core.tiles.MachineDefinition; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; import forestry.core.utils.ModUtil; +import forestry.energy.blocks.BlockEngineType; +import forestry.energy.blocks.BlockRegistryEnergy; import forestry.energy.circuits.CircuitElectricBoost; import forestry.energy.circuits.CircuitElectricChoke; import forestry.energy.circuits.CircuitElectricEfficiency; import forestry.energy.tiles.EngineDefinition; -import forestry.energy.tiles.TileEngineElectric; -import forestry.energy.tiles.TileGenerator; import forestry.farming.circuits.CircuitFarmLogic; import forestry.farming.logic.FarmLogicRubber; import forestry.plugins.ForestryPlugin; @@ -113,7 +109,6 @@ public class PluginIC2 extends ForestryPlugin { EnumSet deps = super.getDependancies(); deps.add(PluginManager.Module.FARMING); deps.add(PluginManager.Module.FACTORY); - deps.add(PluginManager.Module.ENERGY); return deps; } @@ -122,13 +117,13 @@ public class PluginIC2 extends ForestryPlugin { public void preInit() { super.preInit(); - EngineDefinition definitionEngineElectric = new EngineDefinition(Constants.DEFINITION_ENGINE_ELECTRIC_META, "forestry.EngineTin", TileEngineElectric.class, - PluginEnergy.proxy.getRenderDefaultEngine(Constants.TEXTURE_PATH_BLOCKS + "/engine_tin_")); - ((BlockBase) ForestryBlock.engine.block()).addDefinition(definitionEngineElectric); - - MachineDefinition definitionGenerator = new MachineDefinition(Constants.DEFINITION_GENERATOR_META, "forestry.Generator", TileGenerator.class, - Proxies.render.getRenderDefaultMachine(Constants.TEXTURE_PATH_BLOCKS + "/generator_")); - ((BlockBase) ForestryBlock.engine.block()).addDefinition(definitionGenerator); + BlockRegistryEnergy energyBlocks = PluginEnergy.blocks; + if (energyBlocks != null) { + energyBlocks.engine.addDefinitions( + new EngineDefinition(BlockEngineType.ELECTRIC), + new EngineDefinition(BlockEngineType.GENERATOR) + ); + } emptyCell = IC2Items.getItem("cell"); if (emptyCell != null) { @@ -179,8 +174,6 @@ public class PluginIC2 extends ForestryPlugin { Log.severe("IC2 Recipes.recyclerBlacklist not found."); } - ((BlockBase) ForestryBlock.engine.block()).registerDefinitions(); - Circuit.energyElectricChoke1 = new CircuitElectricChoke("electric.choke.1"); Circuit.energyElectricEfficiency1 = new CircuitElectricEfficiency("electric.efficiency.1"); Circuit.energyElectricBoost1 = new CircuitElectricBoost("electric.boost.1", 2, 7, 20); @@ -307,21 +300,24 @@ public class PluginIC2 extends ForestryPlugin { ChipsetManager.solderManager.addRecipe(layoutManual, PluginCore.items.tubes.get(EnumElectronTube.RUBBER, 1), Circuit.farmRubberManual); } - RecipeUtil.addRecipe(ForestryBlock.engine.getItemStack(1, Constants.DEFINITION_GENERATOR_META), - "X#X", - "XYX", - "X#X", - '#', "blockGlass", - 'X', "ingotGold", - 'Y', PluginCore.items.sturdyCasing); + BlockRegistryEnergy energyBlocks = PluginEnergy.blocks; + if (energyBlocks != null) { + RecipeUtil.addRecipe(energyBlocks.engine.get(BlockEngineType.GENERATOR), + "X#X", + "XYX", + "X#X", + '#', "blockGlass", + 'X', "ingotGold", + 'Y', PluginCore.items.sturdyCasing); - RecipeUtil.addRecipe(ForestryBlock.engine.getItemStack(1, Constants.DEFINITION_ENGINE_ELECTRIC_META), - "###", - " X ", - "YVY", - '#', "ingotTin", - 'X', "blockGlass", - 'Y', "gearTin", - 'V', Blocks.piston); + RecipeUtil.addRecipe(energyBlocks.engine.get(BlockEngineType.ELECTRIC), + "###", + " X ", + "YVY", + '#', "ingotTin", + 'X', "blockGlass", + 'Y', "gearTin", + 'V', Blocks.piston); + } } }