From e9674795060a678531bf4f7b476594f0b3f2baea Mon Sep 17 00:00:00 2001 From: ganymedes01 Date: Thu, 27 Aug 2015 21:29:55 +0100 Subject: [PATCH] Close #809 Remove stained glass --- .../forestry/core/config/ForestryBlock.java | 1 - .../core/gadgets/BlockStainedGlass.java | 111 ------------------ .../java/forestry/plugins/PluginCore.java | 2 - .../java/forestry/plugins/PluginFactory.java | 2 +- .../forestry/textures/blocks/stained/0.png | Bin 165 -> 0 bytes .../forestry/textures/blocks/stained/1.png | Bin 165 -> 0 bytes .../forestry/textures/blocks/stained/10.png | Bin 165 -> 0 bytes .../forestry/textures/blocks/stained/11.png | Bin 165 -> 0 bytes .../forestry/textures/blocks/stained/12.png | Bin 165 -> 0 bytes .../forestry/textures/blocks/stained/13.png | Bin 165 -> 0 bytes .../forestry/textures/blocks/stained/14.png | Bin 165 -> 0 bytes .../forestry/textures/blocks/stained/15.png | Bin 165 -> 0 bytes .../forestry/textures/blocks/stained/2.png | Bin 165 -> 0 bytes .../forestry/textures/blocks/stained/3.png | Bin 165 -> 0 bytes .../forestry/textures/blocks/stained/4.png | Bin 165 -> 0 bytes .../forestry/textures/blocks/stained/5.png | Bin 165 -> 0 bytes .../forestry/textures/blocks/stained/6.png | Bin 165 -> 0 bytes .../forestry/textures/blocks/stained/7.png | Bin 165 -> 0 bytes .../forestry/textures/blocks/stained/8.png | Bin 165 -> 0 bytes .../forestry/textures/blocks/stained/9.png | Bin 165 -> 0 bytes 20 files changed, 1 insertion(+), 115 deletions(-) delete mode 100755 src/main/java/forestry/core/gadgets/BlockStainedGlass.java delete mode 100755 src/main/resources/assets/forestry/textures/blocks/stained/0.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/stained/1.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/stained/10.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/stained/11.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/stained/12.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/stained/13.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/stained/14.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/stained/15.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/stained/2.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/stained/3.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/stained/4.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/stained/5.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/stained/6.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/stained/7.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/stained/8.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/stained/9.png 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 a3fec4057b1b5aac15120cf4b6436e6655edd58d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-u0XoJzCNL-^FVEL_CW*(s ze{;N0Yi@>D#EaZdD>SBxT~pcBF-!4;myvYK3NPIkch3L*>w29_c8(l_IM7H2Pgg&e IbxsLQ03Mn&ZU6uP 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 8adf848a8d0dd7add86c6f379442bbc8e6270633..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-u6KNV-Y#8wcEQr)6DM0u zxpW#R&R7!U7hK;EvjxO)_jGX#sfgn}X~^ebz`$@|wVtm|ZPO8VEgm=KH2;_9Ydn+0 zW8c3yUZ^!U!za>Atvg{`X(k>s+#PW1larbm_45^6YJ!#12V8Fm|V6~pFPHoc>cP$<_<~0A8=W9HZ z#ADyTIbNtWH^VF9Mee5+8dJrtsqE^QrFg>2NV;W(m+p%@=YRioz0M^&M~*=pXe5KD LtDnm{r-UW|``S9C 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 ca26a35bb499bcb1570e0aa57496aaf9b48a0f2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-uKhc|9J~E<`SqU*k3YW~ zB^M49XDkWw3$Aa7*>W1larbm_45^6YJ!#12V8Fm|V6~pFPHoc>cP$<_<~0A8=W9HZ z#ADyTIbNtWH^VF9Mee5+8dJrtsqE^QrFg>2NV;W(m+p%@=YRioz0M^&M~*=pXe5KD LtDnm{r-UW|=R!Jd 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 cedb43df54e192a099642f5c4e836515aea4baec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-uD7eMzS;Bg?Dm((R@_+0 z{Q3(}oUtUxFSx!TX3J?H$KBJ#F{C1n_oN}8g8>7>fz^7xI<-wl+_iYznA7}Up0Dvt z5|4fV=6Ipj+zhXX7rCESXiOEmrn0MJmf{I7Bk7hEUb-*tod5mT^*WdA961JYppguo Lu6{1-oD!MW1larbm_45^6YJ!#12V8Fm|V6~pFPHoc>cP$<_<~0A8=W9HZ z#ADyTIbNtWH^VF9Mee5+8dJrtsqE^QrFg>2NV;W(m+p%@=YRioz0M^&M~*=pXe5KD LtDnm{r-UW|oB%n? 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 5cc360c2ffe34078d4dffbf2e113bc430fd50684..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-uK)l4|M&0T{h$ACyn166 zRpW1larbm_45^6YJ!#12V8Fm|V6~pFPHoc>cP$<_<~0A8=W9HZ z#ADyTIbNtWH^VF9Mee5+8dJrtsqE^QrFg>2NV;W(m+p%@=YRioz0M^&M~*=pXe5KD LtDnm{r-UW|n;$#p 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 b875ccae8759be533240d9ab89639e151f9a26f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-uE}kB8xBpIxOZCjx|Wl< z!Yn{>#*!ev;QEG`EvJDTcTX3`kcv3olZJc_1`G@bR_pod)HWS)*Wz(wPV;|xzQ!|2 zJof#Ya>Atvg{`X(k>s+#PaJU5m$!InDp&`5Mn8 z@!0ooju&dp&G3qNk^5gTe~DWM4f3NkpA 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 a4b5a8039c8396ef01d280c9661bbd717121bedf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-u1kW?U0m^O(~@Var(D@Q zqtXm0&R7!U7hK;Ev*k39F=7*Y|(d(x24!GM9`z-m2To!X`&?pi!<%xV5F&)0Y+ ziO0TwbG%S%ZiZLHi`-8uG^UDOQ`yxqOYwx4k#x%nFWnb+&j0@FdYwyljvRwH&`1VP LS3j3^P6a>Atvg{`X(k>s+#PMVB;d_twp1)|d z#?A{U&R7!U7hK;Ev*k39F=7*Y|(d(x24!GM9`z-m2To!X`&?pi!<%xV5F&)0Y+ ziO0TwbG%S%ZiZLHi`-8uG^UDOQ`yxqOYwx4k#x%nFWnb+&j0@FdYwyljvRwH&`1VP LS3j3^P6z) z*uNGi&R7!U7hK;Ev*k39F=7*Y|(d(x24!GM9`z-m2To!X`&?pi!<%xV5F&)0Y+ ziO0TwbG%S%ZiZLHi`-8uG^UDOQ`yxqOYwx4k#x%nFWnb+&j0@FdYwyljvRwH&`1VP LS3j3^P67>fz^7xI<-wl+_iYznA7}Up0Dvt z5|4fV=6Ipj+zhXX7rCESXiOEmrn0MJmf{I7Bk7hEUb-*tod5mT^*WdA961JYppguo Lu6{1-oD!M