Merge branch 'DEV' into Fluid

src/main/java/nmd/primal/energy/block/CrankBlock.java

@@ -53,7 +53,7 @@ public class CrankBlock extends Block implements ITileEntityProvider{
 				if(world.getBlock(x, y-1, z) instanceof CrankGrinder){
 					TileEntCrankGrinder tileGrinder = (TileEntCrankGrinder) world.getTileEntity(x, y-1, z);
 					tileGrinder.isPowered=true;
-					tileGrinder.power+=20;
+					tileGrinder.power+=15;
 					tileGrinder.markDirty();
 					tileGrinder.markForUpdate();
 				}

src/main/java/nmd/primal/energy/render/block/RenderCrankGrinder.java

@@ -23,7 +23,7 @@ import nmd.primal.energy.tileents.grinder.TileEntCrankGrinder;
 public class RenderCrankGrinder extends TileEntitySpecialRenderer {
 
 	public static final ResourceLocation MODEL = new ResourceLocation("energy:models/CrankGrinder.obj");
-	public static final ResourceLocation MODELGRINDER = new ResourceLocation("energy:models/GrinderWheel.obj");
+	public static final ResourceLocation MODELGRINDER = new ResourceLocation("energy:models/GrinderWheel3.obj");
 	public static final ResourceLocation TEXTURE = new ResourceLocation("energy:models/CrankGrinder.png");
 	public static final ResourceLocation TEXTUREWHEEL = new ResourceLocation("energy:models/StoneGrindWheel.png");
 	private IModelCustom model = AdvancedModelLoader.loadModel(MODEL);
@@ -51,23 +51,31 @@ public class RenderCrankGrinder extends TileEntitySpecialRenderer {
 		float scale = 1.0F;
 		GL11.glScalef(scale, scale, scale);
 
-		
-		
+
+
 		if(tile.getStackInSlot(1)!=null){
+			//entItem = new EntityItem(tile.getWorldObj(), x, y, z, tile.getStackInSlot(1));
 			GL11.glPushMatrix();
-			
-			if(tile.isPowered==true){
-				GL11.glTranslatef(1.0F, 0.5F, 0.0F);
-				GL11.glRotated(tile.rot, 0.0F, 1.0F, 0.0F);
+			//this.entItem.hoverStart = 0.0F;
+			//RenderItem.renderInFrame = true;
+			//GL11.glScalef(2.0f, 2.0f, 2.0f);
+
+			if(tile.isPowered == true){
+				GL11.glTranslatef(0.5f, 0.0f, 0.5f);
+				GL11.glRotatef(tile.rot*-1, 0.0F, 1.0F, 0.0F);
 				
+				FMLClientHandler.instance().getClient().renderEngine.bindTexture(TEXTUREWHEEL);
+
+				this.modelGrinder.renderAll();
+				//RenderManager.instance.renderEntityWithPosYaw(entItem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
+
 			}
 			if(tile.isPowered==false){
-				GL11.glRotated(0, 0.0F, 1.0F, 0.0F);
-				GL11.glTranslatef(1.0F, 0.5F, 0.0F);
+				GL11.glTranslatef(0.5f, 0.0f, 0.5f);
+				FMLClientHandler.instance().getClient().renderEngine.bindTexture(TEXTUREWHEEL);
+
+				this.modelGrinder.renderAll();
 			}
-			//GL11.glTranslatef(1.0F, 0.5F, 0.0F);
-			FMLClientHandler.instance().getClient().renderEngine.bindTexture(TEXTUREWHEEL);
-			this.modelGrinder.renderAll();
 			
 			GL11.glPopMatrix();
 		}
@@ -82,8 +90,8 @@ public class RenderCrankGrinder extends TileEntitySpecialRenderer {
 					||tile.getStackInSlot(0).getItem().equals(ModItems.saxleItem)){
 				GL11.glRotatef(90f, 1.0F, 0.0F, 0.0F);
 			}
-			
-			
+
+
 			if(tile.isPowered == true){
 				/*if(tile.getStackInSlot(0).getItem().equals(Item.getItemFromBlock(Blocks.wooden_slab))
 						||tile.getStackInSlot(0).getItem().equals(ModItems.saxleItem)){
@@ -91,7 +99,7 @@ public class RenderCrankGrinder extends TileEntitySpecialRenderer {
 				}else{
 					GL11.glRotatef(tile.rot, 0.0F, 0.0F, 1.0F);
 				}
-				
+
 				RenderManager.instance.renderEntityWithPosYaw(entItem, 0.0D, -0.223D, 0.0D, 0.0F, 0.0F);
 
 			}

src/main/java/nmd/primal/energy/render/item/IRStoneGrindWheel.java

@@ -11,7 +11,7 @@ import net.minecraftforge.client.model.IModelCustom;
 
 public class IRStoneGrindWheel implements IItemRenderer {
 
-	public static final ResourceLocation MODEL = new ResourceLocation("energy:models/GrinderWheel.obj");
+	public static final ResourceLocation MODEL = new ResourceLocation("energy:models/GrinderWheel3.obj");
 	public static final ResourceLocation TEXTURE = new ResourceLocation("energy:models/StoneGrindWheel.png");
 	
 	public IModelCustom model = AdvancedModelLoader.loadModel(MODEL);