From 0783e0ce8cc315f621e8a70b9a5b2cee2d9896e5 Mon Sep 17 00:00:00 2001 From: shadowmage45 Date: Tue, 17 Jun 2014 09:16:07 -0600 Subject: [PATCH] clean up the last of the missing texture messages --- .../block/AWAutomationBlockLoader.java | 13 +----- .../block/BlockTorqueGeneratorSterling.java | 43 ++++++++++++++++++ .../block/BlockWarehouseStockViewer.java | 9 +++- .../net/shadowmage/ancientwarfare/todo.txt | 5 +- .../items/npc/{ration.png => food_bundle.png} | Bin 5 files changed, 54 insertions(+), 16 deletions(-) create mode 100644 src/main/java/net/shadowmage/ancientwarfare/automation/block/BlockTorqueGeneratorSterling.java rename src/main/resources/assets/ancientwarfare/textures/items/npc/{ration.png => food_bundle.png} (100%) diff --git a/src/main/java/net/shadowmage/ancientwarfare/automation/block/AWAutomationBlockLoader.java b/src/main/java/net/shadowmage/ancientwarfare/automation/block/AWAutomationBlockLoader.java index 4d95dfa1d..a04d9b0da 100644 --- a/src/main/java/net/shadowmage/ancientwarfare/automation/block/AWAutomationBlockLoader.java +++ b/src/main/java/net/shadowmage/ancientwarfare/automation/block/AWAutomationBlockLoader.java @@ -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 diff --git a/src/main/java/net/shadowmage/ancientwarfare/automation/block/BlockTorqueGeneratorSterling.java b/src/main/java/net/shadowmage/ancientwarfare/automation/block/BlockTorqueGeneratorSterling.java new file mode 100644 index 000000000..adc1c1f2c --- /dev/null +++ b/src/main/java/net/shadowmage/ancientwarfare/automation/block/BlockTorqueGeneratorSterling.java @@ -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); + } +} diff --git a/src/main/java/net/shadowmage/ancientwarfare/automation/block/BlockWarehouseStockViewer.java b/src/main/java/net/shadowmage/ancientwarfare/automation/block/BlockWarehouseStockViewer.java index 710f72317..97c98ac83 100644 --- a/src/main/java/net/shadowmage/ancientwarfare/automation/block/BlockWarehouseStockViewer.java +++ b/src/main/java/net/shadowmage/ancientwarfare/automation/block/BlockWarehouseStockViewer.java @@ -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; @@ -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 diff --git a/src/main/java/net/shadowmage/ancientwarfare/todo.txt b/src/main/java/net/shadowmage/ancientwarfare/todo.txt index 8ac35d308..a8cf87b7a 100644 --- a/src/main/java/net/shadowmage/ancientwarfare/todo.txt +++ b/src/main/java/net/shadowmage/ancientwarfare/todo.txt @@ -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 diff --git a/src/main/resources/assets/ancientwarfare/textures/items/npc/ration.png b/src/main/resources/assets/ancientwarfare/textures/items/npc/food_bundle.png similarity index 100% rename from src/main/resources/assets/ancientwarfare/textures/items/npc/ration.png rename to src/main/resources/assets/ancientwarfare/textures/items/npc/food_bundle.png