add a few recipes, textures, add per-type differences to power

transmission/storage to torque conduits/dist/shaft blocks as well as
flywheel controllers.  adjust render size on waterwheel block.

src/main/java/net/shadowmage/ancientwarfare/automation/block/AWAutomationBlockLoader.java

@@ -25,8 +25,6 @@
 import net.shadowmage.ancientwarfare.automation.tile.torque.TileTorqueTransportShaft;
 import net.shadowmage.ancientwarfare.automation.tile.torque.TileTorqueTransportShaftHeavy;
 import net.shadowmage.ancientwarfare.automation.tile.torque.TileTorqueTransportShaftMedium;
-import net.shadowmage.ancientwarfare.automation.tile.torque.TileTorqueWindmillController;
-import net.shadowmage.ancientwarfare.automation.tile.torque.TileWindmillBlade;
 import net.shadowmage.ancientwarfare.automation.tile.warehouse2.TileWarehouse;
 import net.shadowmage.ancientwarfare.automation.tile.warehouse2.TileWarehouseCraftingStation;
 import net.shadowmage.ancientwarfare.automation.tile.warehouse2.TileWarehouseInterface;
@@ -312,11 +310,11 @@ public static void load()
   GameRegistry.registerBlock(handCrankedEngine, ItemBlockTorqueTile.class, "hand_cranked_engine");
   GameRegistry.registerTileEntity(TileTorqueGeneratorHandCranked.class, "hand_cranked_engine_tile");
 
-  GameRegistry.registerBlock(windmillBlade, "windmill_blade");
-  GameRegistry.registerTileEntity(TileWindmillBlade.class, "windmill_blade_tile");
-
-  GameRegistry.registerBlock(windmillControl, "windmill_controll");
-  GameRegistry.registerTileEntity(TileTorqueWindmillController.class, "windmill_control_tile");
+//  GameRegistry.registerBlock(windmillBlade, "windmill_blade");
+//  GameRegistry.registerTileEntity(TileWindmillBlade.class, "windmill_blade_tile");
+//  
+//  GameRegistry.registerBlock(windmillControl, "windmill_controll");
+//  GameRegistry.registerTileEntity(TileTorqueWindmillController.class, "windmill_control_tile");
 
   GameRegistry.registerBlock(chunkLoaderSimple, "chunk_loader_simple");
   GameRegistry.registerTileEntity(TileChunkLoaderSimple.class, "chunk_loader_simple_tile");

src/main/java/net/shadowmage/ancientwarfare/automation/crafting/AWAutomationCrafting.java

@@ -292,29 +292,53 @@ public static void loadRecipes()
       's', steelShaft.copy(),
       'g', steelGear.copy());
 
-  //torque flywheel s
+  //torque flywheel control s
   AWCraftingManager.INSTANCE.createRecipe(new ItemStack(AWAutomationBlockLoader.flywheel,1,0), "theory_of_gravity",
       "pgp",
       "ppp",
       "pgp",
       'p', Blocks.planks,
       'g', woodenGear.copy());
 
-  //torque flywheel m
+  //torque flywheel control m
   AWCraftingManager.INSTANCE.createRecipe(new ItemStack(AWAutomationBlockLoader.flywheel,1,1), "theory_of_gravity",
       "igi",
       "iii",
       "igi",
       'i', Items.iron_ingot,
       'g', ironGear.copy());
 
-  //torque flywheel l
+  //torque flywheel control l
   AWCraftingManager.INSTANCE.createRecipe(new ItemStack(AWAutomationBlockLoader.flywheel,1,2), "mass_production",
       "igi",
       "iii",
       "igi",
       'i', AWItems.steel_ingot,
       'g', steelGear.copy());
+
+  //torque flywheel s
+  AWCraftingManager.INSTANCE.createRecipe(new ItemStack(AWAutomationBlockLoader.flywheelStorage,1,0), "theory_of_gravity",
+      "gpg",
+      "ppp",
+      "gpg",
+      'p', Blocks.planks,
+      'g', Blocks.glass_pane);
+
+  //torque flywheel m
+  AWCraftingManager.INSTANCE.createRecipe(new ItemStack(AWAutomationBlockLoader.flywheelStorage,1,1), "theory_of_gravity",
+      "gpg",
+      "ppp",
+      "ggg",
+      'p', Items.iron_ingot,
+      'g', Blocks.glass_pane);
+
+  //torque flywheel l
+  AWCraftingManager.INSTANCE.createRecipe(new ItemStack(AWAutomationBlockLoader.flywheelStorage,1,2), "mass_production",
+      "gpg",
+      "ppp",
+      "ggg",
+      'p', AWItems.steel_ingot,
+      'g', Blocks.glass_pane);
 
   //torque generator hand
   AWCraftingManager.INSTANCE.createRecipe(new ItemStack(AWAutomationBlockLoader.handCrankedEngine), "the_wheel",

src/main/java/net/shadowmage/ancientwarfare/automation/proxy/BCProxy.java

@@ -1,7 +1,6 @@
 package net.shadowmage.ancientwarfare.automation.proxy;
 
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.shadowmage.ancientwarfare.core.api.ModuleStatus;
 import net.shadowmage.ancientwarfare.core.config.AWLog;

src/main/java/net/shadowmage/ancientwarfare/automation/proxy/ClientProxyAutomation.java

@@ -28,12 +28,12 @@
 import net.shadowmage.ancientwarfare.automation.model.ModelAutoCraftingStation;
 import net.shadowmage.ancientwarfare.automation.render.RenderSterlingEngine;
 import net.shadowmage.ancientwarfare.automation.render.RenderTileFlywheelStorage;
-import net.shadowmage.ancientwarfare.automation.render.RenderTileTorqueFlywheelController;
 import net.shadowmage.ancientwarfare.automation.render.RenderTileHandEngine;
-import net.shadowmage.ancientwarfare.automation.render.RenderTileWaterwheel;
+import net.shadowmage.ancientwarfare.automation.render.RenderTileTorqueFlywheelController;
 import net.shadowmage.ancientwarfare.automation.render.RenderTileTorqueShaft;
 import net.shadowmage.ancientwarfare.automation.render.RenderTileTorqueTransport;
 import net.shadowmage.ancientwarfare.automation.render.RenderTileWarehouseStockViewer;
+import net.shadowmage.ancientwarfare.automation.render.RenderTileWaterwheel;
 import net.shadowmage.ancientwarfare.automation.render.RenderTileWorksite;
 import net.shadowmage.ancientwarfare.automation.render.RenderWindmillBlades;
 import net.shadowmage.ancientwarfare.automation.tile.torque.TileFlywheelStorage;

src/main/java/net/shadowmage/ancientwarfare/automation/proxy/RFProxyActual.java

@@ -1,11 +1,11 @@
 package net.shadowmage.ancientwarfare.automation.proxy;
 
-import cofh.api.energy.IEnergyConnection;
-import cofh.api.energy.IEnergyHandler;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.shadowmage.ancientwarfare.automation.config.AWAutomationStatics;
 import net.shadowmage.ancientwarfare.core.interfaces.ITorque.ITorqueTile;
+import cofh.api.energy.IEnergyConnection;
+import cofh.api.energy.IEnergyHandler;
 
 public class RFProxyActual extends RFProxy
 {

src/main/java/net/shadowmage/ancientwarfare/automation/render/RenderSterlingEngine.java

@@ -7,17 +7,13 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.IItemRenderer;
 import net.minecraftforge.common.util.ForgeDirection;
-import net.shadowmage.ancientwarfare.automation.config.AWAutomationStatics;
 import net.shadowmage.ancientwarfare.automation.tile.torque.TileTorqueGeneratorSterling;
 import net.shadowmage.ancientwarfare.core.model.ModelBaseAW;
 import net.shadowmage.ancientwarfare.core.model.ModelLoader;
 import net.shadowmage.ancientwarfare.core.model.ModelPiece;
 import net.shadowmage.ancientwarfare.core.util.Trig;
 
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-
-import cpw.mods.fml.client.registry.RenderingRegistry;
 
 public class RenderSterlingEngine extends TileEntitySpecialRenderer implements IItemRenderer
 {

src/main/java/net/shadowmage/ancientwarfare/automation/render/RenderTileTorqueShaft.java

@@ -5,8 +5,6 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.IItemRenderer;
-import net.minecraftforge.client.IItemRenderer.ItemRenderType;
-import net.minecraftforge.client.IItemRenderer.ItemRendererHelper;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.shadowmage.ancientwarfare.automation.tile.torque.TileTorqueTransportShaft;
 import net.shadowmage.ancientwarfare.core.interfaces.ITorque.ITorqueTile;

src/main/java/net/shadowmage/ancientwarfare/automation/render/RenderTileWaterwheel.java

@@ -12,6 +12,7 @@
 import net.shadowmage.ancientwarfare.core.model.ModelPiece;
 
 import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL12;
 
 public class RenderTileWaterwheel extends TileEntitySpecialRenderer implements IItemRenderer
 {
@@ -97,10 +98,14 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data)
   {
   GL11.glPushMatrix();
   GL11.glTranslatef(0.5f, 0, 0.5f);
+  GL11.glScalef(0.4f, 0.4f, 0.4f);
+  GL11.glPushAttrib(GL12.GL_RESCALE_NORMAL);
+  GL11.glEnable(GL12.GL_RESCALE_NORMAL);
   bindTexture(tex);
   waterwheel.setRotation(0, 0, 0);
   outputGear.setRotation(0, 0, 0);
   model.renderModel();
+  GL11.glPopAttrib();
   GL11.glPopMatrix();
   }
 

src/main/java/net/shadowmage/ancientwarfare/automation/tile/torque/TileTorqueGeneratorHandCranked.java

@@ -10,7 +10,6 @@
 import net.minecraftforge.common.util.ForgeDirection;
 import net.shadowmage.ancientwarfare.automation.config.AWAutomationStatics;
 import net.shadowmage.ancientwarfare.core.config.AWCoreStatics;
-import net.shadowmage.ancientwarfare.core.config.AWLog;
 import net.shadowmage.ancientwarfare.core.interfaces.IOwnable;
 import net.shadowmage.ancientwarfare.core.interfaces.ITorque.TorqueCell;
 import net.shadowmage.ancientwarfare.core.interfaces.IWorkSite;
@@ -71,8 +70,6 @@ protected void balancePower()
   trans = Math.min(trans, inputCell.getEnergy());
   inputCell.setEnergy(inputCell.getEnergy()-trans);
   outputCell.setEnergy(outputCell.getEnergy()+trans);
-
-  AWLog.logDebug("balanced power..in: "+inputCell.getEnergy() + " out: "+outputCell.getEnergy());
   }
 
 @Override

src/main/java/net/shadowmage/ancientwarfare/automation/tile/torque/TileTorqueGeneratorSterling.java

@@ -9,7 +9,6 @@
 import net.minecraft.tileentity.TileEntityFurnace;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.shadowmage.ancientwarfare.automation.config.AWAutomationStatics;
-import net.shadowmage.ancientwarfare.core.config.AWLog;
 import net.shadowmage.ancientwarfare.core.interfaces.ITorque.TorqueCell;
 import net.shadowmage.ancientwarfare.core.inventory.InventoryBasic;
 import net.shadowmage.ancientwarfare.core.network.NetworkHandler;

src/main/java/net/shadowmage/ancientwarfare/automation/tile/torque/TileTorqueGeneratorWaterwheel.java

@@ -8,7 +8,6 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.shadowmage.ancientwarfare.automation.config.AWAutomationStatics;
-import net.shadowmage.ancientwarfare.core.config.AWLog;
 import net.shadowmage.ancientwarfare.core.interfaces.IInteractableTile;
 import net.shadowmage.ancientwarfare.core.interfaces.ITorque.TorqueCell;
 

src/main/java/net/shadowmage/ancientwarfare/automation/tile/torque/TileTorqueStorageFlywheelController.java

@@ -1,12 +1,9 @@
 package net.shadowmage.ancientwarfare.automation.tile.torque;
 
-import com.sun.org.apache.bcel.internal.generic.GETSTATIC;
-
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.NetworkManager;
 import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.tileentity.TileEntityFurnace;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.shadowmage.ancientwarfare.automation.config.AWAutomationStatics;
 import net.shadowmage.ancientwarfare.core.interfaces.ITorque.TorqueCell;
@@ -36,8 +33,9 @@ public class TileTorqueStorageFlywheelController extends TileTorqueStorageBase
 
 public TileTorqueStorageFlywheelController()
   {
-  inputCell = new TorqueCell(32, 32, 32, 1.f);//TODO set default values from config
-  outputCell = new TorqueCell(32, 32, 32, 1.f);//TODO set default values from config
+  double max = AWAutomationStatics.low_transfer_max;
+  inputCell = new TorqueCell(max, max, max, 1.f);//TODO set default values from config
+  outputCell = new TorqueCell(max, max, max, 1.f);//TODO set default values from config
   }
 
 @Override

src/main/java/net/shadowmage/ancientwarfare/automation/tile/torque/TileTorqueStorageFlywheelControllerLarge.java

@@ -1,11 +1,15 @@
 package net.shadowmage.ancientwarfare.automation.tile.torque;
 
 import net.shadowmage.ancientwarfare.automation.config.AWAutomationStatics;
+import net.shadowmage.ancientwarfare.core.interfaces.ITorque.TorqueCell;
 
 public class TileTorqueStorageFlywheelControllerLarge extends TileTorqueStorageFlywheelController
 {
+
 public TileTorqueStorageFlywheelControllerLarge()
   {
-
+  double max = AWAutomationStatics.high_transfer_max;
+  inputCell = new TorqueCell(max, max, max, 1.f);//TODO set default values from config
+  outputCell = new TorqueCell(max, max, max, 1.f);//TODO set default values from config
   }
 }

src/main/java/net/shadowmage/ancientwarfare/automation/tile/torque/TileTorqueStorageFlywheelControllerMedium.java

@@ -1,11 +1,14 @@
 package net.shadowmage.ancientwarfare.automation.tile.torque;
 
 import net.shadowmage.ancientwarfare.automation.config.AWAutomationStatics;
+import net.shadowmage.ancientwarfare.core.interfaces.ITorque.TorqueCell;
 
 public class TileTorqueStorageFlywheelControllerMedium extends TileTorqueStorageFlywheelController
 {
 public TileTorqueStorageFlywheelControllerMedium()
   {
-
+  double max = AWAutomationStatics.med_transfer_max;
+  inputCell = new TorqueCell(max, max, max, 1.f);//TODO set default values from config
+  outputCell = new TorqueCell(max, max, max, 1.f);//TODO set default values from config
   }
 }

src/main/java/net/shadowmage/ancientwarfare/automation/tile/torque/TileTorqueTransportConduit.java

@@ -9,7 +9,6 @@
 import net.minecraftforge.common.util.ForgeDirection;
 import net.shadowmage.ancientwarfare.automation.config.AWAutomationStatics;
 import net.shadowmage.ancientwarfare.core.api.ModuleStatus;
-import net.shadowmage.ancientwarfare.core.config.AWLog;
 import net.shadowmage.ancientwarfare.core.interfaces.ITorque.ITorqueTile;
 import net.shadowmage.ancientwarfare.core.interfaces.ITorque.SidedTorqueCell;
 import net.shadowmage.ancientwarfare.core.interfaces.ITorque.TorqueCell;
@@ -38,9 +37,10 @@ public class TileTorqueTransportConduit extends TileTorqueTransportBase
 
 public TileTorqueTransportConduit()
   {
+  double max = AWAutomationStatics.low_transfer_max;
   for(int i = 0; i <6; i++)
     {
-    storage[i] = new SidedTorqueCell(32, 32, 32, 1, ForgeDirection.values()[i], this);//TODO set from config
+    storage[i] = new SidedTorqueCell(max, max, max, 1, ForgeDirection.values()[i], this);//TODO set from config
     }
   }
 

src/main/java/net/shadowmage/ancientwarfare/automation/tile/torque/TileTorqueTransportConduitHeavy.java

@@ -1,13 +1,19 @@
 package net.shadowmage.ancientwarfare.automation.tile.torque;
 
+import net.minecraftforge.common.util.ForgeDirection;
 import net.shadowmage.ancientwarfare.automation.config.AWAutomationStatics;
+import net.shadowmage.ancientwarfare.core.interfaces.ITorque.SidedTorqueCell;
 
 public class TileTorqueTransportConduitHeavy extends TileTorqueTransportConduit
 {
 
 public TileTorqueTransportConduitHeavy()
   {
-
+  double max = AWAutomationStatics.high_transfer_max;
+  for(int i = 0; i <6; i++)
+    {
+    storage[i] = new SidedTorqueCell(max, max, max, 1, ForgeDirection.values()[i], this);//TODO set from config
+    }
   }
 
 }

src/main/java/net/shadowmage/ancientwarfare/automation/tile/torque/TileTorqueTransportConduitMedium.java

@@ -1,13 +1,19 @@
 package net.shadowmage.ancientwarfare.automation.tile.torque;
 
+import net.minecraftforge.common.util.ForgeDirection;
 import net.shadowmage.ancientwarfare.automation.config.AWAutomationStatics;
+import net.shadowmage.ancientwarfare.core.interfaces.ITorque.SidedTorqueCell;
 
 public class TileTorqueTransportConduitMedium extends TileTorqueTransportConduit
 {
 
 public TileTorqueTransportConduitMedium()
   {
-
+  double max = AWAutomationStatics.med_transfer_max;
+  for(int i = 0; i <6; i++)
+    {
+    storage[i] = new SidedTorqueCell(max, max, max, 1, ForgeDirection.values()[i], this);//TODO set from config
+    }
   }
 
 }

src/main/java/net/shadowmage/ancientwarfare/automation/tile/torque/TileTorqueTransportDistributorHeavy.java

@@ -1,11 +1,18 @@
 package net.shadowmage.ancientwarfare.automation.tile.torque;
 
+import net.minecraftforge.common.util.ForgeDirection;
 import net.shadowmage.ancientwarfare.automation.config.AWAutomationStatics;
+import net.shadowmage.ancientwarfare.core.interfaces.ITorque.SidedTorqueCell;
+
 
 public class TileTorqueTransportDistributorHeavy extends TileTorqueTransportDistributor
 {
 public TileTorqueTransportDistributorHeavy()
   {
-
+  double max = AWAutomationStatics.high_transfer_max;
+  for(int i = 0; i <6; i++)
+    {
+    storage[i] = new SidedTorqueCell(max, max, max, 1, ForgeDirection.values()[i], this);//TODO set from config
+    }
   }
 }

src/main/java/net/shadowmage/ancientwarfare/automation/tile/torque/TileTorqueTransportDistributorMedium.java

@@ -1,11 +1,18 @@
 package net.shadowmage.ancientwarfare.automation.tile.torque;
 
+import net.minecraftforge.common.util.ForgeDirection;
 import net.shadowmage.ancientwarfare.automation.config.AWAutomationStatics;
+import net.shadowmage.ancientwarfare.core.interfaces.ITorque.SidedTorqueCell;
+
 
 public class TileTorqueTransportDistributorMedium extends TileTorqueTransportDistributor
 {
 public TileTorqueTransportDistributorMedium()
   {
-
+  double max = AWAutomationStatics.med_transfer_max;
+  for(int i = 0; i <6; i++)
+    {
+    storage[i] = new SidedTorqueCell(max, max, max, 1, ForgeDirection.values()[i], this);//TODO set from config
+    }
   }
 }

src/main/java/net/shadowmage/ancientwarfare/automation/tile/torque/TileTorqueTransportShaft.java

@@ -33,7 +33,8 @@ public class TileTorqueTransportShaft extends TileTorqueTransportBase
 
 public TileTorqueTransportShaft()
   {
-  torqueCell = new TorqueCell(32, 32, 32, 1);
+  double max = AWAutomationStatics.low_transfer_max;
+  torqueCell = new TorqueCell(max, max, max, 1);
   }
 
 @Override

src/main/java/net/shadowmage/ancientwarfare/automation/tile/torque/TileTorqueTransportShaftHeavy.java

@@ -1,11 +1,16 @@
 package net.shadowmage.ancientwarfare.automation.tile.torque;
 
+import net.shadowmage.ancientwarfare.automation.config.AWAutomationStatics;
+import net.shadowmage.ancientwarfare.core.interfaces.ITorque.TorqueCell;
+
 
 public class TileTorqueTransportShaftHeavy extends TileTorqueTransportShaft
 {
 
 public TileTorqueTransportShaftHeavy()
   {
+  double max = AWAutomationStatics.high_transfer_max;
+  torqueCell = new TorqueCell(max, max, max, 1);
   }
 
 }