diff --git a/src/main/java/forestry/core/config/ForestryBlock.java b/src/main/java/forestry/core/config/ForestryBlock.java index 3f1383cd4..c98e34a9f 100755 --- a/src/main/java/forestry/core/config/ForestryBlock.java +++ b/src/main/java/forestry/core/config/ForestryBlock.java @@ -51,7 +51,6 @@ public enum ForestryBlock { mushroom, candle, stump, - glass, // wood items planks, slabs, diff --git a/src/main/java/forestry/core/gadgets/BlockStainedGlass.java b/src/main/java/forestry/core/gadgets/BlockStainedGlass.java deleted file mode 100755 index f2313168f..000000000 --- a/src/main/java/forestry/core/gadgets/BlockStainedGlass.java +++ /dev/null @@ -1,111 +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.core.gadgets; - -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockBreakable; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.core.CreativeTabForestry; -import forestry.core.render.TextureManager; - -public class BlockStainedGlass extends BlockBreakable { - - public BlockStainedGlass() { - super("", Material.glass, true); - setHardness(0.3F); - setStepSound(soundTypeGlass); - setCreativeTab(CreativeTabForestry.tabForestry); - } - - @SuppressWarnings({"rawtypes", "unchecked"}) - @Override - public void getSubBlocks(Item item, CreativeTabs par2CreativeTabs, List itemList) { - for (int i = 0; i < 16; i++) { - itemList.add(new ItemStack(this, 1, i)); - } - } - - /* ICONS */ - @SideOnly(Side.CLIENT) - private IIcon[] icons; - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister register) { - icons = new IIcon[16]; - for (int i = 0; i < 16; i++) { - icons[i] = TextureManager.getInstance().registerTex(register, "stained/" + i); - } - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - return icons[15 - meta]; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { - return this.getIcon(side, world.getBlockMetadata(x, y, z)); - } - - @Override - @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int meta) { - Block block = world.getBlock(x, y, z); - return block != this && super.shouldSideBeRendered(world, x, y, z, meta); - } - - @Override - public int damageDropped(int meta) { - return meta; - } - - @Override - public int quantityDropped(Random rand) { - return 0; - } - - @Override - public int getRenderBlockPass() { - return 1; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - protected boolean canSilkHarvest() { - return true; - } - -} diff --git a/src/main/java/forestry/plugins/PluginCore.java b/src/main/java/forestry/plugins/PluginCore.java index 2439c24ba..3b74bcb81 100644 --- a/src/main/java/forestry/plugins/PluginCore.java +++ b/src/main/java/forestry/plugins/PluginCore.java @@ -49,7 +49,6 @@ import forestry.core.gadgets.BlockBase; import forestry.core.gadgets.BlockResource; import forestry.core.gadgets.BlockResourceStorageBlock; import forestry.core.gadgets.BlockSoil; -import forestry.core.gadgets.BlockStainedGlass; import forestry.core.gadgets.MachineDefinition; import forestry.core.gadgets.TileEscritoire; import forestry.core.genetics.ClimateHelper; @@ -136,7 +135,6 @@ public class PluginCore extends ForestryPlugin { OreDictionary.registerOre("blockBronze", ForestryBlock.resourceStorage.getItemStack(1, 3)); OreDictionary.registerOre("chestWood", Blocks.chest); OreDictionary.registerOre("craftingTableWood", Blocks.crafting_table); - ForestryBlock.glass.registerBlock(new BlockStainedGlass(), ItemForestryBlock.class, "stained"); } @Override diff --git a/src/main/java/forestry/plugins/PluginFactory.java b/src/main/java/forestry/plugins/PluginFactory.java index fd8816bdd..465ae5d13 100644 --- a/src/main/java/forestry/plugins/PluginFactory.java +++ b/src/main/java/forestry/plugins/PluginFactory.java @@ -310,7 +310,7 @@ public class PluginFactory extends ForestryPlugin { if (PluginManager.Module.APICULTURE.isEnabled()) { FluidStack liquidGlass = Fluids.GLASS.getFluid(Defaults.BUCKET_VOLUME); for (int i = 0; i < 16; i++) { - RecipeManagers.fabricatorManager.addRecipe(ForestryItem.waxCast.getItemStack(1, Defaults.WILDCARD), liquidGlass, ForestryBlock.glass.getItemStack(1, 15 - i), new Object[]{"#", "X", '#', dyes[i], + RecipeManagers.fabricatorManager.addRecipe(ForestryItem.waxCast.getItemStack(1, Defaults.WILDCARD), liquidGlass, new ItemStack(Blocks.stained_glass, 4, 15 - i), new Object[]{"#", "X", '#', dyes[i], 'X', ForestryItem.propolis.getItemStack(1, Defaults.WILDCARD)}); } } diff --git a/src/main/resources/assets/forestry/textures/blocks/stained/0.png b/src/main/resources/assets/forestry/textures/blocks/stained/0.png deleted file mode 100755 index a3fec4057..000000000 Binary files a/src/main/resources/assets/forestry/textures/blocks/stained/0.png and /dev/null differ diff --git a/src/main/resources/assets/forestry/textures/blocks/stained/1.png b/src/main/resources/assets/forestry/textures/blocks/stained/1.png deleted file mode 100755 index 8adf848a8..000000000 Binary files a/src/main/resources/assets/forestry/textures/blocks/stained/1.png and /dev/null differ diff --git a/src/main/resources/assets/forestry/textures/blocks/stained/10.png b/src/main/resources/assets/forestry/textures/blocks/stained/10.png deleted file mode 100755 index d1da44a16..000000000 Binary files a/src/main/resources/assets/forestry/textures/blocks/stained/10.png and /dev/null differ diff --git a/src/main/resources/assets/forestry/textures/blocks/stained/11.png b/src/main/resources/assets/forestry/textures/blocks/stained/11.png deleted file mode 100755 index 23c5cac1a..000000000 Binary files a/src/main/resources/assets/forestry/textures/blocks/stained/11.png and /dev/null differ diff --git a/src/main/resources/assets/forestry/textures/blocks/stained/12.png b/src/main/resources/assets/forestry/textures/blocks/stained/12.png deleted file mode 100755 index ca26a35bb..000000000 Binary files a/src/main/resources/assets/forestry/textures/blocks/stained/12.png and /dev/null differ diff --git a/src/main/resources/assets/forestry/textures/blocks/stained/13.png b/src/main/resources/assets/forestry/textures/blocks/stained/13.png deleted file mode 100755 index cedb43df5..000000000 Binary files a/src/main/resources/assets/forestry/textures/blocks/stained/13.png and /dev/null differ diff --git a/src/main/resources/assets/forestry/textures/blocks/stained/14.png b/src/main/resources/assets/forestry/textures/blocks/stained/14.png deleted file mode 100755 index 05d6ad841..000000000 Binary files a/src/main/resources/assets/forestry/textures/blocks/stained/14.png and /dev/null differ diff --git a/src/main/resources/assets/forestry/textures/blocks/stained/15.png b/src/main/resources/assets/forestry/textures/blocks/stained/15.png deleted file mode 100755 index 5cc360c2f..000000000 Binary files a/src/main/resources/assets/forestry/textures/blocks/stained/15.png and /dev/null differ diff --git a/src/main/resources/assets/forestry/textures/blocks/stained/2.png b/src/main/resources/assets/forestry/textures/blocks/stained/2.png deleted file mode 100755 index b875ccae8..000000000 Binary files a/src/main/resources/assets/forestry/textures/blocks/stained/2.png and /dev/null differ diff --git a/src/main/resources/assets/forestry/textures/blocks/stained/3.png b/src/main/resources/assets/forestry/textures/blocks/stained/3.png deleted file mode 100755 index 0d2adad3f..000000000 Binary files a/src/main/resources/assets/forestry/textures/blocks/stained/3.png and /dev/null differ diff --git a/src/main/resources/assets/forestry/textures/blocks/stained/4.png b/src/main/resources/assets/forestry/textures/blocks/stained/4.png deleted file mode 100755 index fe0586ef4..000000000 Binary files a/src/main/resources/assets/forestry/textures/blocks/stained/4.png and /dev/null differ diff --git a/src/main/resources/assets/forestry/textures/blocks/stained/5.png b/src/main/resources/assets/forestry/textures/blocks/stained/5.png deleted file mode 100755 index a4b5a8039..000000000 Binary files a/src/main/resources/assets/forestry/textures/blocks/stained/5.png and /dev/null differ diff --git a/src/main/resources/assets/forestry/textures/blocks/stained/6.png b/src/main/resources/assets/forestry/textures/blocks/stained/6.png deleted file mode 100755 index f9f6d7172..000000000 Binary files a/src/main/resources/assets/forestry/textures/blocks/stained/6.png and /dev/null differ diff --git a/src/main/resources/assets/forestry/textures/blocks/stained/7.png b/src/main/resources/assets/forestry/textures/blocks/stained/7.png deleted file mode 100755 index fcb0a88cd..000000000 Binary files a/src/main/resources/assets/forestry/textures/blocks/stained/7.png and /dev/null differ diff --git a/src/main/resources/assets/forestry/textures/blocks/stained/8.png b/src/main/resources/assets/forestry/textures/blocks/stained/8.png deleted file mode 100755 index dd68cf260..000000000 Binary files a/src/main/resources/assets/forestry/textures/blocks/stained/8.png and /dev/null differ diff --git a/src/main/resources/assets/forestry/textures/blocks/stained/9.png b/src/main/resources/assets/forestry/textures/blocks/stained/9.png deleted file mode 100755 index ca1f8925f..000000000 Binary files a/src/main/resources/assets/forestry/textures/blocks/stained/9.png and /dev/null differ