Removed painted blocks from NEI and creative menu.

This commit is contained in:
CrazyPants committed 2014-11-26 13:16:42 +08:00
1 parent 089a12c23d
commit 9e6e09be9b
8 files changed
+23 -24

No files matched your search

@@ -25,7 +25,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.ModObject;
import crazypants.enderio.machine.MachineRecipeInput;
import crazypants.enderio.machine.MachineRecipeRegistry;
@@ -44,7 +43,7 @@ public class BlockPaintedCarpet extends BlockCarpet implements ITileEntityProvid
protected BlockPaintedCarpet() {
super();
setCreativeTab(EnderIOTab.tabEnderIO);
setCreativeTab(null);
setBlockName(ModObject.blockPaintedCarpet.unlocalisedName);
setHardness(0.1F);
setStepSound(soundTypeCloth);
@@ -116,7 +115,7 @@ public class BlockPaintedCarpet extends BlockCarpet implements ITileEntityProvid
double d0 = x + (j1 + 0.5D) / b0;
double d1 = y + (k1 + 0.5D) / b0;
double d2 = z + (l1 + 0.5D) / b0;
int i2 = this.rand.nextInt(6);
int i2 = rand.nextInt(6);
EntityDiggingFX fx = new EntityDiggingFX(world, d0, d1, d2, d0 - x - 0.5D,
d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0).applyColourMultiplier(x, y, z);
fx.setParticleIcon(tex);
@@ -26,7 +26,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.ModObject;
import crazypants.enderio.machine.MachineRecipeInput;
import crazypants.enderio.machine.MachineRecipeRegistry;
@@ -49,7 +48,7 @@ public class BlockPaintedFence extends BlockFence implements ITileEntityProvider
setHardness(2.0F);
setResistance(5.0F);
setStepSound(soundTypeWood);
setCreativeTab(EnderIOTab.tabEnderIO);
setCreativeTab(null);
}
private void init() {
@@ -103,7 +102,7 @@ public class BlockPaintedFence extends BlockFence implements ITileEntityProvider
double d0 = x + (j1 + 0.5D) / b0;
double d1 = y + (k1 + 0.5D) / b0;
double d2 = z + (l1 + 0.5D) / b0;
int i2 = this.rand.nextInt(6);
int i2 = rand.nextInt(6);
EntityDiggingFX fx = new EntityDiggingFX(world, d0, d1, d2, d0 - x - 0.5D,
d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0).applyColourMultiplier(x, y, z);
fx.setParticleIcon(tex);
@@ -194,7 +193,7 @@ public class BlockPaintedFence extends BlockFence implements ITileEntityProvider
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister par1IIconRegister) {
this.blockIcon = par1IIconRegister.registerIcon("enderio:conduitConnector");
blockIcon = par1IIconRegister.registerIcon("enderio:conduitConnector");
}
@Override
@@ -25,7 +25,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.ModObject;
import crazypants.enderio.machine.MachineRecipeInput;
import crazypants.enderio.machine.MachineRecipeRegistry;
@@ -45,7 +44,7 @@ public class BlockPaintedFenceGate extends BlockFenceGate implements ITileEntity
private Random rand = new Random();
public BlockPaintedFenceGate() {
setCreativeTab(EnderIOTab.tabEnderIO);
setCreativeTab(null);
setBlockName(ModObject.blockPaintedFenceGate.unlocalisedName);
setHardness(2.0F);
setResistance(5.0F);
@@ -97,7 +96,7 @@ public class BlockPaintedFenceGate extends BlockFenceGate implements ITileEntity
double d0 = x + (j1 + 0.5D) / b0;
double d1 = y + (k1 + 0.5D) / b0;
double d2 = z + (l1 + 0.5D) / b0;
int i2 = this.rand.nextInt(6);
int i2 = rand.nextInt(6);
EntityDiggingFX fx = new EntityDiggingFX(world, d0, d1, d2, d0 - x - 0.5D,
d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0).applyColourMultiplier(x, y, z);
fx.setParticleIcon(tex);
@@ -26,16 +26,15 @@ import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.ModObject;
import crazypants.enderio.machine.MachineRecipeInput;
import crazypants.enderio.machine.MachineRecipeRegistry;
import crazypants.util.Lang;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
public class BlockPaintedGlowstone extends Block implements ITileEntityProvider, IPaintedBlock, IFacade {
@@ -53,7 +52,7 @@ public class BlockPaintedGlowstone extends Block implements ITileEntityProvider,
protected BlockPaintedGlowstone() {
super(Material.glass);
setCreativeTab(EnderIOTab.tabEnderIO);
setCreativeTab(null);
setBlockName(ModObject.blockPaintedGlowstone.unlocalisedName);
setStepSound(soundTypeGlass);
setHardness(0.3F);
@@ -124,7 +123,7 @@ public class BlockPaintedGlowstone extends Block implements ITileEntityProvider,
double d0 = x + (j1 + 0.5D) / b0;
double d1 = y + (k1 + 0.5D) / b0;
double d2 = z + (l1 + 0.5D) / b0;
int i2 = this.rand.nextInt(6);
int i2 = rand.nextInt(6);
EntityDiggingFX fx = new EntityDiggingFX(world, d0, d1, d2, d0 - x - 0.5D,
d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0).applyColourMultiplier(x, y, z);
fx.setParticleIcon(tex);
@@ -6,7 +6,6 @@ import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.BlockSlab;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material;
import net.minecraft.client.particle.EffectRenderer;
import net.minecraft.client.particle.EntityDiggingFX;
@@ -27,7 +26,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.ModObject;
import crazypants.enderio.machine.MachineRecipeInput;
import crazypants.enderio.machine.MachineRecipeRegistry;
@@ -43,7 +41,7 @@ public class BlockPaintedSlab extends BlockSlab implements ITileEntityProvider,
public BlockPaintedSlab(boolean isDouble) {
super(isDouble, Material.rock);
this.isDouble = isDouble;
setCreativeTab(EnderIOTab.tabEnderIO);
setCreativeTab(null);
setBlockName(ModObject.blockPaintedSlab.unlocalisedName + (isDouble ? "Double" : ""));
setHardness(0.5F);
setResistance(5.0F);
@@ -126,7 +124,7 @@ public class BlockPaintedSlab extends BlockSlab implements ITileEntityProvider,
double d0 = x + (j1 + 0.5D) / b0;
double d1 = y + (k1 + 0.5D) / b0;
double d2 = z + (l1 + 0.5D) / b0;
int i2 = this.rand.nextInt(6);
int i2 = rand.nextInt(6);
EntityDiggingFX fx = new EntityDiggingFX(world, d0, d1, d2, d0 - x - 0.5D,
d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0).applyColourMultiplier(x, y, z);
fx.setParticleIcon(tex);
@@ -25,7 +25,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.ModObject;
import crazypants.enderio.machine.MachineRecipeInput;
import crazypants.enderio.machine.MachineRecipeRegistry;
@@ -44,7 +43,7 @@ public class BlockPaintedStair extends BlockStairs implements ITileEntityProvide
protected BlockPaintedStair() {
super(Blocks.stone, 0);
setCreativeTab(EnderIOTab.tabEnderIO);
setCreativeTab(null);
setBlockName(ModObject.blockPaintedStair.unlocalisedName);
setLightOpacity(0);
}
@@ -100,7 +99,7 @@ public class BlockPaintedStair extends BlockStairs implements ITileEntityProvide
double d0 = x + (j1 + 0.5D) / b0;
double d1 = y + (k1 + 0.5D) / b0;
double d2 = z + (l1 + 0.5D) / b0;
int i2 = this.rand.nextInt(6);
int i2 = rand.nextInt(6);
EntityDiggingFX fx = new EntityDiggingFX(world, d0, d1, d2, d0 - x - 0.5D,
d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0).applyColourMultiplier(x, y, z);
fx.setParticleIcon(tex);
@@ -24,7 +24,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.ModObject;
import crazypants.enderio.machine.MachineRecipeInput;
import crazypants.enderio.machine.MachineRecipeRegistry;
@@ -43,7 +42,7 @@ public class BlockPaintedWall extends BlockWall implements ITileEntityProvider,
public BlockPaintedWall() {
super(Blocks.cobblestone);
setCreativeTab(EnderIOTab.tabEnderIO);
setCreativeTab(null);
setBlockName(ModObject.blockPaintedWall.unlocalisedName);
}
@@ -98,7 +97,7 @@ public class BlockPaintedWall extends BlockWall implements ITileEntityProvider,
double d0 = x + (j1 + 0.5D) / b0;
double d1 = y + (k1 + 0.5D) / b0;
double d2 = z + (l1 + 0.5D) / b0;
int i2 = this.rand.nextInt(6);
int i2 = rand.nextInt(6);
EntityDiggingFX fx = new EntityDiggingFX(world, d0, d1, d2, d0 - x - 0.5D,
d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0).applyColourMultiplier(x, y, z);
fx.setParticleIcon(tex);
@@ -32,6 +32,13 @@ public class NEIEnderIOConfig implements IConfigureNEI {
API.hideItem(new ItemStack(EnderIO.blockConduitFacade));
API.hideItem(new ItemStack(EnderIO.itemEnderface));
API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedCarpet)));
API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedSlab)));
API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedFence)));
API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedFenceGate)));
API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedGlowstone)));
API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedStair)));
API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedWall)));
API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedDoubleSlab)));
if(!Config.photovoltaicCellEnabled) {