mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-22 05:02:25 +00:00
Renamed all the 'custom' items to 'painted' items.
This commit is contained in:
1 parent
f98a99ab9e
commit
dd5664e604
18 files changed
+189
-190
No files matched your search
@@ -15,8 +15,8 @@ import crazypants.enderio.enderface.EnderIoRenderer;
|
||||
import crazypants.enderio.enderface.TileEnderIO;
|
||||
import crazypants.enderio.machine.light.BlockElectricLight;
|
||||
import crazypants.enderio.machine.light.ElectricLightRenderer;
|
||||
import crazypants.enderio.machine.painter.BlockCustomFenceGate;
|
||||
import crazypants.enderio.machine.painter.BlockCustomFenceGateRenderer;
|
||||
import crazypants.enderio.machine.painter.BlockPaintedFenceGate;
|
||||
import crazypants.enderio.machine.painter.BlockPaintedFenceGateRenderer;
|
||||
import crazypants.enderio.machine.painter.PaintedItemRenderer;
|
||||
import crazypants.enderio.machine.power.BlockCapacitorBank;
|
||||
import crazypants.enderio.machine.power.CapBankRenderer2;
|
||||
@@ -110,17 +110,17 @@ public class ClientProxy extends CommonProxy {
|
||||
// MinecraftForgeClient.registerItemRenderer(EnderIO.itemMeConduit, itemConRenderer);
|
||||
//
|
||||
|
||||
BlockCustomFenceGateRenderer bcfgr = new BlockCustomFenceGateRenderer();
|
||||
BlockCustomFenceGate.renderId = RenderingRegistry.getNextAvailableRenderId();
|
||||
BlockPaintedFenceGateRenderer bcfgr = new BlockPaintedFenceGateRenderer();
|
||||
BlockPaintedFenceGate.renderId = RenderingRegistry.getNextAvailableRenderId();
|
||||
RenderingRegistry.registerBlockHandler(bcfgr);
|
||||
|
||||
PaintedItemRenderer pir = new PaintedItemRenderer();
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCustomFence), pir);
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCustomFenceGate), pir);
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCustomWall), pir);
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCustomStair), pir);
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedFence), pir);
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedFenceGate), pir);
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedWall), pir);
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedStair), pir);
|
||||
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCustomSlab), pir);
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedSlab), pir);
|
||||
MinecraftForgeClient.registerItemRenderer(EnderIO.itemMachinePart, new MachinePartRenderer());
|
||||
// MinecraftForgeClient.registerItemRenderer(EnderIO.itemConduitFacade, new FacadeRenderer());
|
||||
|
||||
|
||||
@@ -26,11 +26,11 @@ import crazypants.enderio.machine.light.BlockElectricLight;
|
||||
import crazypants.enderio.machine.light.BlockLightNode;
|
||||
import crazypants.enderio.machine.monitor.BlockPowerMonitor;
|
||||
import crazypants.enderio.machine.monitor.ItemMJReader;
|
||||
import crazypants.enderio.machine.painter.BlockCustomFence;
|
||||
import crazypants.enderio.machine.painter.BlockCustomFenceGate;
|
||||
import crazypants.enderio.machine.painter.BlockCustomSlab;
|
||||
import crazypants.enderio.machine.painter.BlockCustomStair;
|
||||
import crazypants.enderio.machine.painter.BlockCustomWall;
|
||||
import crazypants.enderio.machine.painter.BlockPaintedFence;
|
||||
import crazypants.enderio.machine.painter.BlockPaintedFenceGate;
|
||||
import crazypants.enderio.machine.painter.BlockPaintedSlab;
|
||||
import crazypants.enderio.machine.painter.BlockPaintedStair;
|
||||
import crazypants.enderio.machine.painter.BlockPaintedWall;
|
||||
import crazypants.enderio.machine.painter.BlockPainter;
|
||||
import crazypants.enderio.machine.power.BlockCapacitorBank;
|
||||
import crazypants.enderio.machine.reservoir.BlockReservoir;
|
||||
@@ -82,12 +82,12 @@ public class EnderIO {
|
||||
|
||||
// Painter
|
||||
public static BlockPainter blockPainter;
|
||||
public static BlockCustomFence blockCustomFence;
|
||||
public static BlockCustomFenceGate blockCustomFenceGate;
|
||||
public static BlockCustomWall blockCustomWall;
|
||||
public static BlockCustomStair blockCustomStair;
|
||||
public static BlockCustomSlab blockCustomSlab;
|
||||
public static BlockCustomSlab blockCustomDoubleSlab;
|
||||
public static BlockPaintedFence blockPaintedFence;
|
||||
public static BlockPaintedFenceGate blockPaintedFenceGate;
|
||||
public static BlockPaintedWall blockPaintedWall;
|
||||
public static BlockPaintedStair blockPaintedStair;
|
||||
public static BlockPaintedSlab blockPaintedSlab;
|
||||
public static BlockPaintedSlab blockPaintedDoubleSlab;
|
||||
//
|
||||
// // Conduits
|
||||
// public static BlockConduitBundle blockConduitBundle;
|
||||
@@ -145,14 +145,14 @@ public class EnderIO {
|
||||
itemTravelStaff = ItemTravelStaff.create();
|
||||
|
||||
blockPainter = BlockPainter.create();
|
||||
blockCustomFence = BlockCustomFence.create();
|
||||
blockCustomFenceGate = BlockCustomFenceGate.create();
|
||||
blockCustomWall = BlockCustomWall.create();
|
||||
blockCustomStair = BlockCustomStair.create();
|
||||
blockCustomSlab = new BlockCustomSlab(false);
|
||||
blockCustomDoubleSlab = new BlockCustomSlab(true);
|
||||
blockCustomSlab.init();
|
||||
blockCustomDoubleSlab.init();
|
||||
blockPaintedFence = BlockPaintedFence.create();
|
||||
blockPaintedFenceGate = BlockPaintedFenceGate.create();
|
||||
blockPaintedWall = BlockPaintedWall.create();
|
||||
blockPaintedStair = BlockPaintedStair.create();
|
||||
blockPaintedSlab = new BlockPaintedSlab(false);
|
||||
blockPaintedDoubleSlab = new BlockPaintedSlab(true);
|
||||
blockPaintedSlab.init();
|
||||
blockPaintedDoubleSlab.init();
|
||||
|
||||
blockStirlingGenerator = BlockStirlingGenerator.create();
|
||||
blockSolarPanel = BlockSolarPanel.create();
|
||||
|
||||
@@ -43,12 +43,12 @@ public enum ModObject {
|
||||
|
||||
// Painter
|
||||
blockPainter,
|
||||
blockCustomFence,
|
||||
blockCustomFenceGate,
|
||||
blockCustomWall,
|
||||
blockCustomStair,
|
||||
blockCustomSlab,
|
||||
blockCustomDoubleSlab,
|
||||
blockPaintedFence,
|
||||
blockPaintedFenceGate,
|
||||
blockPaintedWall,
|
||||
blockPaintedStair,
|
||||
blockPaintedSlab,
|
||||
blockPaintedDoubleSlab,
|
||||
|
||||
itemMJReader,
|
||||
itemYetaWrench,
|
||||
|
||||
+4
-4
@@ -10,15 +10,15 @@ import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.EnderIO;
|
||||
|
||||
public class BlockItemCustomFence extends ItemBlock {
|
||||
public class BlockItemPaintedFence extends ItemBlock {
|
||||
|
||||
public BlockItemCustomFence(Block p_i45328_1_) {
|
||||
public BlockItemPaintedFence(Block p_i45328_1_) {
|
||||
super(p_i45328_1_);
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
|
||||
public BlockItemCustomFence() {
|
||||
super(EnderIO.blockCustomFence);
|
||||
public BlockItemPaintedFence() {
|
||||
super(EnderIO.blockPaintedFence);
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
|
||||
+2
-2
@@ -9,9 +9,9 @@ import net.minecraft.item.ItemStack;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class BlockItemCustomFenceGate extends ItemBlock {
|
||||
public class BlockItemPaintedFenceGate extends ItemBlock {
|
||||
|
||||
public BlockItemCustomFenceGate(Block block) {
|
||||
public BlockItemPaintedFenceGate(Block block) {
|
||||
super(block);
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
+27
-27
@@ -13,15 +13,15 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.ModObject;
|
||||
|
||||
public class BlockItemCustomSlab extends ItemSlab {
|
||||
public class BlockItemPaintedSlab extends ItemSlab {
|
||||
|
||||
private boolean isFullBlock;
|
||||
|
||||
public BlockItemCustomSlab(Block blk) {
|
||||
super(blk, EnderIO.blockCustomSlab, EnderIO.blockCustomDoubleSlab, blk == EnderIO.blockCustomDoubleSlab);
|
||||
public BlockItemPaintedSlab(Block blk) {
|
||||
super(blk, EnderIO.blockPaintedSlab, EnderIO.blockPaintedDoubleSlab, blk == EnderIO.blockPaintedDoubleSlab);
|
||||
setHasSubtypes(true);
|
||||
isFullBlock = blk == EnderIO.blockCustomDoubleSlab;
|
||||
setUnlocalizedName(ModObject.blockCustomSlab.unlocalisedName);
|
||||
isFullBlock = blk == EnderIO.blockPaintedDoubleSlab;
|
||||
setUnlocalizedName(ModObject.blockPaintedSlab.unlocalisedName);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -52,34 +52,34 @@ public class BlockItemCustomSlab extends ItemSlab {
|
||||
int k1 = j1 & 7;
|
||||
boolean flag = (j1 & 8) != 0;
|
||||
|
||||
if((side == 1 && !flag || side == 0 && flag) && i1 == EnderIO.blockCustomSlab && k1 == par1ItemStack.getItemDamage()) {
|
||||
if((side == 1 && !flag || side == 0 && flag) && i1 == EnderIO.blockPaintedSlab && k1 == par1ItemStack.getItemDamage()) {
|
||||
|
||||
if(world.checkNoEntityCollision(EnderIO.blockCustomDoubleSlab.getCollisionBoundingBoxFromPool(world, x, y, z))) {
|
||||
if(world.checkNoEntityCollision(EnderIO.blockPaintedDoubleSlab.getCollisionBoundingBoxFromPool(world, x, y, z))) {
|
||||
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityCustomSlab) {
|
||||
((TileEntityCustomSlab) te).isConvertingToFullBlock = true;
|
||||
if(te instanceof TileEntityPaintedSlab) {
|
||||
((TileEntityPaintedSlab) te).isConvertingToFullBlock = true;
|
||||
}
|
||||
|
||||
if(world.setBlock(x, y, z, EnderIO.blockCustomDoubleSlab, k1, 3)) {
|
||||
if(world.setBlock(x, y, z, EnderIO.blockPaintedDoubleSlab, k1, 3)) {
|
||||
|
||||
te = world.getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityCustomBlock) {
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
|
||||
Block b = PainterUtil.getSourceBlock(par1ItemStack);
|
||||
TileEntityCustomBlock tef = (TileEntityCustomBlock) te;
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
tef.setSourceBlock(b);
|
||||
tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(par1ItemStack));
|
||||
world.markBlockForUpdate(x, y, z);
|
||||
}
|
||||
|
||||
world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F,
|
||||
EnderIO.blockCustomDoubleSlab.stepSound.getStepResourcePath(), (EnderIO.blockCustomDoubleSlab.stepSound.getVolume() + 1.0F) / 2.0F,
|
||||
EnderIO.blockCustomDoubleSlab.stepSound.getPitch() * 0.8F);
|
||||
EnderIO.blockPaintedDoubleSlab.stepSound.getStepResourcePath(), (EnderIO.blockPaintedDoubleSlab.stepSound.getVolume() + 1.0F) / 2.0F,
|
||||
EnderIO.blockPaintedDoubleSlab.stepSound.getPitch() * 0.8F);
|
||||
--par1ItemStack.stackSize;
|
||||
} else {
|
||||
if(te instanceof TileEntityCustomSlab) {
|
||||
((TileEntityCustomSlab) te).isConvertingToFullBlock = false;
|
||||
if(te instanceof TileEntityPaintedSlab) {
|
||||
((TileEntityPaintedSlab) te).isConvertingToFullBlock = false;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -114,34 +114,34 @@ public class BlockItemCustomSlab extends ItemSlab {
|
||||
int j1 = world.getBlockMetadata(x, y, z);
|
||||
int k1 = j1 & 7;
|
||||
|
||||
if(i1 == EnderIO.blockCustomSlab && k1 == par1ItemStack.getItemDamage()) {
|
||||
if(i1 == EnderIO.blockPaintedSlab && k1 == par1ItemStack.getItemDamage()) {
|
||||
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityCustomSlab) {
|
||||
((TileEntityCustomSlab) te).isConvertingToFullBlock = true;
|
||||
if(te instanceof TileEntityPaintedSlab) {
|
||||
((TileEntityPaintedSlab) te).isConvertingToFullBlock = true;
|
||||
}
|
||||
|
||||
if(world.checkNoEntityCollision(EnderIO.blockCustomDoubleSlab.getCollisionBoundingBoxFromPool(world, x, y, z))
|
||||
&& world.setBlock(x, y, z, EnderIO.blockCustomDoubleSlab, k1, 3)) {
|
||||
if(world.checkNoEntityCollision(EnderIO.blockPaintedDoubleSlab.getCollisionBoundingBoxFromPool(world, x, y, z))
|
||||
&& world.setBlock(x, y, z, EnderIO.blockPaintedDoubleSlab, k1, 3)) {
|
||||
|
||||
te = world.getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityCustomBlock) {
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
|
||||
Block b = PainterUtil.getSourceBlock(par1ItemStack);
|
||||
TileEntityCustomBlock tef = (TileEntityCustomBlock) te;
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
tef.setSourceBlock(b);
|
||||
tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(par1ItemStack));
|
||||
world.markBlockForUpdate(x, y, z);
|
||||
}
|
||||
|
||||
world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F,
|
||||
EnderIO.blockCustomDoubleSlab.stepSound.getStepResourcePath(), (EnderIO.blockCustomDoubleSlab.stepSound.getVolume() + 1.0F) / 2.0F,
|
||||
EnderIO.blockCustomDoubleSlab.stepSound.getPitch() * 0.8F);
|
||||
EnderIO.blockPaintedDoubleSlab.stepSound.getStepResourcePath(), (EnderIO.blockPaintedDoubleSlab.stepSound.getVolume() + 1.0F) / 2.0F,
|
||||
EnderIO.blockPaintedDoubleSlab.stepSound.getPitch() * 0.8F);
|
||||
--par1ItemStack.stackSize;
|
||||
|
||||
} else {
|
||||
if(te instanceof TileEntityCustomSlab) {
|
||||
((TileEntityCustomSlab) te).isConvertingToFullBlock = false;
|
||||
if(te instanceof TileEntityPaintedSlab) {
|
||||
((TileEntityPaintedSlab) te).isConvertingToFullBlock = false;
|
||||
}
|
||||
|
||||
}
|
||||
+2
-2
@@ -9,9 +9,9 @@ import net.minecraft.item.ItemStack;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class BlockItemCustomStair extends ItemBlock {
|
||||
public class BlockItemPaintedStair extends ItemBlock {
|
||||
|
||||
public BlockItemCustomStair(Block block) {
|
||||
public BlockItemPaintedStair(Block block) {
|
||||
super(block);
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
+2
-2
@@ -9,9 +9,9 @@ import net.minecraft.item.ItemStack;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class BlockItemCustomWall extends ItemBlock {
|
||||
public class BlockItemPaintedWall extends ItemBlock {
|
||||
|
||||
public BlockItemCustomWall(Block block) {
|
||||
public BlockItemPaintedWall(Block block) {
|
||||
super(block);
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
+23
-24
@@ -27,10 +27,10 @@ import crazypants.enderio.ModObject;
|
||||
import crazypants.enderio.machine.MachineRecipeInput;
|
||||
import crazypants.enderio.machine.MachineRecipeRegistry;
|
||||
|
||||
public class BlockCustomFence extends BlockFence implements ITileEntityProvider {
|
||||
public class BlockPaintedFence extends BlockFence implements ITileEntityProvider {
|
||||
|
||||
public static BlockCustomFence create() {
|
||||
BlockCustomFence result = new BlockCustomFence();
|
||||
public static BlockPaintedFence create() {
|
||||
BlockPaintedFence result = new BlockPaintedFence();
|
||||
result.init();
|
||||
return result;
|
||||
}
|
||||
@@ -39,9 +39,9 @@ public class BlockCustomFence extends BlockFence implements ITileEntityProvider
|
||||
|
||||
private Random rand = new Random();
|
||||
|
||||
public BlockCustomFence() {
|
||||
super(ModObject.blockCustomFence.unlocalisedName, Material.wood);
|
||||
setBlockName(ModObject.blockCustomFence.unlocalisedName);
|
||||
public BlockPaintedFence() {
|
||||
super(ModObject.blockPaintedFence.unlocalisedName, Material.wood);
|
||||
setBlockName(ModObject.blockPaintedFence.unlocalisedName);
|
||||
setHardness(2.0F);
|
||||
setResistance(5.0F);
|
||||
setStepSound(soundTypeWood);
|
||||
@@ -49,13 +49,13 @@ public class BlockCustomFence extends BlockFence implements ITileEntityProvider
|
||||
}
|
||||
|
||||
private void init() {
|
||||
GameRegistry.registerBlock(this, BlockItemCustomFence.class, ModObject.blockCustomFence.unlocalisedName);
|
||||
GameRegistry.registerTileEntity(TileEntityCustomBlock.class, ModObject.blockCustomFence.unlocalisedName + "TileEntity");
|
||||
GameRegistry.registerBlock(this, BlockItemPaintedFence.class, ModObject.blockPaintedFence.unlocalisedName);
|
||||
GameRegistry.registerTileEntity(TileEntityPaintedBlock.class, ModObject.blockPaintedFence.unlocalisedName + "TileEntity");
|
||||
MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate());
|
||||
}
|
||||
|
||||
public static ItemStack createItemStackForSourceBlock(Block source, int sourceMeta) {
|
||||
ItemStack result = new ItemStack(EnderIO.blockCustomFence, 1, sourceMeta);
|
||||
ItemStack result = new ItemStack(EnderIO.blockPaintedFence, 1, sourceMeta);
|
||||
PainterUtil.setSourceBlock(result, source, sourceMeta);
|
||||
return result;
|
||||
}
|
||||
@@ -66,7 +66,7 @@ public class BlockCustomFence extends BlockFence implements ITileEntityProvider
|
||||
EffectRenderer effectRenderer) {
|
||||
IIcon tex = null;
|
||||
|
||||
TileEntityCustomBlock cb = (TileEntityCustomBlock)
|
||||
TileEntityPaintedBlock cb = (TileEntityPaintedBlock)
|
||||
world.getTileEntity(target.blockX, target.blockY, target.blockZ);
|
||||
Block b = cb.getSourceBlock();
|
||||
if(b != null) {
|
||||
@@ -140,8 +140,8 @@ public class BlockCustomFence extends BlockFence implements ITileEntityProvider
|
||||
@Override
|
||||
public int getLightOpacity(IBlockAccess world, int x, int y, int z) {
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityCustomBlock) {
|
||||
TileEntityCustomBlock tef = (TileEntityCustomBlock) te;
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
if(tef.getSourceBlock() != null) {
|
||||
return Math.min(super.getLightOpacity(world, x, y, z), tef.getSourceBlock().getLightOpacity());
|
||||
}
|
||||
@@ -161,18 +161,17 @@ public class BlockCustomFence extends BlockFence implements ITileEntityProvider
|
||||
@Override
|
||||
public boolean canConnectFenceTo(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) {
|
||||
Block l = par1IBlockAccess.getBlock(par2, par3, par4);
|
||||
//TODO:1.7
|
||||
// if(l == EnderIO.blockCustomFenceGate) {
|
||||
// return true;
|
||||
// }
|
||||
if(l == EnderIO.blockPaintedFenceGate) {
|
||||
return true;
|
||||
}
|
||||
return super.canConnectFenceTo(par1IBlockAccess, par2, par3, par4);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) {
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityCustomBlock) {
|
||||
TileEntityCustomBlock tef = (TileEntityCustomBlock) te;
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
if(tef.getSourceBlock() != null) {
|
||||
return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata());
|
||||
}
|
||||
@@ -190,7 +189,7 @@ public class BlockCustomFence extends BlockFence implements ITileEntityProvider
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World var1, int var2) {
|
||||
return new TileEntityCustomBlock();
|
||||
return new TileEntityPaintedBlock();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -199,8 +198,8 @@ public class BlockCustomFence extends BlockFence implements ITileEntityProvider
|
||||
Block b = PainterUtil.getSourceBlock(stack);
|
||||
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityCustomBlock) {
|
||||
TileEntityCustomBlock tef = (TileEntityCustomBlock) te;
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
tef.setSourceBlock(b);
|
||||
tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack));
|
||||
}
|
||||
@@ -216,8 +215,8 @@ public class BlockCustomFence extends BlockFence implements ITileEntityProvider
|
||||
if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) {
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
|
||||
if(te instanceof TileEntityCustomBlock) {
|
||||
TileEntityCustomBlock tef = (TileEntityCustomBlock) te;
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
|
||||
ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata());
|
||||
|
||||
@@ -258,7 +257,7 @@ public class BlockCustomFence extends BlockFence implements ITileEntityProvider
|
||||
public static final class PainterTemplate extends BasicPainterTemplate {
|
||||
|
||||
public PainterTemplate() {
|
||||
super(Blocks.fence, Blocks.nether_brick_fence);
|
||||
super(Blocks.fence, Blocks.nether_brick_fence, EnderIO.blockPaintedFence);
|
||||
}
|
||||
|
||||
@Override
|
||||
+19
-19
@@ -26,12 +26,12 @@ import crazypants.enderio.ModObject;
|
||||
import crazypants.enderio.machine.MachineRecipeInput;
|
||||
import crazypants.enderio.machine.MachineRecipeRegistry;
|
||||
|
||||
public class BlockCustomFenceGate extends BlockFenceGate implements ITileEntityProvider {
|
||||
public class BlockPaintedFenceGate extends BlockFenceGate implements ITileEntityProvider {
|
||||
|
||||
public static int renderId;
|
||||
|
||||
public static BlockCustomFenceGate create() {
|
||||
BlockCustomFenceGate result = new BlockCustomFenceGate();
|
||||
public static BlockPaintedFenceGate create() {
|
||||
BlockPaintedFenceGate result = new BlockPaintedFenceGate();
|
||||
result.init();
|
||||
return result;
|
||||
}
|
||||
@@ -40,17 +40,17 @@ public class BlockCustomFenceGate extends BlockFenceGate implements ITileEntityP
|
||||
|
||||
private Random rand = new Random();
|
||||
|
||||
public BlockCustomFenceGate() {
|
||||
public BlockPaintedFenceGate() {
|
||||
setCreativeTab(null);
|
||||
setBlockName(ModObject.blockCustomFenceGate.unlocalisedName);
|
||||
setBlockName(ModObject.blockPaintedFenceGate.unlocalisedName);
|
||||
setHardness(2.0F);
|
||||
setResistance(5.0F);
|
||||
setStepSound(soundTypeWood);
|
||||
}
|
||||
|
||||
private void init() {
|
||||
GameRegistry.registerBlock(this, BlockItemCustomFenceGate.class, ModObject.blockCustomFenceGate.unlocalisedName);
|
||||
GameRegistry.registerTileEntity(TileEntityCustomBlock.class, ModObject.blockCustomFenceGate.unlocalisedName + "TileEntity");
|
||||
GameRegistry.registerBlock(this, BlockItemPaintedFenceGate.class, ModObject.blockPaintedFenceGate.unlocalisedName);
|
||||
GameRegistry.registerTileEntity(TileEntityPaintedBlock.class, ModObject.blockPaintedFenceGate.unlocalisedName + "TileEntity");
|
||||
MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate());
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ public class BlockCustomFenceGate extends BlockFenceGate implements ITileEntityP
|
||||
EffectRenderer effectRenderer) {
|
||||
IIcon tex = null;
|
||||
|
||||
TileEntityCustomBlock cb = (TileEntityCustomBlock)
|
||||
TileEntityPaintedBlock cb = (TileEntityPaintedBlock)
|
||||
world.getTileEntity(target.blockX, target.blockY, target.blockZ);
|
||||
Block b = cb.getSourceBlock();
|
||||
if(b != null) {
|
||||
@@ -138,8 +138,8 @@ public class BlockCustomFenceGate extends BlockFenceGate implements ITileEntityP
|
||||
@Override
|
||||
public int getLightOpacity(IBlockAccess world, int x, int y, int z) {
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityCustomBlock) {
|
||||
TileEntityCustomBlock tef = (TileEntityCustomBlock) te;
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
if(tef.getSourceBlock() != null) {
|
||||
return Math.min(super.getLightOpacity(world, x, y, z), tef.getSourceBlock().getLightOpacity(world, x, y, z));
|
||||
}
|
||||
@@ -149,14 +149,14 @@ public class BlockCustomFenceGate extends BlockFenceGate implements ITileEntityP
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int metadata) {
|
||||
return new TileEntityCustomBlock();
|
||||
return new TileEntityPaintedBlock();
|
||||
}
|
||||
|
||||
@Override
|
||||
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) {
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityCustomBlock) {
|
||||
TileEntityCustomBlock tef = (TileEntityCustomBlock) te;
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
return tef.getSourceBlock() == null ? null : tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata());
|
||||
|
||||
} else {
|
||||
@@ -170,8 +170,8 @@ public class BlockCustomFenceGate extends BlockFenceGate implements ITileEntityP
|
||||
|
||||
Block b = PainterUtil.getSourceBlock(stack);
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityCustomBlock) {
|
||||
TileEntityCustomBlock tef = (TileEntityCustomBlock) te;
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
tef.setSourceBlock(b);
|
||||
tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack));
|
||||
}
|
||||
@@ -182,7 +182,7 @@ public class BlockCustomFenceGate extends BlockFenceGate implements ITileEntityP
|
||||
}
|
||||
|
||||
public static ItemStack createItemStackForSourceBlock(Block source, int damage) {
|
||||
ItemStack result = new ItemStack(EnderIO.blockCustomFenceGate, 1, damage);
|
||||
ItemStack result = new ItemStack(EnderIO.blockPaintedFenceGate, 1, damage);
|
||||
PainterUtil.setSourceBlock(result, source, damage);
|
||||
return result;
|
||||
}
|
||||
@@ -196,8 +196,8 @@ public class BlockCustomFenceGate extends BlockFenceGate implements ITileEntityP
|
||||
if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) {
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
|
||||
if(te instanceof TileEntityCustomBlock) {
|
||||
TileEntityCustomBlock tef = (TileEntityCustomBlock) te;
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
|
||||
ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata());
|
||||
|
||||
@@ -224,7 +224,7 @@ public class BlockCustomFenceGate extends BlockFenceGate implements ITileEntityP
|
||||
public static final class PainterTemplate extends BasicPainterTemplate {
|
||||
|
||||
public PainterTemplate() {
|
||||
super(Blocks.fence_gate/* , Block.netherFence.blockID */);
|
||||
super(Blocks.fence_gate, Blocks.nether_brick_fence, EnderIO.blockPaintedFenceGate);
|
||||
}
|
||||
|
||||
@Override
|
||||
+6
-6
@@ -9,7 +9,7 @@ import net.minecraft.world.IBlockAccess;
|
||||
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
|
||||
import crazypants.enderio.EnderIO;
|
||||
|
||||
public class BlockCustomFenceGateRenderer implements ISimpleBlockRenderingHandler {
|
||||
public class BlockPaintedFenceGateRenderer implements ISimpleBlockRenderingHandler {
|
||||
|
||||
@Override
|
||||
public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) {
|
||||
@@ -23,7 +23,7 @@ public class BlockCustomFenceGateRenderer implements ISimpleBlockRenderingHandle
|
||||
|
||||
@Override
|
||||
public int getRenderId() {
|
||||
return BlockCustomFenceGate.renderId;
|
||||
return BlockPaintedFenceGate.renderId;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -46,10 +46,10 @@ public class BlockCustomFenceGateRenderer implements ISimpleBlockRenderingHandle
|
||||
&& rb.blockAccess.getBlock(par2 + 1, par3, par4) == Blocks.cobblestone_wall ||
|
||||
(i1 == 3 || i1 == 1) && rb.blockAccess.getBlock(par2, par3, par4 - 1) == Blocks.cobblestone_wall
|
||||
&& rb.blockAccess.getBlock(par2, par3, par4 + 1) == Blocks.cobblestone_wall ||
|
||||
(i1 == 2 || i1 == 0) && rb.blockAccess.getBlock(par2 - 1, par3, par4) == EnderIO.blockCustomWall
|
||||
&& rb.blockAccess.getBlock(par2 + 1, par3, par4) == EnderIO.blockCustomWall ||
|
||||
(i1 == 3 || i1 == 1) && rb.blockAccess.getBlock(par2, par3, par4 - 1) == EnderIO.blockCustomWall
|
||||
&& rb.blockAccess.getBlock(par2, par3, par4 + 1) == EnderIO.blockCustomWall)
|
||||
(i1 == 2 || i1 == 0) && rb.blockAccess.getBlock(par2 - 1, par3, par4) == EnderIO.blockPaintedWall
|
||||
&& rb.blockAccess.getBlock(par2 + 1, par3, par4) == EnderIO.blockPaintedWall ||
|
||||
(i1 == 3 || i1 == 1) && rb.blockAccess.getBlock(par2, par3, par4 - 1) == EnderIO.blockPaintedWall
|
||||
&& rb.blockAccess.getBlock(par2, par3, par4 + 1) == EnderIO.blockPaintedWall)
|
||||
{
|
||||
f -= 0.1875F;
|
||||
f1 -= 0.1875F;
|
||||
+19
-19
@@ -28,7 +28,7 @@ import crazypants.enderio.ModObject;
|
||||
import crazypants.enderio.machine.MachineRecipeInput;
|
||||
import crazypants.enderio.machine.MachineRecipeRegistry;
|
||||
|
||||
public class BlockCustomSlab extends BlockSlab implements ITileEntityProvider {
|
||||
public class BlockPaintedSlab extends BlockSlab implements ITileEntityProvider {
|
||||
|
||||
private IIcon lastRemovedComponetIcon = null;
|
||||
|
||||
@@ -36,11 +36,11 @@ public class BlockCustomSlab extends BlockSlab implements ITileEntityProvider {
|
||||
|
||||
private final boolean isDouble;
|
||||
|
||||
public BlockCustomSlab(boolean isDouble) {
|
||||
public BlockPaintedSlab(boolean isDouble) {
|
||||
super(isDouble, new Material(MapColor.stoneColor));
|
||||
this.isDouble = isDouble;
|
||||
setCreativeTab(null);
|
||||
setBlockName(ModObject.blockCustomSlab.unlocalisedName + isDouble);
|
||||
setBlockName(ModObject.blockPaintedSlab.unlocalisedName + isDouble);
|
||||
setHardness(0.5F);
|
||||
setResistance(5.0F);
|
||||
setLightOpacity(0);
|
||||
@@ -50,17 +50,17 @@ public class BlockCustomSlab extends BlockSlab implements ITileEntityProvider {
|
||||
// This is required so it is assigned prior to the BlockItem being
|
||||
// registered.
|
||||
if(isDouble) {
|
||||
GameRegistry.registerBlock(this, BlockItemCustomSlab.class, ModObject.blockCustomDoubleSlab.unlocalisedName);
|
||||
GameRegistry.registerTileEntity(TileEntityCustomSlab.class, ModObject.blockCustomDoubleSlab.unlocalisedName + "TileEntity");
|
||||
GameRegistry.registerBlock(this, BlockItemPaintedSlab.class, ModObject.blockPaintedDoubleSlab.unlocalisedName);
|
||||
GameRegistry.registerTileEntity(TileEntityPaintedSlab.class, ModObject.blockPaintedDoubleSlab.unlocalisedName + "TileEntity");
|
||||
} else {
|
||||
GameRegistry.registerBlock(this, BlockItemCustomSlab.class, ModObject.blockCustomSlab.unlocalisedName);
|
||||
GameRegistry.registerTileEntity(TileEntityCustomBlock.class, ModObject.blockCustomSlab.unlocalisedName + "TileEntity");
|
||||
GameRegistry.registerBlock(this, BlockItemPaintedSlab.class, ModObject.blockPaintedSlab.unlocalisedName);
|
||||
GameRegistry.registerTileEntity(TileEntityPaintedBlock.class, ModObject.blockPaintedSlab.unlocalisedName + "TileEntity");
|
||||
MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate());
|
||||
}
|
||||
}
|
||||
|
||||
public static ItemStack createItemStackForSourceBlock(Block source, int damage) {
|
||||
ItemStack result = new ItemStack(EnderIO.blockCustomSlab, 1, 0);
|
||||
ItemStack result = new ItemStack(EnderIO.blockPaintedSlab, 1, 0);
|
||||
PainterUtil.setSourceBlock(result, source, damage);
|
||||
return result;
|
||||
}
|
||||
@@ -68,8 +68,8 @@ public class BlockCustomSlab extends BlockSlab implements ITileEntityProvider {
|
||||
@Override
|
||||
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) {
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityCustomBlock) {
|
||||
TileEntityCustomBlock tef = (TileEntityCustomBlock) te;
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
if(tef.getSourceBlock() != null) {
|
||||
return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata());
|
||||
}
|
||||
@@ -89,7 +89,7 @@ public class BlockCustomSlab extends BlockSlab implements ITileEntityProvider {
|
||||
EffectRenderer effectRenderer) {
|
||||
IIcon tex = null;
|
||||
|
||||
TileEntityCustomBlock cb = (TileEntityCustomBlock)
|
||||
TileEntityPaintedBlock cb = (TileEntityPaintedBlock)
|
||||
world.getTileEntity(target.blockX, target.blockY, target.blockZ);
|
||||
Block b = cb.getSourceBlock();
|
||||
if(b != null) {
|
||||
@@ -161,14 +161,14 @@ public class BlockCustomSlab extends BlockSlab implements ITileEntityProvider {
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int metadata) {
|
||||
return new TileEntityCustomSlab();
|
||||
return new TileEntityPaintedSlab();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getLightOpacity(IBlockAccess world, int x, int y, int z) {
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityCustomBlock) {
|
||||
TileEntityCustomBlock tef = (TileEntityCustomBlock) te;
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
if(tef.getSourceBlock() != null) {
|
||||
return Math.min(super.getLightOpacity(world, x, y, z), tef.getSourceBlock().getLightOpacity(world, x, y, z));
|
||||
}
|
||||
@@ -181,8 +181,8 @@ public class BlockCustomSlab extends BlockSlab implements ITileEntityProvider {
|
||||
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) {
|
||||
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityCustomBlock) {
|
||||
TileEntityCustomBlock tef = (TileEntityCustomBlock) te;
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
Block b = PainterUtil.getSourceBlock(stack);
|
||||
tef.setSourceBlock(b);
|
||||
tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack));
|
||||
@@ -200,8 +200,8 @@ public class BlockCustomSlab extends BlockSlab implements ITileEntityProvider {
|
||||
if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) {
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
|
||||
if(te instanceof TileEntityCustomSlab && !((TileEntityCustomSlab) te).isConvertingToFullBlock) {
|
||||
TileEntityCustomBlock tef = (TileEntityCustomBlock) te;
|
||||
if(te instanceof TileEntityPaintedSlab && !((TileEntityPaintedSlab) te).isConvertingToFullBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
|
||||
for (int i = 0; i < super.quantityDropped(null); i++) {
|
||||
ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata());
|
||||
@@ -232,7 +232,7 @@ public class BlockCustomSlab extends BlockSlab implements ITileEntityProvider {
|
||||
public static final class PainterTemplate extends BasicPainterTemplate {
|
||||
|
||||
public PainterTemplate() {
|
||||
super(Blocks.wooden_slab, Blocks.stone_slab);
|
||||
super(Blocks.wooden_slab, Blocks.stone_slab, EnderIO.blockPaintedDoubleSlab, EnderIO.blockPaintedSlab);
|
||||
}
|
||||
|
||||
@Override
|
||||
+18
-18
@@ -26,10 +26,10 @@ import crazypants.enderio.ModObject;
|
||||
import crazypants.enderio.machine.MachineRecipeInput;
|
||||
import crazypants.enderio.machine.MachineRecipeRegistry;
|
||||
|
||||
public class BlockCustomStair extends BlockStairs implements ITileEntityProvider {
|
||||
public class BlockPaintedStair extends BlockStairs implements ITileEntityProvider {
|
||||
|
||||
public static BlockCustomStair create() {
|
||||
BlockCustomStair result = new BlockCustomStair();
|
||||
public static BlockPaintedStair create() {
|
||||
BlockPaintedStair result = new BlockPaintedStair();
|
||||
result.init();
|
||||
return result;
|
||||
}
|
||||
@@ -38,21 +38,21 @@ public class BlockCustomStair extends BlockStairs implements ITileEntityProvider
|
||||
|
||||
private Random rand = new Random();
|
||||
|
||||
protected BlockCustomStair() {
|
||||
protected BlockPaintedStair() {
|
||||
super(Blocks.stone, 0);
|
||||
setCreativeTab(null);
|
||||
setBlockName(ModObject.blockCustomStair.unlocalisedName);
|
||||
setBlockName(ModObject.blockPaintedStair.unlocalisedName);
|
||||
setLightOpacity(0);
|
||||
}
|
||||
|
||||
private void init() {
|
||||
GameRegistry.registerBlock(this, BlockItemCustomStair.class, ModObject.blockCustomStair.unlocalisedName);
|
||||
GameRegistry.registerTileEntity(TileEntityCustomBlock.class, ModObject.blockCustomStair.unlocalisedName + "TileEntity");
|
||||
GameRegistry.registerBlock(this, BlockItemPaintedStair.class, ModObject.blockPaintedStair.unlocalisedName);
|
||||
GameRegistry.registerTileEntity(TileEntityPaintedBlock.class, ModObject.blockPaintedStair.unlocalisedName + "TileEntity");
|
||||
MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate());
|
||||
}
|
||||
|
||||
public static ItemStack createItemStackForSourceBlock(Block block, int damage) {
|
||||
ItemStack result = new ItemStack(EnderIO.blockCustomStair, 1, damage);
|
||||
ItemStack result = new ItemStack(EnderIO.blockPaintedStair, 1, damage);
|
||||
PainterUtil.setSourceBlock(result, block, damage);
|
||||
return result;
|
||||
}
|
||||
@@ -63,7 +63,7 @@ public class BlockCustomStair extends BlockStairs implements ITileEntityProvider
|
||||
EffectRenderer effectRenderer) {
|
||||
IIcon tex = null;
|
||||
|
||||
TileEntityCustomBlock cb = (TileEntityCustomBlock)
|
||||
TileEntityPaintedBlock cb = (TileEntityPaintedBlock)
|
||||
world.getTileEntity(target.blockX, target.blockY, target.blockZ);
|
||||
Block b = cb.getSourceBlock();
|
||||
if(b != null) {
|
||||
@@ -144,8 +144,8 @@ public class BlockCustomStair extends BlockStairs implements ITileEntityProvider
|
||||
@Override
|
||||
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) {
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityCustomBlock) {
|
||||
TileEntityCustomBlock tef = (TileEntityCustomBlock) te;
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
if(tef.getSourceBlock() != null) {
|
||||
return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata());
|
||||
}
|
||||
@@ -161,14 +161,14 @@ public class BlockCustomStair extends BlockStairs implements ITileEntityProvider
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int metadata) {
|
||||
return new TileEntityCustomBlock();
|
||||
return new TileEntityPaintedBlock();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getLightOpacity(IBlockAccess world, int x, int y, int z) {
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityCustomBlock) {
|
||||
TileEntityCustomBlock tef = (TileEntityCustomBlock) te;
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
if(tef.getSourceBlock() != null) {
|
||||
return Math.min(super.getLightOpacity(world, x, y, z), tef.getSourceBlock().getLightOpacity());
|
||||
}
|
||||
@@ -182,8 +182,8 @@ public class BlockCustomStair extends BlockStairs implements ITileEntityProvider
|
||||
|
||||
Block b = PainterUtil.getSourceBlock(stack);
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityCustomBlock) {
|
||||
TileEntityCustomBlock tef = (TileEntityCustomBlock) te;
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
tef.setSourceBlock(b);
|
||||
tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack));
|
||||
}
|
||||
@@ -200,8 +200,8 @@ public class BlockCustomStair extends BlockStairs implements ITileEntityProvider
|
||||
if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) {
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
|
||||
if(te instanceof TileEntityCustomBlock) {
|
||||
TileEntityCustomBlock tef = (TileEntityCustomBlock) te;
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
|
||||
ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata());
|
||||
|
||||
+20
-20
@@ -25,10 +25,10 @@ import crazypants.enderio.ModObject;
|
||||
import crazypants.enderio.machine.MachineRecipeInput;
|
||||
import crazypants.enderio.machine.MachineRecipeRegistry;
|
||||
|
||||
public class BlockCustomWall extends BlockWall implements ITileEntityProvider {
|
||||
public class BlockPaintedWall extends BlockWall implements ITileEntityProvider {
|
||||
|
||||
public static BlockCustomWall create() {
|
||||
BlockCustomWall result = new BlockCustomWall();
|
||||
public static BlockPaintedWall create() {
|
||||
BlockPaintedWall result = new BlockPaintedWall();
|
||||
result.init();
|
||||
return result;
|
||||
}
|
||||
@@ -37,20 +37,20 @@ public class BlockCustomWall extends BlockWall implements ITileEntityProvider {
|
||||
|
||||
private Random rand = new Random();
|
||||
|
||||
public BlockCustomWall() {
|
||||
public BlockPaintedWall() {
|
||||
super(Blocks.cobblestone);
|
||||
setCreativeTab(null);
|
||||
setBlockName(ModObject.blockCustomWall.unlocalisedName);
|
||||
setBlockName(ModObject.blockPaintedWall.unlocalisedName);
|
||||
}
|
||||
|
||||
private void init() {
|
||||
GameRegistry.registerBlock(this, BlockItemCustomWall.class, ModObject.blockCustomWall.unlocalisedName);
|
||||
GameRegistry.registerTileEntity(TileEntityCustomBlock.class, ModObject.blockCustomWall.unlocalisedName + "TileEntity");
|
||||
GameRegistry.registerBlock(this, BlockItemPaintedWall.class, ModObject.blockPaintedWall.unlocalisedName);
|
||||
GameRegistry.registerTileEntity(TileEntityPaintedBlock.class, ModObject.blockPaintedWall.unlocalisedName + "TileEntity");
|
||||
MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate());
|
||||
}
|
||||
|
||||
public static ItemStack createItemStackForSourceBlock(Block id, int damage) {
|
||||
ItemStack result = new ItemStack(EnderIO.blockCustomWall, 1, damage);
|
||||
ItemStack result = new ItemStack(EnderIO.blockPaintedWall, 1, damage);
|
||||
PainterUtil.setSourceBlock(result, id, damage);
|
||||
return result;
|
||||
}
|
||||
@@ -61,7 +61,7 @@ public class BlockCustomWall extends BlockWall implements ITileEntityProvider {
|
||||
EffectRenderer effectRenderer) {
|
||||
IIcon tex = null;
|
||||
|
||||
TileEntityCustomBlock cb = (TileEntityCustomBlock)
|
||||
TileEntityPaintedBlock cb = (TileEntityPaintedBlock)
|
||||
world.getTileEntity(target.blockX, target.blockY, target.blockZ);
|
||||
Block b = cb.getSourceBlock();
|
||||
if(b != null) {
|
||||
@@ -134,8 +134,8 @@ public class BlockCustomWall extends BlockWall implements ITileEntityProvider {
|
||||
@Override
|
||||
public int getLightOpacity(IBlockAccess world, int x, int y, int z) {
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityCustomBlock) {
|
||||
TileEntityCustomBlock tef = (TileEntityCustomBlock) te;
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
if(tef.getSourceBlock() != null) {
|
||||
return Math.min(super.getLightOpacity(world, x, y, z), tef.getSourceBlock().getLightOpacity(world, x, y, z));
|
||||
}
|
||||
@@ -155,7 +155,7 @@ public class BlockCustomWall extends BlockWall implements ITileEntityProvider {
|
||||
@Override
|
||||
public boolean canConnectWallTo(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) {
|
||||
Block l = par1IBlockAccess.getBlock(par2, par3, par4);
|
||||
if(l == EnderIO.blockCustomFenceGate) {
|
||||
if(l == EnderIO.blockPaintedFenceGate) {
|
||||
return true;
|
||||
}
|
||||
return super.canConnectWallTo(par1IBlockAccess, par2, par3, par4);
|
||||
@@ -164,8 +164,8 @@ public class BlockCustomWall extends BlockWall implements ITileEntityProvider {
|
||||
@Override
|
||||
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) {
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityCustomBlock) {
|
||||
TileEntityCustomBlock tef = (TileEntityCustomBlock) te;
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
if(tef.getSourceBlock() != null) {
|
||||
return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata());
|
||||
}
|
||||
@@ -175,7 +175,7 @@ public class BlockCustomWall extends BlockWall implements ITileEntityProvider {
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int metadata) {
|
||||
return new TileEntityCustomBlock();
|
||||
return new TileEntityPaintedBlock();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -184,8 +184,8 @@ public class BlockCustomWall extends BlockWall implements ITileEntityProvider {
|
||||
Block b = PainterUtil.getSourceBlock(stack);
|
||||
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityCustomBlock) {
|
||||
TileEntityCustomBlock tef = (TileEntityCustomBlock) te;
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
tef.setSourceBlock(b);
|
||||
tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack));
|
||||
}
|
||||
@@ -201,8 +201,8 @@ public class BlockCustomWall extends BlockWall implements ITileEntityProvider {
|
||||
if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) {
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
|
||||
if(te instanceof TileEntityCustomBlock) {
|
||||
TileEntityCustomBlock tef = (TileEntityCustomBlock) te;
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
|
||||
ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata());
|
||||
|
||||
@@ -231,7 +231,7 @@ public class BlockCustomWall extends BlockWall implements ITileEntityProvider {
|
||||
public static final class PainterTemplate extends BasicPainterTemplate {
|
||||
|
||||
public PainterTemplate() {
|
||||
super(Blocks.cobblestone_wall);
|
||||
super(Blocks.cobblestone_wall, EnderIO.blockPaintedWall);
|
||||
}
|
||||
|
||||
@Override
|
||||
+2
-2
@@ -4,14 +4,14 @@ import net.minecraft.block.Block;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import crazypants.enderio.TileEntityEio;
|
||||
|
||||
public class TileEntityCustomBlock extends TileEntityEio {
|
||||
public class TileEntityPaintedBlock extends TileEntityEio {
|
||||
|
||||
private static final String KEY_SOURCE_BLOCK_ID = "sourceBlock";
|
||||
private static final String KEY_SOURCE_BLOCK_META = "sourceBlockMeta";
|
||||
private Block sourceBlock;
|
||||
private int sourceBlockMetadata;
|
||||
|
||||
public TileEntityCustomBlock() {
|
||||
public TileEntityPaintedBlock() {
|
||||
this.sourceBlock = null;
|
||||
}
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package crazypants.enderio.machine.painter;
|
||||
|
||||
public class TileEntityCustomSlab extends TileEntityCustomBlock {
|
||||
public class TileEntityPaintedSlab extends TileEntityPaintedBlock {
|
||||
|
||||
boolean isConvertingToFullBlock = false;
|
||||
|
||||
@@ -21,7 +21,7 @@ import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.ModObject;
|
||||
import crazypants.enderio.enderface.BlockEio;
|
||||
import crazypants.enderio.machine.painter.PainterUtil;
|
||||
import crazypants.enderio.machine.painter.TileEntityCustomBlock;
|
||||
import crazypants.enderio.machine.painter.TileEntityPaintedBlock;
|
||||
|
||||
public class BlockFusedQuartz extends BlockEio {
|
||||
|
||||
@@ -57,7 +57,7 @@ public class BlockFusedQuartz extends BlockEio {
|
||||
IIcon[] frameIcons;
|
||||
|
||||
private BlockFusedQuartz() {
|
||||
super(ModObject.blockFusedQuartz.unlocalisedName, TileEntityCustomBlock.class, Material.glass);
|
||||
super(ModObject.blockFusedQuartz.unlocalisedName, TileEntityPaintedBlock.class, Material.glass);
|
||||
setStepSound(Block.soundTypeGlass);
|
||||
}
|
||||
|
||||
@@ -174,8 +174,8 @@ public class BlockFusedQuartz extends BlockEio {
|
||||
if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) {
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
|
||||
if(te instanceof TileEntityCustomBlock) {
|
||||
TileEntityCustomBlock tef = (TileEntityCustomBlock) te;
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
|
||||
ItemStack itemStack = createItemStackForSourceBlock(world.getBlockMetadata(x, y, z), tef.getSourceBlockId(), tef.getSourceBlockMetadata());
|
||||
if(itemStack != null) {
|
||||
|
||||
Reference in new issue
Block a user