Skip to content

Commit

Permalink
clean up the last of the missing texture messages
Browse files Browse the repository at this point in the history
  • Loading branch information
shadowmage45 committed Jun 17, 2014
1 parent 7a64120 commit 0783e0c
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -138,18 +138,7 @@ public TileEntity createTileEntity(World world, int metadata)
public static final BlockTorqueConduit torqueConduit = new BlockTorqueConduit("torque_conduit");
public static final BlockTorqueDistributor torqueDistributor = new BlockTorqueDistributor("torque_distributor");
public static final BlockHandCrankedEngine handCrankedEngine = new BlockHandCrankedEngine("hand_cranked_engine");
public static final BlockTorqueGenerator torqueGeneratorSterling = new BlockTorqueGenerator("torque_generator_sterling")
{
@Override
public TileEntity createTileEntity(World world, int metadata)
{
return new TileTorqueGeneratorSterling();
}
public boolean shouldSideBeRendered(net.minecraft.world.IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) {return false;};
public boolean isOpaqueCube() {return false;};
public boolean isNormalCube() {return false;};
public int getRenderType() {return RenderSterlingEngine.renderID;};
};
public static final BlockTorqueGenerator torqueGeneratorSterling = new BlockTorqueGeneratorSterling("torque_generator_sterling");
public static final BlockTorqueGenerator torqueGeneratorWaterwheel = new BlockTorqueGenerator("torque_generator_waterwheel")
{
@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package net.shadowmage.ancientwarfare.automation.block;

import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.init.Blocks;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import net.shadowmage.ancientwarfare.automation.render.RenderSterlingEngine;
import net.shadowmage.ancientwarfare.automation.tile.torque.TileTorqueGeneratorSterling;

public class BlockTorqueGeneratorSterling extends BlockTorqueGenerator
{

public BlockTorqueGeneratorSterling(String regName)
{
super(regName);
}

@Override
public TileEntity createTileEntity(World world, int metadata)
{
return new TileTorqueGeneratorSterling();
}
@Override
public boolean shouldSideBeRendered(net.minecraft.world.IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) {return false;};
@Override
public boolean isOpaqueCube() {return false;};
@Override
public boolean isNormalCube() {return false;};
@Override
public int getRenderType() {return RenderSterlingEngine.renderID;};

@Override
public void registerBlockIcons(IIconRegister register)
{
}

@Override
public IIcon getIcon(int side, int meta)
{
return Blocks.iron_block.getIcon(side, meta);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
Expand All @@ -30,7 +31,13 @@ public BlockWarehouseStockViewer(String regName)
super(Material.rock);
this.setBlockName(regName);
this.setCreativeTab(AWAutomationItemLoader.automationTab);
this.setBlockTextureName("minecraft:oak_planks");
}

@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister p_149651_1_)
{

}

@Override
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/net/shadowmage/ancientwarfare/todo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ Licensing
-lots still needs resources-
* research station does not drop inventory on block break
* engineering station drop inventory on block break?
* add a gui for research book that lets you know what items need what research
--not as complex as the 1.6.4 res book gui, but something to give people an idea on where to start
can loop through awcraftingmanager.recipes to get a direct recipe/research dependency list
* on research book, add toggle to swap between 'recipe' mode -- view research deps by recipe crafted
* sort research book research goals

****************************STRUCTURE MODULE TODO****************************
> add 'ambient sounds' block -- plays from input sounds either on selectable trigger or configurable/random frequency
Expand Down

0 comments on commit 0783e0c

Please sign in to comment.