mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-19 11:49:14 +00:00
Close #809 Remove stained glass
This commit is contained in:
1 parent
f49bcfd020
commit
e967479506
20 files changed
+1
-115
No files matched your search
@@ -51,7 +51,6 @@ public enum ForestryBlock {
|
||||
mushroom,
|
||||
candle,
|
||||
stump,
|
||||
glass,
|
||||
// wood items
|
||||
planks,
|
||||
slabs,
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -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)});
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user